diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/about.html b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/about.html
index 7cc0bf0..8d6d323 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/buildAnt.xml b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/buildAnt.xml
index 0942f48..5351cc8 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/buildAnt.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/buildAnt.xml
@@ -3,9 +3,11 @@
  *************************************************************************
  * Copyright (c) 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestAdvQueryImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestAdvQueryImpl.java
index 3b83f39..718e42e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestAdvQueryImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestAdvQueryImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestColumnMetaData.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestColumnMetaData.java
index 55b4333..bd6140e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestColumnMetaData.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestColumnMetaData.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestConnectionImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestConnectionImpl.java
index d83253b..1b846c0 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestConnectionImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestConnectionImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestData.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestData.java
index b09853d..918ab9a 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestData.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestData.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDataSetMetaDataImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDataSetMetaDataImpl.java
index cc3caf2..8314b2a 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDataSetMetaDataImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDataSetMetaDataImpl.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDriverImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDriverImpl.java
index 1f6262f..4d4ff25 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDriverImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestDriverImpl.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestInputParamRowSetImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestInputParamRowSetImpl.java
index fbc7e16..f3071ea 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestInputParamRowSetImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestInputParamRowSetImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestOutputParamRowSetImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestOutputParamRowSetImpl.java
index 7596f36..91b24ba 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestOutputParamRowSetImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestOutputParamRowSetImpl.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamMetaDataImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamMetaDataImpl.java
index 0ec6001..c6c6620 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamMetaDataImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamMetaDataImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamRowSetImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamRowSetImpl.java
index 35272a8..9f928f0 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamRowSetImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestParamRowSetImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetImpl.java
index 1561a39..ecb6725 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetMetaDataImpl.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetMetaDataImpl.java
index 7430c58..c5746ba 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetMetaDataImpl.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/TestResultSetMetaDataImpl.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/ExpressionTester.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/ExpressionTester.java
index 5f61410..2d6f300 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/ExpressionTester.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/ExpressionTester.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCombinedOperator.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCombinedOperator.java
index a0bbfaf..29bbf32 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCombinedOperator.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCombinedOperator.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomExpression.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomExpression.java
index f204fd0..1b30fb5 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomExpression.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomExpression.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomFunction.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomFunction.java
index 2659f51..782503a 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomFunction.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MyCustomFunction.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySortSpecification.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySortSpecification.java
index 6e994b5..c07bde2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySortSpecification.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySortSpecification.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySpecFactory.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySpecFactory.java
index 2475ca3..b6fccdb 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySpecFactory.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.testdriver/src/org/eclipse/datatools/connectivity/oda/consumer/testdriver/spec/impl/MySpecFactory.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/about.html b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/plugin.xml b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/plugin.xml
index 8917780..a5984a4 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/plugin.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/plugin.xml
@@ -5,9 +5,9 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/DummyDriver.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/DummyDriver.java
index ef8e4ca..60cbcba 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/DummyDriver.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/DummyDriver.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2011 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/ExternalizedPropertyProvider.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/ExternalizedPropertyProvider.java
index 3b5e310..afde05f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/ExternalizedPropertyProvider.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/ExternalizedPropertyProvider.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006, 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/LoggerAccessor.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/LoggerAccessor.java
index df8095d..e39a20f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/LoggerAccessor.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/LoggerAccessor.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/OdaConsumerTestPlugin.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/OdaConsumerTestPlugin.java
index 09f4552..8536eb1 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/OdaConsumerTestPlugin.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/test/impl/OdaConsumerTestPlugin.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AdvQueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AdvQueryTest.java
index 46ae0d8..9be9397 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AdvQueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AdvQueryTest.java
@@ -1,9 +1,9 @@
 /*************************************************************************
  * Copyright (c) 2004, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java
index fb5ae9c..a726719 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AllTestSuites.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018 Red Hat Inc and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *******************************************************************************/
 
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AppContextTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AppContextTest.java
index cc77d8c..ce78a41 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AppContextTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/AppContextTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/BinaryCompatibiltyTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/BinaryCompatibiltyTest.java
index 94600cb..be331d0 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/BinaryCompatibiltyTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/BinaryCompatibiltyTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConnectionTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConnectionTest.java
index 894f6f7..dcb80aa 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConnectionTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConsumerMessagesTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConsumerMessagesTest.java
index 9de0b48..e480218 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConsumerMessagesTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ConsumerMessagesTest.java
@@ -2,9 +2,11 @@
  *****************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DataSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DataSetMetaDataTest.java
