From 31e5030550e317dfd2cabbec0eb29a7082a1edd9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 10 Dec 2020 15:46:28 -0600 Subject: [PATCH] Issue #5784 - Cleaning up source header template + Using proper language, no further mention of "secondary" license (which was an invalid way of handling an "OR" situation) Signed-off-by: Joakim Erdfelt --- header-template.txt | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/header-template.txt b/header-template.txt index cf48b8a857f..d400583c94c 100644 --- a/header-template.txt +++ b/header-template.txt @@ -1,15 +1,10 @@ ======================================================================== Copyright (c) ${copyright-range} Mort Bay Consulting Pty Ltd and others. -This program and the accompanying materials are made available under -the terms of the Eclipse Public License 2.0 which is available at -https://www.eclipse.org/legal/epl-2.0 - -This Source Code may also be made available under the following -Secondary Licenses when the conditions for such availability set -forth in the Eclipse Public License, v. 2.0 are satisfied: -the Apache License v2.0 which is available at -https://www.apache.org/licenses/LICENSE-2.0 +This program and the accompanying materials are made available under the +terms of the Eclipse Public License v. 2.0 which is available at +https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0 +which is available at https://www.apache.org/licenses/LICENSE-2.0. SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 ========================================================================