From f0ce92d3b5719794f5f786e513b4b4ff8e0abe0f Mon Sep 17 00:00:00 2001
From: Jonah Graham
Date: Tue, 20 Nov 2018 11:39:12 +0000
Subject: Bug 540371: normalize files before applying EPLv2

Change-Id: I8bfd427bba1df18579d6d5e58ad1e5d704485050
---
 build/org.eclipse.cdt.autotools-feature/feature.properties       | 7 ++++++-
 .../autotools/ui/properties/AutotoolsToolPropertyOptionPage.java | 1 +
 .../projecttemplates/HelloWorldCAutotoolsProject/template.xml    | 2 +-
 .../projecttemplates/HelloWorldCPPAutotoolsProject/template.xml  | 2 +-
 .../cdt/build/gcc/core/internal/Msys2ToolChainProvider.java      | 5 +++--
 .../projecttemplates/HelloWorldCAnsiProject/template.xml         | 2 +-
 .../templates/projecttemplates/HelloWorldCCProject/template.xml  | 2 +-
 .../codan/internal/ui/preferences/FieldEditorOverlayPage.java    | 6 +++---
 .../model/org/eclipse/cdt/internal/core/model/ASTCache.java      | 9 +++++----
 .../cdt/ui/tests/text/contentassist2/TemplateProposalTest.java   | 9 +++++----
 .../extractlocalvariable/ExtractLocalVariableRefactoring.java    | 7 ++++---
 .../src/org/eclipse/cdt/launch/remote/RemoteHelper.java          | 7 ++++---
 .../src/org/eclipse/cdt/launch/remote/RemoteUIHelper.java        | 7 ++++---
 .../cdt/dsf/gdb/service/command/IGDBBackendProcessWithoutIO.java | 2 +-
 .../src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java | 2 +-
 .../org.eclipse.cdt.docker.launcher-feature/feature.properties   | 7 ++++++-
 lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g  | 2 +-
 lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g   | 2 +-
 lrparser/org.eclipse.cdt.core.lrparser/grammar/gpp/GPPParser.g   | 2 +-
 .../grammar/template/LRParserTemplate.g                          | 2 +-
 .../grammar/template/LRSecondaryParserTemplate.g                 | 2 +-
 .../cdt/core/dom/lrparser/ScannerExtensionConfiguration.java     | 9 +++++----
 native/org.eclipse.cdt.native.serial/pom.xml                     | 4 ++--
 pom.xml                                                          | 2 +-
 24 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/build/org.eclipse.cdt.autotools-feature/feature.properties b/build/org.eclipse.cdt.autotools-feature/feature.properties
index 426f6698c25..42248afb0d3 100644
--- a/build/org.eclipse.cdt.autotools-feature/feature.properties
+++ b/build/org.eclipse.cdt.autotools-feature/feature.properties
@@ -11,4 +11,9 @@
 featureName=C/C++ Autotools support
 description=Plugins for maintaining C/C++ projects that use Autotools (autoconf and automake).
 provider=Eclipse CDT
-copyright=Copyright 2006, 2007, 2008, 2009, 2010 Red Hat, Inc.
+copyright=\
+Copyright (c) 2006, 2018 Red Hat, Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
index 93344d60c78..754549713ec 100644
--- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
+++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/properties/AutotoolsToolPropertyOptionPage.java
@@ -1,5 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2009, 2015 Red Hat Inc.
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
diff --git a/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml b/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
index 6e2dabb393d..119c95e19d1 100644
--- a/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
+++ b/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCAutotoolsProject/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
-		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
 		id="HelloWorldCAutotoolsProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
 		 help="help.html">
 
diff --git a/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml b/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
index f9ef5795a69..9b2b87eccb5 100644
--- a/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
+++ b/build/org.eclipse.cdt.autotools.ui/templates/projecttemplates/HelloWorldCPPAutotoolsProject/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
-		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		copyright="Copyright (c) 2007,2009 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
 		id="HelloWorldCPPAutotoolsProject" label="%HelloWorld.CCtemplate.label" description="%HelloWorld.CCtemplate.description"
 		 help="help.html">
 
diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
index c702701820f..130dc5e2653 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/Msys2ToolChainProvider.java
@@ -1,6 +1,7 @@
 /*******************************************************************************
- * Copyright (c) 2016 QNX Software Systems and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
+ * Copyright (c) 2016 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
index d16c1c30162..8799c2268ab 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCAnsiProject/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
-		copyright="Copyright (c) 2007 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		copyright="Copyright (c) 2007 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
 		id="HelloWorldCProject" label="%HelloWorld.CAnsitemplate.label" description="%HelloWorld.CAnsitemplate.description"
 		 help="help.html">
 
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
index b319a9cb18c..32e7aac82ea 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/templates/projecttemplates/HelloWorldCCProject/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <template type="ProjTempl" version="1.0" supplier="Eclipse.org" revision="1.0" author="Bala Torati (Symbian)"
-		copyright="Copyright (c) 2007 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available athttp://www.eclipse.org/legal/epl-v10.html"
+		copyright="Copyright (c) 2007 Symbian Software Limited and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html"
 		id="HelloWorldCCProject" label="%HelloWorld.CCtemplate.label" description="%HelloWorld.CCtemplate.description"
 		 help="help.html">
 	<property-group id="basics" label="%HelloWorld.basics.label" description="%HelloWorld.basics.description" type="PAGES-ONLY" help="help.html">
diff --git a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java
index 28a35d63254..2908598ea96 100644
--- a/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java
+++ b/codan/org.eclipse.cdt.codan.ui/src/org/eclipse/cdt/codan/internal/ui/preferences/FieldEditorOverlayPage.java
@@ -1,9 +1,9 @@
 /*******************************************************************************
  * Copyright (c) 2003, 2015 Berthold Daum and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors:
  *     Berthold Daum
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java
index 88aa1b7d1cd..359b42d98f6 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java
@@ -1,8 +1,9 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2016 Wind River Systems, 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 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2007, 2016 Wind River Systems, 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     Anton Leherbauer (Wind River Systems) - initial API and implementation
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java
index 47545979aad..00169e1e6d1 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/TemplateProposalTest.java
@@ -1,8 +1,9 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 Marc-Andre Laperle and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2012, 2014 Marc-Andre Laperle and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: 
  *     Marc-Andre Laperle - initial API and implementation
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java
index ba3893edfdb..02c7956ff2c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java
@@ -1,7 +1,8 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2016 Google and others. All rights reserved. This program and
- * the accompanying materials are made available under the terms of the Eclipse
- * Public License v1.0 which accompanies this distribution, and is available at
+ * Copyright (c) 2008, 2016 Google and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteHelper.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteHelper.java
index 1bd29ea39e6..86e0305bab8 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteHelper.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteHelper.java
@@ -1,8 +1,9 @@
 /********************************************************************************
  * Copyright (c) 2009, 2015 MontaVista Software, Inc. and others.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  * Anna Dushistova (MontaVista)      - initial API and implementation
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteUIHelper.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteUIHelper.java
index 6f40a95438d..54209db644e 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteUIHelper.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/RemoteUIHelper.java
@@ -1,8 +1,9 @@
 /********************************************************************************
  * Copyright (c) 2016 IBM Corporation and others.
- * This program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  * Wainer S. Moschetta (IBM) - initial API and implementation
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBBackendProcessWithoutIO.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBBackendProcessWithoutIO.java
index 3523623c0f8..a6e0bc04388 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBBackendProcessWithoutIO.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBBackendProcessWithoutIO.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2016 Ericsson and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse  License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java
index a173c30252e..1de8d0a06e4 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/command/IGDBControl.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2008, 2012 Ericsson and others.
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse  License v1.0
+ * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  * 
diff --git a/launch/org.eclipse.cdt.docker.launcher-feature/feature.properties b/launch/org.eclipse.cdt.docker.launcher-feature/feature.properties
index afccf934d30..f842e219a05 100644
--- a/launch/org.eclipse.cdt.docker.launcher-feature/feature.properties
+++ b/launch/org.eclipse.cdt.docker.launcher-feature/feature.properties
@@ -11,4 +11,9 @@
 featureName=C/C++ Docker Container Launch Support
 description=Plugins for launching C/C++ applications in Containers.
 provider=Eclipse CDT
-copyright=Copyright (c) 2015 Red Hat, Inc.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License v1.0\n\ which accompanies this distribution, and is available at\n\ http://www.eclipse.org/legal/epl-v10.html
+copyright=\
+Copyright (c) 2015, 2018 Red Hat, Inc. and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g
index b73534b49f4..0d0f3f73a23 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPGrammar.g
@@ -3,7 +3,7 @@
 -- All rights reserved. This program and the accompanying materials
 -- are made available under the terms of the Eclipse Public License v1.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl_v10.html
+-- http://www.eclipse.org/legal/epl-v10.html
 --
 -- Contributors:
 --     IBM Corporation - initial API and implementation
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
index 9d9fb78abe8..e13847616be 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/cpp/CPPParser.g
@@ -3,7 +3,7 @@
 -- All rights reserved. This program and the accompanying materials
 -- are made available under the terms of the Eclipse Public License v1.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl_v10.html
+-- http://www.eclipse.org/legal/epl-v10.html
 --
 -- Contributors:
 --     IBM Corporation - initial API and implementation
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/gpp/GPPParser.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/gpp/GPPParser.g
index 4ee7b043a00..2d831892a06 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/gpp/GPPParser.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/gpp/GPPParser.g
@@ -3,7 +3,7 @@
 -- All rights reserved. This program and the accompanying materials
 -- are made available under the terms of the Eclipse Public License v1.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl_v10.html
+-- http://www.eclipse.org/legal/epl-v10.html
 --
 -- Contributors:
 --     IBM Corporation - initial API and implementation
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRParserTemplate.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRParserTemplate.g
index 877b5f4c730..b727910ccd5 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRParserTemplate.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRParserTemplate.g
@@ -3,7 +3,7 @@
 -- All rights reserved. This program and the accompanying materials
 -- are made available under the terms of the Eclipse Public License v1.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl_v10.html
+-- http://www.eclipse.org/legal/epl-v10.html
 --
 -- Contributors:
 --     IBM Corporation - initial API and implementation
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRSecondaryParserTemplate.g b/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRSecondaryParserTemplate.g
index a56bcdbf492..71f7f08ef6a 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRSecondaryParserTemplate.g
+++ b/lrparser/org.eclipse.cdt.core.lrparser/grammar/template/LRSecondaryParserTemplate.g
@@ -3,7 +3,7 @@
 -- All rights reserved. This program and the accompanying materials
 -- are made available under the terms of the Eclipse Public License v1.0
 -- which accompanies this distribution, and is available at
--- http://www.eclipse.org/legal/epl_v10.html
+-- http://www.eclipse.org/legal/epl-v10.html
 --
 -- Contributors:
 --     IBM Corporation - initial API and implementation
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
index 881c8755dc4..4bd38e46c6e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/ScannerExtensionConfiguration.java
@@ -1,8 +1,9 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2015 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 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2008, 2015 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
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml
index a3bc6a24181..87de22b6a45 100644
--- a/native/org.eclipse.cdt.native.serial/pom.xml
+++ b/native/org.eclipse.cdt.native.serial/pom.xml
@@ -2,9 +2,9 @@
 <!--
   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 Distribution License v1.0
+  are made available under the terms of the Eclipse Public License v1.0
   which accompanies this distribution, and is available at
-  http://www.eclipse.org/org/documents/edl-v10.php
+  http://www.eclipse.org/legal/epl-v10.html
 
   Contributors:
      Mat Booth (Red Hat) - initial implementation
diff --git a/pom.xml b/pom.xml
index 5a1044c008e..615c7fd078f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
        This program and the accompanying materials are made
        available under the terms of the Eclipse Public License v1.0
        which accompanies this distribution, and is available at
-       http://www.eclipse.org/legal/epl-v10.htm
+       http://www.eclipse.org/legal/epl-v10.html
       </comments>
 		</license>
 	</licenses>
-- 
cgit v1.2.3