index b96ecec..82977ed 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DataSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DataSetMetaDataTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverBridgeTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverBridgeTest.java
index f797b4e..e895bfd 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverBridgeTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverBridgeTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2011 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverTest.java
index cd377ac..2f50b3d 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/DriverTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/FlatFileTestCase.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/FlatFileTestCase.java
index e3bbbed..51ee473 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/FlatFileTestCase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/FlatFileTestCase.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/LoggerInstanceTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/LoggerInstanceTest.java
index 5619eea..e1beb2b 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/LoggerInstanceTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/LoggerInstanceTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaBlobTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaBlobTest.java
index a26159c..30322b3 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaBlobTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaBlobTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaClobTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaClobTest.java
index 9685f26..527f3ab 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaClobTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaClobTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaTestCase.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaTestCase.java
index f7cf9ca..312a7c2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaTestCase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OdaTestCase.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OutputParametersTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OutputParametersTest.java
index f1ea5b0..1aef4d8 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OutputParametersTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/OutputParametersTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParamMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParamMetaDataTest.java
index 68afcf0..7937f78 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParamMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParamMetaDataTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParameterRowSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParameterRowSetTest.java
index 939f2a7..2348df1 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParameterRowSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ParameterRowSetTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/PropertyProviderTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/PropertyProviderTest.java
index 32ddf7e..67d6d22 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/PropertyProviderTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/PropertyProviderTest.java
@@ -2,9 +2,11 @@
  *****************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/QueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/QueryTest.java
index 768d171..3e15c8b 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/QueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/QueryTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetMetaDataTest.java
index 711071b..b617cf3 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetMetaDataTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetTest.java
index 8d1fdc0..e5e2e93 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/ResultSetTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2004, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogConfigTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogConfigTest.java
index 13d7d4c..79d273f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogConfigTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogConfigTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTest.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTest.java
index 030b52e..f8cdad8 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTestUtil.java b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTestUtil.java
index 7add205..84984b2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTestUtil.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.consumer.tests/src/org/eclipse/datatools/connectivity/oda/consumer/tests/TraceLogTestUtil.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/about.html b/tests/org.eclipse.datatools.connectivity.oda.design.tests/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/build.properties b/tests/org.eclipse.datatools.connectivity.oda.design.tests/build.properties
index 1392450..d747586 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/build.properties
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/build.properties
@@ -2,9 +2,9 @@
 # *************************************************************************
 # * Copyright (c) 2007 Actuate Corporation.
 # * All rights reserved. This program and the accompanying materials
-# * are made available under the terms of the Eclipse Public License v1.0
+# * are made available under the terms of the Eclipse Public License 2.0
 # * which accompanies this distribution, and is available at
-# * http://www.eclipse.org/legal/epl-v10.html
+# * https://www.eclipse.org/legal/epl-2.0/
 # *
 # * Contributors:
 # *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/plugin.xml b/tests/org.eclipse.datatools.connectivity.oda.design.tests/plugin.xml
index 823ccb0..c562d66 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/plugin.xml
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/plugin.xml
@@ -6,9 +6,11 @@
  *************************************************************************
  * Copyright (c) 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
index 08cad7d..5a1fddb 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/DesignUtilLoadSaveTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2007, 2011 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/TestUtil.java b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/TestUtil.java
index 7815558..359abe8 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/TestUtil.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.design.tests/src/org/eclipse/datatools/connectivity/oda/design/tests/TestUtil.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/about.html b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/about.html
index 7cc0bf0..8d6d323 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ConnectionTestBase.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ConnectionTestBase.java
index 65d357d..5a5e693 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ConnectionTestBase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ConnectionTestBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/DriverTestBase.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/DriverTestBase.java
index df379e0..8f5d053 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/DriverTestBase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/DriverTestBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/QueryTestBase.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/QueryTestBase.java
index b552539..18acfd6 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/QueryTestBase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/QueryTestBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetMetaDataTestBase.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetMetaDataTestBase.java
index 149103a..f16f6ab 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetMetaDataTestBase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetMetaDataTestBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetTestBase.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetTestBase.java
index ce23346..c477476 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetTestBase.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ResultSetTestBase.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/TestUtil.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/TestUtil.java
index aa03fb7..7581989 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/TestUtil.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/TestUtil.java
@@ -2,9 +2,9 @@
  *******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ConnectionTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ConnectionTest.java
index 72f83f2..050b1b2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ConnectionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/DriverTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/DriverTest.java
index cfd3400..b0db2f2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/DriverTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/DriverTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/QueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/QueryTest.java
index bd0f834..b87f956 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/QueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/QueryTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/RemoteFileTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/RemoteFileTest.java
index 5ddf3df..c9344a1 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/RemoteFileTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/RemoteFileTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2011 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetMetaDataTest.java
index ef50e7f..6573767 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetMetaDataTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetTest.java
index 8843eec..8d88773 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/csv/ResultSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ConnectionTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ConnectionTest.java
index 287903f..5487ee5 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ConnectionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/DriverTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/DriverTest.java
index fabf346..c774393 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/DriverTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/DriverTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/QueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/QueryTest.java
index dc66ae4..31b6f1b 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/QueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/QueryTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetMetaDataTest.java
index c7c4844..6749629 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetMetaDataTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetTest.java
index 289866a..e53c79f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/psv/ResultSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ConnectionTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ConnectionTest.java
index ce1b272..cd4375f 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ConnectionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/DriverTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/DriverTest.java
index ea5727b..92e1964 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/DriverTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/DriverTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/QueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/QueryTest.java
index 3a1df96..0999e4a 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/QueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/QueryTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetMetaDataTest.java
index 342169f..e928823 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetMetaDataTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetTest.java
index 3caea76..5730c00 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/ssv/ResultSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ConnectionTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ConnectionTest.java
index 1b321ea..874a2e1 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ConnectionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/DriverTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/DriverTest.java
index 3e478f2..00620af 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/DriverTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/DriverTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/QueryTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/QueryTest.java
index 0c9ec34..fcecd10 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/QueryTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/QueryTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetMetaDataTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetMetaDataTest.java
index 7dbf0cf..d17af06 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetMetaDataTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetMetaDataTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetTest.java
index 117cd00..75da41e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/tsv/ResultSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/util/DateUtilTest.java b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/util/DateUtilTest.java
index 43f702e..9ad48c5 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/util/DateUtilTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.flatfile.tests/src/org/eclipse/datatools/connectivity/oda/flatfile/tests/util/DateUtilTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/about.html b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ConnProfilePropProviderTest.java b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ConnProfilePropProviderTest.java
index 485c427..fdfc1d6 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ConnProfilePropProviderTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ConnProfilePropProviderTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ProfileExplorerPluginTest.java b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ProfileExplorerPluginTest.java
index 13e476c..03d5bf2 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ProfileExplorerPluginTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/ProfileExplorerPluginTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2005, 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/TestUtil.java b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/TestUtil.java
index fdc0ce8..45c86bb 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/TestUtil.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.profile.tests/src/org/eclipse/datatools/connectivity/oda/profile/tests/TestUtil.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/about.html b/tests/org.eclipse.datatools.connectivity.oda.tests/about.html
index a49e344..428af3b 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/about.html
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/BlobTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/BlobTest.java
index 88bdb8d..b22c5ff 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/BlobTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/BlobTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/ClobTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/ClobTest.java
index ba9c8e3..195e972 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/ClobTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/impl/tests/ClobTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/AggregateTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/AggregateTest.java
index 87e7cf8..0d751e4 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/AggregateTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/AggregateTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/FilterExtensionsTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/FilterExtensionsTest.java
index b98d845..2694d8e 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/FilterExtensionsTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/FilterExtensionsTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/QuerySpecTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/QuerySpecTest.java
index 7015605..39bebab 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/QuerySpecTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/QuerySpecTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/ValueExpressionTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/ValueExpressionTest.java
index 615054c..02a2d70 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/ValueExpressionTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/spec/tests/ValueExpressionTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/DataTypeMappingTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/DataTypeMappingTest.java
index 693f490..95011cd 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/DataTypeMappingTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/DataTypeMappingTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/ManifestExplorerTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/ManifestExplorerTest.java
index 057bdb8..2371c93 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/ManifestExplorerTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/manifest/tests/ManifestExplorerTest.java
@@ -2,9 +2,9 @@
  *************************************************************************
  * Copyright (c) 2006, 2007 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/tests/ResourceIdentifiersTest.java b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/tests/ResourceIdentifiersTest.java
index c3153a5..6291722 100644
--- a/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/tests/ResourceIdentifiersTest.java
+++ b/tests/org.eclipse.datatools.connectivity.oda.tests/src/org/eclipse/datatools/connectivity/oda/util/tests/ResourceIdentifiersTest.java
@@ -2,9 +2,11 @@
  *************************************************************************
  * Copyright (c) 2008, 2009 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.test/about.html b/tests/org.eclipse.datatools.connectivity.test/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.connectivity.test/about.html
+++ b/tests/org.eclipse.datatools.connectivity.test/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.connectivity.test/plugin.properties b/tests/org.eclipse.datatools.connectivity.test/plugin.properties
index 1691b33..0c94463 100644
--- a/tests/org.eclipse.datatools.connectivity.test/plugin.properties
+++ b/tests/org.eclipse.datatools.connectivity.test/plugin.properties
@@ -1,9 +1,9 @@
 ################################################################################
 ## Copyright (c) 2006 Sybase, Inc.
 ## All rights reserved. This program and the accompanying materials
-## are made available under the terms of the Eclipse Public License v1.0
+## are made available under the terms of the Eclipse Public License 2.0
 ## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html
+## https://www.eclipse.org/legal/epl-2.0/
 ##
 ## Contributors:
 ##    Sybase, Inc. - initial API and implementation
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/CategoryDescriptorTest.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/CategoryDescriptorTest.java
index 67ea95d..9f72d78 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/CategoryDescriptorTest.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/CategoryDescriptorTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/OverrideTemplateDescriptorTest.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/OverrideTemplateDescriptorTest.java
index 1256b31..be380fa 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/OverrideTemplateDescriptorTest.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/OverrideTemplateDescriptorTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/TemplateDescriptorTest.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/TemplateDescriptorTest.java
index 324fb3b..7d2b3ef 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/TemplateDescriptorTest.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/models/test/TemplateDescriptorTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/test/DriverManagerTest.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/test/DriverManagerTest.java
index ef6083b..f03c089 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/test/DriverManagerTest.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/drivers/test/DriverManagerTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2005 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ActivationTest.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ActivationTest.java
index 38501da..4728219 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ActivationTest.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ActivationTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ui/test/ConnectionProfileManagerUITests.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ui/test/ConnectionProfileManagerUITests.java
index 402aaf7..ed9a77f 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ui/test/ConnectionProfileManagerUITests.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/internal/ui/test/ConnectionProfileManagerUITests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerAdapterFactory.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerAdapterFactory.java
index 1aa6758..9f881e6 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerAdapterFactory.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerAdapterFactory.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerTests.java b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerTests.java
index eedcbfc..71bffde 100644
--- a/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerTests.java
+++ b/tests/org.eclipse.datatools.connectivity.test/src/org/eclipse/datatools/connectivity/test/ProfileManagerTests.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004-2006 Sybase, Inc.
  * 
  * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
+ * available under the terms of the Eclipse Public License 2.0 which
  * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors: brianf - initial API and implementation
  ******************************************************************************/
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/AllTests.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/AllTests.java
index 40ec371..6f521a0 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/AllTests.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/AllTests.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/CloudscapeTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/CloudscapeTest.java
index 5f6de95..95b2fa1 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/CloudscapeTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/CloudscapeTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2LUWTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2LUWTest.java
index e9e4173..52a0b4d 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2LUWTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2LUWTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2iSeriesTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2iSeriesTest.java
index 93376c7..e6b8c91 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2iSeriesTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2iSeriesTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2zSeriesTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2zSeriesTest.java
index 92ba78a..dc3ff80 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2zSeriesTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DB2zSeriesTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DatabaseDefinitionGenericTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DatabaseDefinitionGenericTest.java
index 1382885..e57bd71 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DatabaseDefinitionGenericTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DatabaseDefinitionGenericTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DerbyTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DerbyTest.java
index cb10f9d..d7a6d93 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DerbyTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/DerbyTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/IBMCloudscapeTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/IBMCloudscapeTest.java
index 0e001cb..40f415b 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/IBMCloudscapeTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/IBMCloudscapeTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/InformixTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/InformixTest.java
index 300eb68..9735f63 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/InformixTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/InformixTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/MySQLTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/MySQLTest.java
index 7266b56..c40eb17 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/MySQLTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/MySQLTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/OracleTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/OracleTest.java
index 32700f5..5f52c90 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/OracleTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/OracleTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PostgreSQLTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PostgreSQLTest.java
index b9a8bd5..6881b1e 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PostgreSQLTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PostgreSQLTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PredefinedDataTypeDefinitionGenericTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PredefinedDataTypeDefinitionGenericTest.java
index d820da6..8345378 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PredefinedDataTypeDefinitionGenericTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/PredefinedDataTypeDefinitionGenericTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SQLServerTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SQLServerTest.java
index 8aad599..b155918 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SQLServerTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SQLServerTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SybaseTest.java b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SybaseTest.java
index 9325778..b36683f 100644
--- a/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SybaseTest.java
+++ b/tests/org.eclipse.datatools.enablement.dbdefinition.junittest/src/org/eclipse/datatools/enablement/dbdefinition/junittest/SybaseTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/about.html b/tests/org.eclipse.datatools.enablement.oda.ws.test/about.html
index 6b1939e..ddc29ef 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/about.html
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/about.html
@@ -13,8 +13,8 @@
 
 <p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
 indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+Eclipse Public License Version 2.0.  A copy of the EPL is available 
+at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/AllTests.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/AllTests.java
index b7fac95..65a5b60 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/AllTests.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/AllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/BaseTest.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/BaseTest.java
index 868d670..f13774b 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/BaseTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/BaseTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/driver/DriverTest.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/driver/DriverTest.java
index 9e8167c..38b351c 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/driver/DriverTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/driver/DriverTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/misc/RawMessageSenderTest.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/misc/RawMessageSenderTest.java
index 019fc0d..3a85bef 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/misc/RawMessageSenderTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/misc/RawMessageSenderTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestConstants.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestConstants.java
index 58ae4b6..68f737d 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestConstants.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestUtil.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestUtil.java
index ddf60f6..0f9308f 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestUtil.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/util/TestUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/wsdl/WSDLAdvisorTest.java b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/wsdl/WSDLAdvisorTest.java
index a4869ae..ada7e8c 100644
--- a/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/wsdl/WSDLAdvisorTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.ws.test/test/org/eclipse/datatools/enablement/oda/ws/wsdl/WSDLAdvisorTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/about.html b/tests/org.eclipse.datatools.enablement.oda.xml.tests/about.html
index 7cc0bf0..8d6d323 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/about.html
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/buildXML.xml b/tests/org.eclipse.datatools.enablement.oda.xml.tests/buildXML.xml
index 4430ed0..3fe5198 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/buildXML.xml
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/buildXML.xml
@@ -3,9 +3,11 @@
  *************************************************************************
  * Copyright (c) 2004, 2006 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+
+    SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/BaseTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/BaseTest.java
index bbec094..530dfd3 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/BaseTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/BaseTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConcurrentQueriesFromOneConnection.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConcurrentQueriesFromOneConnection.java
index 913dcc6..be6da9d 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConcurrentQueriesFromOneConnection.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConcurrentQueriesFromOneConnection.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConnectionTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConnectionTest.java
index 75c2117..0db0524 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConnectionTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ConnectionTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/QueryTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/QueryTest.java
index ab4e739..35e8367 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/QueryTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/QueryTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/RelationInformationTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/RelationInformationTest.java
index 8c8d4ba..cea6231 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/RelationInformationTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/RelationInformationTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ResultSetTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ResultSetTest.java
index e95a7e7..f93742f 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ResultSetTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/ResultSetTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/SpecialEncodingTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/SpecialEncodingTest.java
index ce0e1c1..b389af5 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/SpecialEncodingTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/SpecialEncodingTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java
index d052489..3ad8131 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/AllTestSuites.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2018 Red Hat Inc and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  *******************************************************************************/
 
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestConstants.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestConstants.java
index baeb8f4..f732a4d 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestConstants.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestConstants.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestUtil.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestUtil.java
index 2c45a46..96e6ef3 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestUtil.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/test/util/TestUtil.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/MappedTablesTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/MappedTablesTest.java
index 5414e86..c4f7dd7 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/MappedTablesTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/MappedTablesTest.java
@@ -2,9 +2,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2008 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/SaxParserTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/SaxParserTest.java
index ae634c2..fdfbc38 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/SaxParserTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/SaxParserTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/XPathParserTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/XPathParserTest.java
index 7f23126..4e3caf0 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/XPathParserTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/XPathParserTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/date/DateUtilTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/date/DateUtilTest.java
index 4f27a62..53f57e2 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/date/DateUtilTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/date/DateUtilTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/SchemaPopulationUtilTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/SchemaPopulationUtilTest.java
index fa6b13d..36722d2 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/SchemaPopulationUtilTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/SchemaPopulationUtilTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/XPathPopulationUtilTest.java b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/XPathPopulationUtilTest.java
index 66e14b4..4925a77 100644
--- a/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/XPathPopulationUtilTest.java
+++ b/tests/org.eclipse.datatools.enablement.oda.xml.tests/src/org/eclipse/datatools/enablement/oda/xml/util/ui/XPathPopulationUtilTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 Actuate Corporation.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *  Actuate Corporation  - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/about.html b/tests/org.eclipse.datatools.sqltools.db.generic.test/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/about.html
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/AllTestsGenericSQLParser.java b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/AllTestsGenericSQLParser.java
index 0221f14..681f233 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/AllTestsGenericSQLParser.java
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/AllTestsGenericSQLParser.java
@@ -2,9 +2,11 @@
  * Copyright (c) 2004, 2005 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors:
  *     Sybase, Inc. - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/GenericSQLParserTest.java b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/GenericSQLParserTest.java
index 83b0f79..24de4be 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/GenericSQLParserTest.java
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/GenericSQLParserTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004, 2005 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *     Sybase, Inc. - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/ParserTest.java b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/ParserTest.java
index 607dac5..eb2573f 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/ParserTest.java
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/parser/test/ParserTest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004, 2005 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *     Sybase, Inc. - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/test/Activator.java b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/test/Activator.java
index f008a13..4cf7d2d 100644
--- a/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/test/Activator.java
+++ b/tests/org.eclipse.datatools.sqltools.db.generic.test/src/org/eclipse/datatools/sqltools/db/generic/test/Activator.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2004, 2005 Sybase, Inc. and others.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *     Sybase, Inc. - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/about.html b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/about.html
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/plugin.properties b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/plugin.properties
index 4db3acb..78e586a 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/plugin.properties
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/plugin.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AbstractTestSQLQueryParser.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AbstractTestSQLQueryParser.java
index e9815a4..edf94f0 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AbstractTestSQLQueryParser.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AbstractTestSQLQueryParser.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AllTests.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AllTests.java
index ca2e701..a4ce4fe 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AllTests.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/AllTests.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/SQLQueryParserInteractiveTest.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/SQLQueryParserInteractiveTest.java
index 09214d5..7534faf 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/SQLQueryParserInteractiveTest.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/SQLQueryParserInteractiveTest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/StatementCache.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/StatementCache.java
index 4c039a8..de12f5b 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/StatementCache.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/StatementCache.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestPlugin.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestPlugin.java
index 52b6df9..be057ad 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestPlugin.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserCallStmt.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserCallStmt.java
index 9f849f6..cafb3b2 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserCallStmt.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserCallStmt.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2010 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserColumnTableReferences.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserColumnTableReferences.java
index 3e8865a..056b570 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserColumnTableReferences.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserColumnTableReferences.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDataTypeResolving.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDataTypeResolving.java
index e473b70..e4a14b3 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDataTypeResolving.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDataTypeResolving.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDelete.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDelete.java
index 24a9f8c..7f11b0e 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDelete.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserDelete.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserInsert.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserInsert.java
index 46b7b52..69939dc 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserInsert.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserInsert.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserMerge.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserMerge.java
index 0efd884..8f8a5c0 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserMerge.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserMerge.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2009 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserSelect.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserSelect.java
index 00b7d52..f39228d 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserSelect.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserSelect.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserUpdate.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserUpdate.java
index 83991ca..d513946 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserUpdate.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/query/test/TestSQLQueryParserUpdate.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/about.html b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/about.html
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AbstractTestSQLParser.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AbstractTestSQLParser.java
index 58252fb..cebbc97 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AbstractTestSQLParser.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AbstractTestSQLParser.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AllTests.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AllTests.java
index 9270de7..1cfdecd 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AllTests.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/AllTests.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestPlugin.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestPlugin.java
index 6c77dad..3f76223 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestPlugin.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestSQLParser.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestSQLParser.java
index d0343ae..e55918d 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestSQLParser.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.test/src/org/eclipse/datatools/sqltools/parsers/sql/test/TestSQLParser.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2004, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/about.html b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/about.html
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/plugin.properties b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/plugin.properties
index a7eab20..c1aa571 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/plugin.properties
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/plugin.properties
@@ -2,9 +2,9 @@
 #
 # Copyright (c) 2005 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
 # which is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/AllTests.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/AllTests.java
index 58fd2a9..be1c280 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/AllTests.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/AllTests.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/InteractiveTest.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/InteractiveTest.java
index 5f510db..4d2871b 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/InteractiveTest.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/InteractiveTest.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestPlugin.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestPlugin.java
index f57f065..e59c81a 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestPlugin.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestPlugin.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestSQLXMLQueryParser.java b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestSQLXMLQueryParser.java
index 17b5a7b..852a6be 100644
--- a/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestSQLXMLQueryParser.java
+++ b/tests/org.eclipse.datatools.sqltools.parsers.sql.xml.query.test/src/org/eclipse/datatools/sqltools/parsers/sql/xml/query/test/TestSQLXMLQueryParser.java
@@ -1,9 +1,11 @@
 /*******************************************************************************
  * Copyright (c) 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  * 
  * Contributors:
  *     IBM Corporation - initial API and implementation
diff --git a/tests/org.eclipse.datatools.sqltools.plan.junittest/about.html b/tests/org.eclipse.datatools.sqltools.plan.junittest/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.plan.junittest/about.html
+++ b/tests/org.eclipse.datatools.sqltools.plan.junittest/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.result.junittest/about.html b/tests/org.eclipse.datatools.sqltools.result.junittest/about.html
index 1b7d275..c6700d7 100644
--- a/tests/org.eclipse.datatools.sqltools.result.junittest/about.html
+++ b/tests/org.eclipse.datatools.sqltools.result.junittest/about.html
@@ -10,8 +10,8 @@
 <p>The Eclipse Foundation makes available all content in this plug-in
 (&quot;Content&quot;). Unless otherwise indicated below, the Content is
 provided to you under the terms and conditions of the Eclipse Public License
-Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at <a
-href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+Version 2.0. A copy of the EPL is available at <a
+href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
 <p>If you did not receive this Content directly from the Eclipse Foundation,
diff --git a/tests/org.eclipse.datatools.sqltools.result.junittest/src/org/eclipse/datatools/sqltools/result/ResultsViewAPITest.java b/tests/org.eclipse.datatools.sqltools.result.junittest/src/org/eclipse/datatools/sqltools/result/ResultsViewAPITest.java
index 1b74050..4df3722 100644
--- a/tests/org.eclipse.datatools.sqltools.result.junittest/src/org/eclipse/datatools/sqltools/result/ResultsViewAPITest.java
+++ b/tests/org.eclipse.datatools.sqltools.result.junittest/src/org/eclipse/datatools/sqltools/result/ResultsViewAPITest.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2005 Sybase, Inc.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
  *
  * Contributors:
  *    Sybase, Inc. - initial API and implementation