diff --git a/.travis.yml b/.travis.yml
index e25e32a045..0c39d40cbd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,11 @@
 # Copyright Bosch Software Innovations GmbH, 2017.
 # Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # initial author: maximilian.huber@tngtech.com
 # -----------------------------------------------------------------------------
@@ -59,4 +60,3 @@ matrix:
     #   script: scripts/compileWithDocker.sh
   allow_failures:
     - name: mvn dependency:analyze
-
diff --git a/.travis/testForLicenseHeaders.sh b/.travis/testForLicenseHeaders.sh
index 7a45721cf5..d3d8374a9c 100755
--- a/.travis/testForLicenseHeaders.sh
+++ b/.travis/testForLicenseHeaders.sh
@@ -3,10 +3,11 @@
 # Copyright Siemens AG, 2017.
 # Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # initial author: maximilian.huber@tngtech.com
 # -----------------------------------------------------------------------------
@@ -19,17 +20,14 @@ while read file ; do
     if ! head -15 $file | grep -q 'SPDX-License-Identifier:' $file; then
         echo "WARN: no 'SPDX-License-Identifier' in  $file"
     fi
-    if head -15 $file | grep -q 'http://www.eclipse.org/legal/epl-v10.html'; then
+    if head -15 $file | grep -q 'https://www.eclipse.org/legal/epl-2.0/'; then
         continue # epl found
     fi
-    if head -15 $file | grep -q 'http://www.eclipse.org/org/documents/edl-v10.php'; then
+    if head -15 $file | grep -q 'SPDX-License-Identifier: EPL-2.0'; then
         continue # edl found
     fi
-    if head -15 $file | grep -q 'Modifications applied by Siemens AG'; then
-        continue
-    fi
 
-    echo "$(tput bold)ERROR: neither epl-1.0 nor edl-1.0 are specified in $file$(tput sgr0)"
+    echo "$(tput bold)ERROR: no EPL-2.0 licensing is specified in $file$(tput sgr0)"
     failure=true
 done <<< "$(git ls-files \
     | grep -Ev '\.(csv|rdf|ent|dtd|lar|png|gif|psd|ico|jpg|docx|gitignore|cert|jks)' \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 921181e543..460bc64fce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 This is the changelog file of the sw360 software. It starts with the first release being provided at eclipse/sw360. For older releases, please refer to the first project location:
 
-https://github.com/sw360/sw360portal
+https://github.com/eclipse/sw360
 
 ## sw360-6.0.0-M1
 
@@ -375,11 +375,8 @@ Because of changes in the couchdb schema you likely need to run a migration scri
 
 ## License
 
-SPDX Short Identifier: http://spdx.org/licenses/EPL-1.0
+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/
 
-SPDX-License-Identifier: EPL-1.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/epl-v10.html
+SPDX-License-Identifier: EPL-2.0
diff --git a/LICENSE b/LICENSE
index 844a49e7b6..ce9b8fc068 100644
--- a/LICENSE
+++ b/LICENSE
@@ -7,88 +7,294 @@ from the sw360portal source code distribution.
 
 ===============================================================
 
- MAIN LICENSES 
+ MAIN LICENSES
 
 ---------------------------------------------------------------
 
-
-EPL-1.0
-
-Eclipse Public License - v 1.0

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

-

-1. DEFINITIONS

-

-"Contribution" means:

-

-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and

-b) in the case of each subsequent Contributor:

-i) changes to the Program, and

-ii) additions to the Program;

-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.

-"Contributor" means any person or entity that distributes the Program.

-

-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.

-

-"Program" means the Contributions distributed in accordance with this Agreement.

-

-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.

-

-2. GRANT OF RIGHTS

-

-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.

-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.

-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.

-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.

-3. REQUIREMENTS

-

-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:

-

-a) it complies with the terms and conditions of this Agreement; and

-b) its license agreement:

-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;

-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;

-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and

-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.

-When the Program is made available in source code form:

-

-a) it must be made available under this Agreement; and

-b) a copy of this Agreement must be included with each copy of the Program.

-Contributors may not remove or alter any copyright notices contained within the Program.

-

-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.

-

-4. COMMERCIAL DISTRIBUTION

-

-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.

-

-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.

-

-5. NO WARRANTY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.

-

-6. DISCLAIMER OF LIABILITY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-7. GENERAL

-

-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.

-

-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.

-

-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.

-

-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.

-

-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+EPL-2.0
+
+Eclipse Public License - v 2.0
+
+    THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+    PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+    OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
+
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  where such changes and/or additions to the Program originate from
+  and are Distributed by that particular Contributor. A Contribution
+  "originates" from a Contributor if it was added to the Program by
+  such Contributor itself or anyone acting on such Contributor's behalf.
+  Contributions do not include changes or additions to the Program that
+  are not Modified Works.
+
+"Contributor" means any person or entity that Distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which
+are necessarily infringed by the use or sale of its Contribution alone
+or when combined with the Program.
+
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" shall mean any work, whether in Source Code or other
+form, that is based on (or derived from) the Program and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship.
+
+"Modified Works" shall mean any work in Source Code or other form that
+results from an addition to, deletion from, or modification of the
+contents of the Program, including, for purposes of clarity any new file
+in Source Code form that contains any contents of the Program. Modified
+Works shall not include works that contain only declarations,
+interfaces, types, classes, structures, or files of the Program solely
+in each case in order to link to, bind by name, or subclass the Program
+or Modified Works thereof.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" means either the GNU General Public License,
+Version 2.0, or any later versions of that license, including any
+exceptions or additional permissions as identified by the initial
+Contributor.
+
+2. GRANT OF RIGHTS
+
+  a) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free copyright
+  license to reproduce, prepare Derivative Works of, publicly display,
+  publicly perform, Distribute and sublicense the Contribution of such
+  Contributor, if any, and such Derivative Works.
+
+  b) Subject to the terms of this Agreement, each Contributor hereby
+  grants Recipient a non-exclusive, worldwide, royalty-free patent
+  license under Licensed Patents to make, use, sell, offer to sell,
+  import and otherwise transfer the Contribution of such Contributor,
+  if any, in Source Code or other form. This patent license shall
+  apply to the combination of the Contribution and the Program if, at
+  the time the Contribution is added by the Contributor, such addition
+  of the Contribution causes such combination to be covered by the
+  Licensed Patents. The patent license shall not apply to any other
+  combinations which include the Contribution. No hardware per se is
+  licensed hereunder.
+
+  c) Recipient understands that although each Contributor grants the
+  licenses to its Contributions set forth herein, no assurances are
+  provided by any Contributor that the Program does not infringe the
+  patent or other intellectual property rights of any other entity.
+  Each Contributor disclaims any liability to Recipient for claims
+  brought by any other entity based on infringement of intellectual
+  property rights or otherwise. As a condition to exercising the
+  rights and licenses granted hereunder, each Recipient hereby
+  assumes sole responsibility to secure any other intellectual
+  property rights needed, if any. For example, if a third party
+  patent license is required to allow Recipient to Distribute the
+  Program, it is Recipient's responsibility to acquire that license
+  before distributing the Program.
+
+  d) Each Contributor represents that to its knowledge it has
+  sufficient copyright rights in its Contribution, if any, to grant
+  the copyright license set forth in this Agreement.
+
+  e) Notwithstanding the terms of any Secondary License, no
+  Contributor makes additional grants to any Recipient (other than
+  those set forth in this Agreement) as a result of such Recipient's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+  a) the Program must also be made available as Source Code, in
+  accordance with section 3.2, and the Contributor must accompany
+  the Program with a statement that the Source Code for the Program
+  is available under this Agreement, and informs Recipients how to
+  obtain it in a reasonable manner on or through a medium customarily
+  used for software exchange; and
+
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     i) effectively disclaims on behalf of all other Contributors all
+     warranties and conditions, express and implied, including
+     warranties or conditions of title and non-infringement, and
+     implied warranties or conditions of merchantability and fitness
+     for a particular purpose;
+
+     ii) effectively excludes on behalf of all other Contributors all
+     liability for damages, including direct, indirect, special,
+     incidental and consequential damages, such as lost profits;
+
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  a) it must be made available under this Agreement, or if the
+  Program (i) is combined with other material in a separate file or
+  files made available under a Secondary License, and (ii) the initial
+  Contributor attached to the Source Code the notice described in
+  Exhibit A of this Agreement, then the Program may be made available
+  under the terms of such Secondary Licenses, and
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product
+offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes
+the Program in a commercial product offering, such Contributor
+("Commercial Contributor") hereby agrees to defend and indemnify every
+other Contributor ("Indemnified Contributor") against any losses,
+damages and costs (collectively "Losses") arising from claims, lawsuits
+and other legal actions brought by a third party against the Indemnified
+Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged
+intellectual property infringement. In order to qualify, an Indemnified
+Contributor must: a) promptly notify the Commercial Contributor in
+writing of such claim, and b) allow the Commercial Contributor to control,
+and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may
+participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial
+product offering, Product X. That Contributor is then a Commercial
+Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance
+claims and warranties are such Commercial Contributor's responsibility
+alone. Under this section, the Commercial Contributor would have to
+defend claims against the other Contributors related to those performance
+claims and warranties, and if a court requires any other Contributor to
+pay any damages as a result, the Commercial Contributor must pay
+those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+PURPOSE. Each Recipient is solely responsible for determining the
+appropriateness of using and distributing the Program and assumes all
+risks associated with its exercise of rights under this Agreement,
+including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs
+or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under
+applicable law, it shall not affect the validity or enforceability of
+the remainder of the terms of this Agreement, and without further
+action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the
+Program itself (excluding combinations of the Program with other software
+or hardware) infringes such Recipient's patent(s), then such Recipient's
+rights granted under Section 2(b) shall terminate as of the date such
+litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it
+fails to comply with any of the material terms or conditions of this
+Agreement and does not cure such failure in a reasonable period of
+time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use
+and distribution of the Program as soon as reasonably practicable.
+However, Recipient's obligations under this Agreement and any licenses
+granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement,
+but in order to avoid inconsistency the Agreement is copyrighted and
+may only be modified in the following manner. The Agreement Steward
+reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement
+Steward has the right to modify this Agreement. The Eclipse Foundation
+is the initial Agreement Steward. The Eclipse Foundation may assign the
+responsibility to serve as the Agreement Steward to a suitable separate
+entity. Each new version of the Agreement will be given a distinguishing
+version number. The Program (including Contributions) may always be
+Distributed subject to the version of the Agreement under which it was
+received. In addition, after a new version of the Agreement is published,
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+receives no rights or licenses to the intellectual property of any
+Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted
+under this Agreement are reserved. Nothing in this Agreement is intended
+to be enforceable by any entity that is not a Contributor or Recipient.
+No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+
+"This Source Code may also be made available under the following
+Secondary Licenses when the conditions for such availability set forth
+in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+version(s), and exceptions or additional permissions here}."
+
+  Simply including a copy of this Agreement, including this Exhibit A
+  is not sufficient to license the Source Code under Secondary Licenses.
+
+  If it is not possible or desirable to put the notice in a particular
+  file, then You may include the notice in a location (such as a LICENSE
+  file in a relevant directory) where a recipient would be likely to
+  look for such a notice.
+
+  You may add additional accurate notices of copyright ownership.
 
 ===============================================================
 
- OTHER LICENSES 
- 
+ OTHER LICENSES
+
 ---------------------------------------------------------------
 
 MIT
@@ -154,7 +360,7 @@ modification, are permitted provided that the following conditions are met:
 

   Neither the name of the Eclipse Foundation, Inc. nor the names of its

   contributors may be used to endorse or promote products derived from this

-  software without specific prior written permission. 

+  software without specific prior written permission.

 

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

diff --git a/README.md b/README.md
index 170c1d0924..98a62185e7 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ The software is tested with
 
 ### PROBLEMS
 
-Running with the tested software shows no problems if you encounter some please report them at: 
+Running with the tested software shows no problems if you encounter some please report them at:
 
 https://github.com/eclipse/sw360/issues
 
@@ -166,12 +166,10 @@ are excluded from the WAR file while packaging. Using below configuration,
 
 ### License
 
+SPDX-License-Identifier: EPL-2.0
 
-SPDX Short Identifier: http://spdx.org/licenses/EPL-1.0
+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/
 
-SPDX-License-Identifier: EPL-1.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/epl-v10.html
+SPDX-License-Identifier: EPL-2.0
diff --git a/backend/pom.xml b/backend/pom.xml
index 7d2a646996..4214bce5a0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src-common/pom.xml b/backend/src-common/pom.xml
index d0c899a965..4cebf67c8f 100644
--- a/backend/src-common/pom.xml
+++ b/backend/src-common/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/common/utils/BackendUtils.java b/backend/src-common/src/main/java/org/eclipse/sw360/common/utils/BackendUtils.java
index e1bbb4eff7..85150fe661 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/common/utils/BackendUtils.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/common/utils/BackendUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.common.utils;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ComponentSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ComponentSummary.java
index d9abed5eaf..f512cc36c0 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ComponentSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ComponentSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/DocumentSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/DocumentSummary.java
index 4e6677e91b..4d702f39ba 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/DocumentSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/DocumentSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseSummary.java
index 521be50a54..a526a40e15 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseTypeSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseTypeSummary.java
index f3a8fbb232..1069a538ec 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseTypeSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/LicenseTypeSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ModerationRequestSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ModerationRequestSummary.java
index e34e64fb9b..62a1493fc1 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ModerationRequestSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ModerationRequestSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ProjectSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ProjectSummary.java
index 830f561e5b..9aeaecd6ae 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ProjectSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ProjectSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
index e866201762..e21babb5f0 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/ReleaseSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/SummaryType.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/SummaryType.java
index db71568ce0..74404c0dd9 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/SummaryType.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/SummaryType.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/UserSummary.java b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/UserSummary.java
index 2dfcad9720..261b871b59 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/UserSummary.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/components/summary/UserSummary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/couchdb/SummaryAwareRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/couchdb/SummaryAwareRepository.java
index 17f0efd531..9dd0c305ff 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/couchdb/SummaryAwareRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/couchdb/SummaryAwareRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandler.java
index 346e003a3f..7bd1f1b1c3 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.db;
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentContentRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentContentRepository.java
index 0b751d915c..d4df456403 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentContentRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentContentRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.db;
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandler.java
index 4631e167f5..75076c9dfc 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentOwnerRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentOwnerRepository.java
index 64cd7e18db..6b95d6c8fe 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentOwnerRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentOwnerRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentRepository.java
index 9319513571..96f71feea0 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java
index f75d3012ee..9fe8bd1e2f 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/AttachmentUsageRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.db;
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentDatabaseHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentDatabaseHandler.java
index 1394f0b292..38a1fda63b 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentDatabaseHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentDatabaseHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentRepository.java
index acbbf49312..bf13081d79 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java
index 3a20b9f2ce..63f3403622 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ComponentSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ConfigContainerRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ConfigContainerRepository.java
index 7935d78099..90fd1aed32 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ConfigContainerRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ConfigContainerRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/CustomPropertiesRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/CustomPropertiesRepository.java
index cddac85ad8..2206024095 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/CustomPropertiesRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/CustomPropertiesRepository.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java
index 902e62e195..fd477d72b7 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With contributions by Siemens Healthcare Diagnostics Inc, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectObligationRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectObligationRepository.java
index 925a48a983..40dfd91722 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectObligationRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectObligationRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
index e1cea15c1e..e11b800113 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectRepository.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  * With contributions by Siemens Healthcare Diagnostics Inc, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java
index 2f239fc694..5c6fca9d00 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectVulnerabilityRatingRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectVulnerabilityRatingRepository.java
index 55efa89d88..58ed372b92 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectVulnerabilityRatingRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ProjectVulnerabilityRatingRepository.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRelationsUsageRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRelationsUsageRepository.java
index 001a324f7e..94ff8ab2b6 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRelationsUsageRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRelationsUsageRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRepository.java
index d65028772b..f765e8a7f5 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java
index 17203d5f5b..f1da419eb8 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/ReleaseSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/RepositoryUtils.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/RepositoryUtils.java
index 8fc2616001..2fd9ccde16 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/RepositoryUtils.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/RepositoryUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserRepository.java
index 9fdb180dc2..1fab4bc9aa 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java
index 5b9ad0d86e..02ff0832f6 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/UserSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java
index 0319812207..715b1daf73 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java
index 1a3576501e..f170dcb484 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/db/VendorSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ComponentModerator.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ComponentModerator.java
index 33aa57bd07..8219070701 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ComponentModerator.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ComponentModerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.entitlement;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/LicenseModerator.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/LicenseModerator.java
index 62e10b9fb1..a95144aebf 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/LicenseModerator.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/LicenseModerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.entitlement;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ProjectModerator.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ProjectModerator.java
index baabe0c666..4331603026 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ProjectModerator.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ProjectModerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.entitlement;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ReleaseModerator.java b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ReleaseModerator.java
index fea19a9754..bd5e9819c6 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ReleaseModerator.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/datahandler/entitlement/ReleaseModerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.entitlement;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailConstants.java b/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailConstants.java
index ba8042d16b..4f8a7968de 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailConstants.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailConstants.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.mail;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailUtil.java b/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailUtil.java
index 9174978917..06c8ecc0b2 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailUtil.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/mail/MailUtil.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.mail;
 
diff --git a/backend/src-common/src/main/java/org/eclipse/sw360/projects/Sw360ThriftServlet.java b/backend/src-common/src/main/java/org/eclipse/sw360/projects/Sw360ThriftServlet.java
index 4d849bbe9d..862f757a90 100644
--- a/backend/src-common/src/main/java/org/eclipse/sw360/projects/Sw360ThriftServlet.java
+++ b/backend/src-common/src/main/java/org/eclipse/sw360/projects/Sw360ThriftServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.projects;
 
diff --git a/backend/src-common/src/main/resources/log4j.properties b/backend/src-common/src/main/resources/log4j.properties
index 53624eb8aa..d157ada2ec 100644
--- a/backend/src-common/src/main/resources/log4j.properties
+++ b/backend/src-common/src/main/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/backend/src-common/src/main/resources/sw360.properties b/backend/src-common/src/main/resources/sw360.properties
index cfbe200a74..e9538b82ed 100644
--- a/backend/src-common/src/main/resources/sw360.properties
+++ b/backend/src-common/src/main/resources/sw360.properties
@@ -1,9 +1,10 @@
 # Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # common property file for the backend services
diff --git a/backend/src-common/src/test/java/org/eclipse/sw360/components/summary/ProjectSummaryTest.java b/backend/src-common/src/test/java/org/eclipse/sw360/components/summary/ProjectSummaryTest.java
index 32220141c2..3bab34a45c 100644
--- a/backend/src-common/src/test/java/org/eclipse/sw360/components/summary/ProjectSummaryTest.java
+++ b/backend/src-common/src/test/java/org/eclipse/sw360/components/summary/ProjectSummaryTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components.summary;
 
diff --git a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandlerTest.java b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandlerTest.java
index 8f8a000e49..bdb3147091 100644
--- a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandlerTest.java
+++ b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentAwareDatabaseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.db;
diff --git a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandlerTest.java b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandlerTest.java
index ac28cf76c0..18de861ea9 100644
--- a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandlerTest.java
+++ b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/AttachmentDatabaseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.db;
 
diff --git a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandlerTest.java b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandlerTest.java
index 467159e72a..2bf54cda25 100644
--- a/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandlerTest.java
+++ b/backend/src-common/src/test/java/org/eclipse/sw360/datahandler/db/ProjectDatabaseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.db;
diff --git a/backend/src/pom.xml b/backend/src/pom.xml
index 86c1ec1683..08af6ce632 100644
--- a/backend/src/pom.xml
+++ b/backend/src/pom.xml
@@ -4,12 +4,11 @@
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~ With modifacations by Verifa Oy, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-attachments/pom.xml b/backend/src/src-attachments/pom.xml
index 7e323f07ac..1a1872b00c 100644
--- a/backend/src/src-attachments/pom.xml
+++ b/backend/src/src-attachments/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentHandler.java b/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentHandler.java
index 3672f3cbea..61364ccffe 100644
--- a/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentHandler.java
+++ b/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.attachments;
 
diff --git a/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentServlet.java b/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentServlet.java
index 2bebbf3c8e..a2352b48fd 100644
--- a/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentServlet.java
+++ b/backend/src/src-attachments/src/main/java/org/eclipse/sw360/attachments/AttachmentServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.attachments;
 
diff --git a/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/AttachmentHandlerTest.java b/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/AttachmentHandlerTest.java
index b87e649cc8..e139213c50 100644
--- a/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/AttachmentHandlerTest.java
+++ b/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/AttachmentHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.attachments;
diff --git a/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/TestAttachmentClient.java b/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/TestAttachmentClient.java
index e4b104e55f..6d8aa99c15 100644
--- a/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/TestAttachmentClient.java
+++ b/backend/src/src-attachments/src/test/java/org/eclipse/sw360/attachments/TestAttachmentClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.attachments;
 
diff --git a/backend/src/src-components/pom.xml b/backend/src/src-components/pom.xml
index a1fc26dec1..72da8bf6f4 100644
--- a/backend/src/src-components/pom.xml
+++ b/backend/src/src-components/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentHandler.java b/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentHandler.java
index b102619422..f6108fa7e6 100644
--- a/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentHandler.java
+++ b/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components;
 
diff --git a/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentServlet.java b/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentServlet.java
index 9ddf863339..5c2246ff8c 100644
--- a/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentServlet.java
+++ b/backend/src/src-components/src/main/java/org/eclipse/sw360/components/ComponentServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components;
 
diff --git a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/ComponentHandlerTest.java b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/ComponentHandlerTest.java
index 698bb8c178..97e5bcfbd1 100644
--- a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/ComponentHandlerTest.java
+++ b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/ComponentHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components;
 
diff --git a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/TestComponentClient.java b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/TestComponentClient.java
index f864a742e5..9e17cb57bd 100644
--- a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/TestComponentClient.java
+++ b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/TestComponentClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.components;
 
diff --git a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java
index b364d1cab3..8fa8266bda 100644
--- a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java
+++ b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentDatabaseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.components.db;
diff --git a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java
index 2f7b72b585..3c5f10b10d 100644
--- a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java
+++ b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ComponentSearchHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.components.db;
diff --git a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ProjectDatabaseHandlerTest.java b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ProjectDatabaseHandlerTest.java
index 7661c8e29b..e80ece57ca 100644
--- a/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ProjectDatabaseHandlerTest.java
+++ b/backend/src/src-components/src/test/java/org/eclipse/sw360/components/db/ProjectDatabaseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.components.db;
diff --git a/backend/src/src-cvesearch/pom.xml b/backend/src/src-cvesearch/pom.xml
index 667b59b040..789d08369e 100644
--- a/backend/src/src-cvesearch/pom.xml
+++ b/backend/src/src-cvesearch/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~ Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnector.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnector.java
index 9cfc7a9e9f..71df3a4ef4 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnector.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnector.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasink;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApi.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApi.java
index c879f44ea8..2fac0e535e 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApi.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApi.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImpl.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImpl.java
index 4f0d0da26c..2fa3511d2e 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImpl.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImpl.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchData.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchData.java
index 16d8d7ed7d..cac046e99f 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchData.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchData.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesser.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesser.java
index 38a85e4e74..4e48bf5b0c 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesser.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesser.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapper.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapper.java
index e5103d9e1f..6b97a5b3a6 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapper.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapper.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/Heuristic.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/Heuristic.java
index 6ac9b76585..225f415259 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/Heuristic.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/Heuristic.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.heuristics;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevels.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevels.java
index edf48cdaf3..a66ae5c541 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevels.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevels.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.heuristics;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParser.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParser.java
index 003cb04045..31573f104b 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParser.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParser.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.json;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/ListCveSearchJsonParser.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/ListCveSearchJsonParser.java
index 1f6de36cb2..9f2500c839 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/ListCveSearchJsonParser.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/ListCveSearchJsonParser.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.json;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/SingleCveSearchJsonParser.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/SingleCveSearchJsonParser.java
index dc8a97b5fd..75596640f2 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/SingleCveSearchJsonParser.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/json/SingleCveSearchJsonParser.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.json;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcher.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcher.java
index 14a7f9432c..158aa685cc 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcher.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcher.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.matcher;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/Match.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/Match.java
index e431c05490..0c311d6ea3 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/Match.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/Match.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.matcher;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistance.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistance.java
index 0e58095106..0393b7c791 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistance.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistance.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.matcher;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToReleaseVulnerabilityRelationTranslator.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToReleaseVulnerabilityRelationTranslator.java
index 7ec57965d2..495357feae 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToReleaseVulnerabilityRelationTranslator.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToReleaseVulnerabilityRelationTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.entitytranslation;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToVulnerabilityTranslator.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToVulnerabilityTranslator.java
index 0e38cac231..b0eafad7ff 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToVulnerabilityTranslator.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataToVulnerabilityTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.entitytranslation;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslator.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslator.java
index ddebaa7049..19b3218812 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslator.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.entitytranslation;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/EntityTranslator.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/EntityTranslator.java
index 1288e7b271..32d455be62 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/EntityTranslator.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/entitytranslation/EntityTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2015-2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.entitytranslation;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtils.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtils.java
index 6e952c6de6..8e7e3a406d 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtils.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtils.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.helper;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchHandler.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchHandler.java
index e8a5874fad..70ff1b5158 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchHandler.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchHandler.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.service;
 
diff --git a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchServlet.java b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchServlet.java
index 4ef89ab5a7..75a2bf349e 100644
--- a/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchServlet.java
+++ b/backend/src/src-cvesearch/src/main/java/org/eclipse/sw360/cvesearch/service/CveSearchServlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.service;
 
diff --git a/backend/src/src-cvesearch/src/main/resources/cvesearch.properties b/backend/src/src-cvesearch/src/main/resources/cvesearch.properties
index 472f466015..cd36bc1d13 100644
--- a/backend/src/src-cvesearch/src/main/resources/cvesearch.properties
+++ b/backend/src/src-cvesearch/src/main/resources/cvesearch.properties
@@ -1,10 +1,11 @@
 #
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 
 cvesearch.host=https://cve.circl.lu
 
diff --git a/backend/src/src-cvesearch/src/main/resources/sw360.properties b/backend/src/src-cvesearch/src/main/resources/sw360.properties
index 17915158fe..97e8f8ab8f 100644
--- a/backend/src/src-cvesearch/src/main/resources/sw360.properties
+++ b/backend/src/src-cvesearch/src/main/resources/sw360.properties
@@ -1,10 +1,11 @@
 #
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 
 cvesearch.default.vendor.threshold=1
 cvesearch.default.product.threshold=0
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/TestWithCveSearchConnection.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/TestWithCveSearchConnection.java
index 9c3f667a4e..cdfa2a743d 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/TestWithCveSearchConnection.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/TestWithCveSearchConnection.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnectorTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnectorTest.java
index e6a1c5a08b..c0e775b390 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnectorTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasink/VulnerabilityConnectorTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasink;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImplTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImplTest.java
index 7cb38885b8..10d6c86bdc 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImplTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchApiImplTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchDataTestHelper.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchDataTestHelper.java
index 075473ff5b..0fd15ddd49 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchDataTestHelper.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchDataTestHelper.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesserTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesserTest.java
index c2e2a2617b..a6219457ae 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesserTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchGuesserTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapperTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapperTest.java
index d359d07e2a..0fd3495cae 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapperTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/CveSearchWrapperTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevelsTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevelsTest.java
index 070ba42106..c716fa1a5c 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevelsTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/heuristics/SearchLevelsTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.heuristics;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParserTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParserTest.java
index 7cb7aa2ca1..cdff29eeba 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParserTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/json/CveSearchJsonParserTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.json;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcherTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcherTest.java
index e6e7db212e..acb68e2b3e 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcherTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ListMatcherTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.matcher;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistanceTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistanceTest.java
index 307a7eda62..6d3c4720d0 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistanceTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/datasource/matcher/ModifiedLevenshteinDistanceTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.datasource.matcher;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslatorTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslatorTest.java
index 55e2201708..88714014d6 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslatorTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/entitytranslation/CveSearchDataTranslatorTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.entitytranslation;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtilsTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtilsTest.java
index 268de8b523..2eb0db2c3b 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtilsTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/helper/VulnerabilityUtilsTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.helper;
 
diff --git a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/service/CveSearchHandlerTest.java b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/service/CveSearchHandlerTest.java
index 69e7aeda21..1a36f1b908 100644
--- a/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/service/CveSearchHandlerTest.java
+++ b/backend/src/src-cvesearch/src/test/java/org/eclipse/sw360/cvesearch/service/CveSearchHandlerTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.cvesearch.service;
 
diff --git a/backend/src/src-cvesearch/src/test/resources/cvesearch.properties b/backend/src/src-cvesearch/src/test/resources/cvesearch.properties
index aae10d53c7..b94ea0ab99 100644
--- a/backend/src/src-cvesearch/src/test/resources/cvesearch.properties
+++ b/backend/src/src-cvesearch/src/test/resources/cvesearch.properties
@@ -1,9 +1,10 @@
 #
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 
 cvesearch.host=https://cve.circl.lu
diff --git a/backend/src/src-cvesearch/src/test/resources/sw360.properties b/backend/src/src-cvesearch/src/test/resources/sw360.properties
index 17915158fe..97e8f8ab8f 100644
--- a/backend/src/src-cvesearch/src/test/resources/sw360.properties
+++ b/backend/src/src-cvesearch/src/test/resources/sw360.properties
@@ -1,10 +1,11 @@
 #
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 
 cvesearch.default.vendor.threshold=1
 cvesearch.default.product.threshold=0
diff --git a/backend/src/src-fossology/pom.xml b/backend/src/src-fossology/pom.xml
index f47c6bd1b6..9f70d25ae4 100644
--- a/backend/src/src-fossology/pom.xml
+++ b/backend/src/src-fossology/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java
index 500bc00dff..f6676dcff9 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java
index 3d5aea16ef..6a6b122269 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/FossologyServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/SpringTServlet.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/SpringTServlet.java
index 7c1e69a5f2..c59b102e70 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/SpringTServlet.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/SpringTServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyConfig.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyConfig.java
index 994a736cc2..862a07f28b 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyConfig.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyConfig.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.config;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java
index f37f0d5540..486a0f3f8a 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/config/FossologyRestConfig.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.config;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyInputStreamResource.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyInputStreamResource.java
index b6c35f32b5..1976e0baff 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyInputStreamResource.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyInputStreamResource.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.rest;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyResponse.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyResponse.java
index 867cf9494a..bb2c39fc25 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyResponse.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyResponse.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.rest;
 
diff --git a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java
index 0acc01cfc0..6f558392d8 100644
--- a/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java
+++ b/backend/src/src-fossology/src/main/java/org/eclipse/sw360/fossology/rest/FossologyRestClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.rest;
 
diff --git a/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/FossologyHandlerLocalhostIntegrationTest.java b/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/FossologyHandlerLocalhostIntegrationTest.java
index d12f7cceb9..2189509dcc 100644
--- a/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/FossologyHandlerLocalhostIntegrationTest.java
+++ b/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/FossologyHandlerLocalhostIntegrationTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology;
 
diff --git a/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/config/TestConfig.java b/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/config/TestConfig.java
index 64ecdaec64..785ad15f88 100644
--- a/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/config/TestConfig.java
+++ b/backend/src/src-fossology/src/test/java/org/eclipse/sw360/fossology/config/TestConfig.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.fossology.config;
 
diff --git a/backend/src/src-licenseinfo/pom.xml b/backend/src/src-licenseinfo/pom.xml
index 92d68b4f0b..72add38781 100644
--- a/backend/src/src-licenseinfo/pom.xml
+++ b/backend/src/src-licenseinfo/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandler.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandler.java
index 45b1dded36..199f36adec 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandler.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoServlet.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoServlet.java
index bbe4b9bd8c..9a0acdcd71 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoServlet.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/LicenseInfoServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
index a1abb7b5f9..bcc89f7a4a 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGenerator.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.outputGenerators;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxUtils.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxUtils.java
index ff1db22bfd..1f04a711fd 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxUtils.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxUtils.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.licenseinfo.outputGenerators;
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/OutputGenerator.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/OutputGenerator.java
index 845af70131..071ead139d 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/OutputGenerator.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/OutputGenerator.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.licenseinfo.outputGenerators;
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/TextGenerator.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/TextGenerator.java
index 27229c9f9f..157097dd0a 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/TextGenerator.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/TextGenerator.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.licenseinfo.outputGenerators;
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGenerator.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGenerator.java
index fcba939997..0c91ead050 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGenerator.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGenerator.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.licenseinfo.outputGenerators;
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AbstractCLIParser.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AbstractCLIParser.java
index 514cd6bf48..58b2d852da 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AbstractCLIParser.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AbstractCLIParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AttachmentContentProvider.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AttachmentContentProvider.java
index 9fcbd630b6..7f6e732d38 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AttachmentContentProvider.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/AttachmentContentProvider.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CLIParser.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CLIParser.java
index b79046df35..ef2adb5dde 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CLIParser.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CLIParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParser.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParser.java
index 2b379a217e..faa7b8fa84 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParser.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParser.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParser.java
index f1e3749fc4..80cc3fd0bb 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParser.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParser.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParser.java
index 796f4c9dc9..46a21cbb44 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParser.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParser.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2016-2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTools.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTools.java
index de68b241d9..d07ce918d4 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTools.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTools.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2018-2019
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtils.java b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtils.java
index 13a4ab8b39..8c5ebc1769 100644
--- a/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtils.java
+++ b/backend/src/src-licenseinfo/src/main/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.util;
 
diff --git a/backend/src/src-licenseinfo/src/main/resources/DefaultLicenseInfoHeader.txt b/backend/src/src-licenseinfo/src/main/resources/DefaultLicenseInfoHeader.txt
index b81b59fb14..2cd360885a 100644
--- a/backend/src/src-licenseinfo/src/main/resources/DefaultLicenseInfoHeader.txt
+++ b/backend/src/src-licenseinfo/src/main/resources/DefaultLicenseInfoHeader.txt
@@ -1,7 +1,8 @@
-## All rights reserved. This configuration file is provided to you under the
-## terms and conditions of the Eclipse Distribution License v1.0 which
-## accompanies this distribution, and is available at
-## http://www.eclipse.org/org/documents/edl-v10.php
+## 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/
+##
+## SPDX-License-Identifier: EPL-2.0
 ##
 This product or device contains, among other things, Open Source Software (see below) components developed by third parties and licensed under an Open Source Software license. These Open Source Software components are protected by copyright. Your rights to use these Open Source Software components are governed by the applicable Open Source Software license conditions. You must comply with these license conditions in order to be entitled to use the Open Source Software as foreseen in the relevant license.
 
diff --git a/backend/src/src-licenseinfo/src/main/resources/DefaultObligations.txt b/backend/src/src-licenseinfo/src/main/resources/DefaultObligations.txt
index 0626cc7d65..0e8c3f3a3a 100644
--- a/backend/src/src-licenseinfo/src/main/resources/DefaultObligations.txt
+++ b/backend/src/src-licenseinfo/src/main/resources/DefaultObligations.txt
@@ -1,7 +1,8 @@
-## All rights reserved. This configuration file is provided to you under the
-## terms and conditions of the Eclipse Distribution License v1.0 which
-## accompanies this distribution, and is available at
-## http://www.eclipse.org/org/documents/edl-v10.php
+## 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/
+##
+## SPDX-License-Identifier: EPL-2.0
 ##
 All superordinated products have to:
     - Include the contents of the Readme_OSS / commercial 3rd party software with all required license texts and copyright notices and acknowledgments in the delivery of the product. The ReadMe_OSS has to be delivered in a way that a user can easily find it.
diff --git a/backend/src/src-licenseinfo/src/main/resources/textLicenseInfoFile.vm b/backend/src/src-licenseinfo/src/main/resources/textLicenseInfoFile.vm
index 41062edc3f..33650abd70 100644
--- a/backend/src/src-licenseinfo/src/main/resources/textLicenseInfoFile.vm
+++ b/backend/src/src-licenseinfo/src/main/resources/textLicenseInfoFile.vm
@@ -1,7 +1,8 @@
-## All rights reserved. This configuration file is provided to you under the
-## terms and conditions of the Eclipse Distribution License v1.0 which
-## accompanies this distribution, and is available at
-## http://www.eclipse.org/org/documents/edl-v10.php
+## 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/
+##
+## SPDX-License-Identifier: EPL-2.0
 $projectTitle
 
 
diff --git a/backend/src/src-licenseinfo/src/main/resources/velocity-tools.xml b/backend/src/src-licenseinfo/src/main/resources/velocity-tools.xml
index 1734c273d2..82c6152921 100644
--- a/backend/src/src-licenseinfo/src/main/resources/velocity-tools.xml
+++ b/backend/src/src-licenseinfo/src/main/resources/velocity-tools.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <tools>
     <toolbox scope="application">
diff --git a/backend/src/src-licenseinfo/src/main/resources/xhtmlLicenseInfoFile.vm b/backend/src/src-licenseinfo/src/main/resources/xhtmlLicenseInfoFile.vm
index f074538aea..3e9110586e 100644
--- a/backend/src/src-licenseinfo/src/main/resources/xhtmlLicenseInfoFile.vm
+++ b/backend/src/src-licenseinfo/src/main/resources/xhtmlLicenseInfoFile.vm
@@ -1,7 +1,8 @@
-## All rights reserved. This configuration file is provided to you under the
-## terms and conditions of the Eclipse Distribution License v1.0 which
-## accompanies this distribution, and is available at
-## http://www.eclipse.org/org/documents/edl-v10.php
+## 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/
+##
+## SPDX-License-Identifier: EPL-2.0
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/backend/src/src-licenseinfo/src/main/resources/xmlFile.vm b/backend/src/src-licenseinfo/src/main/resources/xmlFile.vm
index e92c30a148..c33d149a04 100644
--- a/backend/src/src-licenseinfo/src/main/resources/xmlFile.vm
+++ b/backend/src/src-licenseinfo/src/main/resources/xmlFile.vm
@@ -1,7 +1,8 @@
-## All rights reserved. This configuration file is provided to you under the
-## terms and conditions of the Eclipse Distribution License v1.0 which
-## accompanies this distribution, and is available at
-## http://www.eclipse.org/org/documents/edl-v10.php
+## 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/
+##
+## SPDX-License-Identifier: EPL-2.0
 <?xml version="1.0"?>
 <releases>
     #foreach($releaseName in $licenseInfos.keySet())
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandlerTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandlerTest.java
index a21831b62c..b907ca20a8 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandlerTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/LicenseInfoHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.licenseinfo;
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/TestHelper.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/TestHelper.java
index f5c307eb90..f145af702e 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/TestHelper.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/TestHelper.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGeneratorTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGeneratorTest.java
index 43906e6173..eafed8e8c2 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGeneratorTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/DocxGeneratorTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.outputGenerators;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGeneratorTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGeneratorTest.java
index de9f8ddb1e..828c1995f2 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGeneratorTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/outputGenerators/XhtmlGeneratorTest.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.outputGenerators;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CLIParserTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CLIParserTest.java
index aec1b6d863..36af051743 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CLIParserTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CLIParserTest.java
@@ -3,12 +3,11 @@
  * With modifications by Bosch Software Innovations GmbH, 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParserTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParserTest.java
index 5c50938124..76df0087b2 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParserTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/CombinedCLIParserTest.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParserTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParserTest.java
index 649a67b484..fb14b125a3 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParserTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/LicenseInfoParserTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTest.java
index dce42ab9e3..e309ceed45 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/parsers/SPDXParserTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2016-2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.parsers;
 
diff --git a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtilsTest.java b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtilsTest.java
index 752bb444a6..90d329768e 100644
--- a/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtilsTest.java
+++ b/backend/src/src-licenseinfo/src/test/java/org/eclipse/sw360/licenseinfo/util/LicenseNameWithTextUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenseinfo.util;
 
diff --git a/backend/src/src-licenseinfo/src/test/resources/CombinedCLITest.xml b/backend/src/src-licenseinfo/src/test/resources/CombinedCLITest.xml
index 9e554d355f..25a1a5a395 100644
--- a/backend/src/src-licenseinfo/src/test/resources/CombinedCLITest.xml
+++ b/backend/src/src-licenseinfo/src/test/resources/CombinedCLITest.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <CombinedCLI component="InternalComponent 1.0" creator="Creative Employee" date="15.03.2017" baseDoc="-" componentID="1111">
     <License type="global" name="License1" subtype="global" srcFile="some_cli_file.xml" srcComponent="1234">
diff --git a/backend/src/src-licenses/pom.xml b/backend/src/src-licenses/pom.xml
index e2cadd6ff7..c210876bc0 100644
--- a/backend/src/src-licenses/pom.xml
+++ b/backend/src/src-licenses/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java
index 5969ac8fa9..1dd441ff0d 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseServlet.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseServlet.java
index 5a9bc708b2..c57001a9e9 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseServlet.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/LicenseServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseDatabaseHandler.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseDatabaseHandler.java
index c83f4d9e4f..6ec2824e52 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseDatabaseHandler.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseDatabaseHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016-2017.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseRepository.java
index 5dc4f44a58..91b0e98728 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseTypeRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseTypeRepository.java
index efd0201e62..3cdfd0d9b3 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseTypeRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/LicenseTypeRepository.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/ObligationRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/ObligationRepository.java
index 001868ee3c..fba9ad42a7 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/ObligationRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/ObligationRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskCategoryRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskCategoryRepository.java
index 431fc14ef2..ce0a80fa54 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskCategoryRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskCategoryRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskRepository.java
index d73779619a..ee6caf88ee 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/RiskRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/TodoRepository.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/TodoRepository.java
index d84fd82306..8ba1b9515b 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/TodoRepository.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/db/TodoRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.db;
 
diff --git a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/tools/SpdxConnector.java b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/tools/SpdxConnector.java
index 170ba2ce0d..a35919e2e8 100644
--- a/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/tools/SpdxConnector.java
+++ b/backend/src/src-licenses/src/main/java/org/eclipse/sw360/licenses/tools/SpdxConnector.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses.tools;
 import org.apache.log4j.Logger;
diff --git a/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/LicenseHandlerTest.java b/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/LicenseHandlerTest.java
index 6816260885..f7fe8b548c 100644
--- a/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/LicenseHandlerTest.java
+++ b/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/LicenseHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses;
 
diff --git a/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/TestLicenseClient.java b/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/TestLicenseClient.java
index e1a59bb4f9..47b9914544 100644
--- a/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/TestLicenseClient.java
+++ b/backend/src/src-licenses/src/test/java/org/eclipse/sw360/licenses/TestLicenseClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.licenses;
 
diff --git a/backend/src/src-moderation/pom.xml b/backend/src/src-moderation/pom.xml
index 9eb82cf62b..b8a02ecd45 100644
--- a/backend/src/src-moderation/pom.xml
+++ b/backend/src/src-moderation/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationHandler.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationHandler.java
index 811d16d318..cef9b7665a 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationHandler.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationServlet.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationServlet.java
index bfb745b0ec..9202d07d76 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationServlet.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/ModerationServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/COTSDetailsModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/COTSDetailsModerationRequestGenerator.java
index b93e7ca7dd..327301af81 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/COTSDetailsModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/COTSDetailsModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ClearingInformationModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ClearingInformationModerationRequestGenerator.java
index 88248f0f05..16a80c5222 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ClearingInformationModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ClearingInformationModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ComponentModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ComponentModerationRequestGenerator.java
index e295d70b39..30748f08da 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ComponentModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ComponentModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/DocumentDatabaseHandler.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/DocumentDatabaseHandler.java
index 7773b71b3b..b93b1652f4 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/DocumentDatabaseHandler.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/DocumentDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  *//*
 
 
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/EccInformationModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/EccInformationModerationRequestGenerator.java
index 49cdfebc2f..dc7f977d89 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/EccInformationModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/EccInformationModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/LicenseModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/LicenseModerationRequestGenerator.java
index 59d506fb5e..c97d099d90 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/LicenseModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/LicenseModerationRequestGenerator.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java
index 2c6ca06319..8d79d44460 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestGenerator.java
index fbfb065172..6e536e81d3 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestRepository.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestRepository.java
index 8f8eca1601..3b38cd068b 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestRepository.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ModerationRequestRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ProjectModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ProjectModerationRequestGenerator.java
index fbfb5fcd8c..c326daaed8 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ProjectModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ProjectModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ReleaseModerationRequestGenerator.java b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ReleaseModerationRequestGenerator.java
index f97d33df9a..0b61604f4e 100644
--- a/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ReleaseModerationRequestGenerator.java
+++ b/backend/src/src-moderation/src/main/java/org/eclipse/sw360/moderation/db/ReleaseModerationRequestGenerator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.db;
diff --git a/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/TestModerationClient.java b/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/TestModerationClient.java
index fc953ee42c..47764f3850 100644
--- a/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/TestModerationClient.java
+++ b/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/TestModerationClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation;
diff --git a/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java b/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java
index d8721fd205..9b1140f924 100644
--- a/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java
+++ b/backend/src/src-moderation/src/test/java/org/eclipse/sw360/moderation/testutil/DatabaseTestSetup.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.moderation.testutil;
diff --git a/backend/src/src-projects/pom.xml b/backend/src/src-projects/pom.xml
index bd8b489c5b..099af88d5a 100644
--- a/backend/src/src-projects/pom.xml
+++ b/backend/src/src-projects/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectHandler.java b/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectHandler.java
index 05346da676..168e475855 100644
--- a/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectHandler.java
+++ b/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  * With contributions by Siemens Healthcare Diagnostics Inc, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.projects;
 
diff --git a/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectServlet.java b/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectServlet.java
index 875c396946..cb2cdf73f7 100644
--- a/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectServlet.java
+++ b/backend/src/src-projects/src/main/java/org/eclipse/sw360/projects/ProjectServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.projects;
 
diff --git a/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java b/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java
index b0a0d9f733..cf64626267 100644
--- a/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java
+++ b/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/ProjectHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.projects;
diff --git a/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/TestProjectClient.java b/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/TestProjectClient.java
index 82e424ff2e..8d055ac647 100644
--- a/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/TestProjectClient.java
+++ b/backend/src/src-projects/src/test/java/org/eclipse/sw360/projects/TestProjectClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.projects;
 
diff --git a/backend/src/src-schedule/pom.xml b/backend/src/src-schedule/pom.xml
index 11d000ca0f..be362eace6 100644
--- a/backend/src/src-schedule/pom.xml
+++ b/backend/src/src-schedule/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~ Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleHandler.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleHandler.java
index 3f811b40b4..70f0db9f5c 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleHandler.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleHandler.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.schedule.service;
 
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleServlet.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleServlet.java
index fc5a1950fc..84e30773a7 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleServlet.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/service/ScheduleServlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.schedule.service;
 
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/SW360Task.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/SW360Task.java
index b0ce790541..bad581cd95 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/SW360Task.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/SW360Task.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  * With modifications from Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.schedule.timer;
 
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleConstants.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleConstants.java
index fdf4dd1365..aa0a683040 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleConstants.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleConstants.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  * With modifications from Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.schedule.timer;
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleSyncTask.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleSyncTask.java
index bbe4fe5383..68b115f8e3 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleSyncTask.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/ScheduleSyncTask.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  * With modifications from Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.schedule.timer;
 
diff --git a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/Scheduler.java b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/Scheduler.java
index d1119ad577..94cf7d3ea3 100644
--- a/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/Scheduler.java
+++ b/backend/src/src-schedule/src/main/java/org/eclipse/sw360/schedule/timer/Scheduler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  * With modifications from Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.schedule.timer;
 
diff --git a/backend/src/src-schedule/src/main/resources/sw360.properties b/backend/src/src-schedule/src/main/resources/sw360.properties
index 727ded5269..f64ca9da61 100644
--- a/backend/src/src-schedule/src/main/resources/sw360.properties
+++ b/backend/src/src-schedule/src/main/resources/sw360.properties
@@ -1,10 +1,11 @@
 
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 
 #in seconds of today: 0*60*60 = 0 means midnight
 schedule.cvesearch.firstOffset.seconds = 0
diff --git a/backend/src/src-search/pom.xml b/backend/src/src-search/pom.xml
index 53e2279e09..8fa9166630 100644
--- a/backend/src/src-search/pom.xml
+++ b/backend/src/src-search/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java
index 3f685a610b..a5d67f7cdf 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchServlet.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchServlet.java
index d541667572..f6c1ec530e 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchServlet.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/SearchServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/Sw360usersDatabaseSearchHandler.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/Sw360usersDatabaseSearchHandler.java
index 3b2f74419d..6c335401f6 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/Sw360usersDatabaseSearchHandler.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/Sw360usersDatabaseSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/common/SearchConstants.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/common/SearchConstants.java
index 6c4bec5556..2db27fcd48 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/common/SearchConstants.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/common/SearchConstants.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search.common;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java
index dac5008bcf..66d834d032 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/AbstractDatabaseSearchHandler.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search.db;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java
index 4294f5eef8..2bc53f71a6 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/SearchDocument.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search.db;
 
diff --git a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/Sw360dbDatabaseSearchHandler.java b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/Sw360dbDatabaseSearchHandler.java
index 9114a5a312..e0509c5bdc 100644
--- a/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/Sw360dbDatabaseSearchHandler.java
+++ b/backend/src/src-search/src/main/java/org/eclipse/sw360/search/db/Sw360dbDatabaseSearchHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search.db;
 
diff --git a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/SearchHandlerTest.java b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/SearchHandlerTest.java
index 8a7b3696cd..00ffcb6033 100644
--- a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/SearchHandlerTest.java
+++ b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/SearchHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search;
 
diff --git a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/TestSearchClient.java b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/TestSearchClient.java
index 4b33d4d668..f5f5caf88d 100644
--- a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/TestSearchClient.java
+++ b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/TestSearchClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search;
 
diff --git a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/db/SearchDocumentTest.java b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/db/SearchDocumentTest.java
index 9b85426630..2366b0084d 100644
--- a/backend/src/src-search/src/test/java/org/eclipse/sw360/search/db/SearchDocumentTest.java
+++ b/backend/src/src-search/src/test/java/org/eclipse/sw360/search/db/SearchDocumentTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.search.db;
 
diff --git a/backend/src/src-users/pom.xml b/backend/src/src-users/pom.xml
index 35e0d99f0e..77ea3619ac 100644
--- a/backend/src/src-users/pom.xml
+++ b/backend/src/src-users/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserHandler.java b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserHandler.java
index 505bf01d67..ee9ab4f88e 100644
--- a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserHandler.java
+++ b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.users;
 
diff --git a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserServlet.java b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserServlet.java
index d8a74b8745..ad180dc0f5 100644
--- a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserServlet.java
+++ b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/UserServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.users;
 
diff --git a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/db/UserDatabaseHandler.java b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/db/UserDatabaseHandler.java
index 80639763db..4b3fcbaaf5 100644
--- a/backend/src/src-users/src/main/java/org/eclipse/sw360/users/db/UserDatabaseHandler.java
+++ b/backend/src/src-users/src/main/java/org/eclipse/sw360/users/db/UserDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.users.db;
 
diff --git a/backend/src/src-users/src/test/java/org/eclipse/sw360/users/TestUserClient.java b/backend/src/src-users/src/test/java/org/eclipse/sw360/users/TestUserClient.java
index 1ff5390688..da0c9c73f1 100644
--- a/backend/src/src-users/src/test/java/org/eclipse/sw360/users/TestUserClient.java
+++ b/backend/src/src-users/src/test/java/org/eclipse/sw360/users/TestUserClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.users;
 
diff --git a/backend/src/src-users/src/test/java/org/eclipse/sw360/users/UserHandlerTest.java b/backend/src/src-users/src/test/java/org/eclipse/sw360/users/UserHandlerTest.java
index c28ccbe378..4d4921e07f 100644
--- a/backend/src/src-users/src/test/java/org/eclipse/sw360/users/UserHandlerTest.java
+++ b/backend/src/src-users/src/test/java/org/eclipse/sw360/users/UserHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.users;
 
diff --git a/backend/src/src-vendors/pom.xml b/backend/src/src-vendors/pom.xml
index 3fb6889787..b344d083cc 100644
--- a/backend/src/src-vendors/pom.xml
+++ b/backend/src/src-vendors/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorDatabaseHandler.java b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorDatabaseHandler.java
index b47e02f3c5..d676efd779 100644
--- a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorDatabaseHandler.java
+++ b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorDatabaseHandler.java
@@ -2,10 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2017.
  * Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vendors;
 
diff --git a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorHandler.java b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorHandler.java
index aaece29065..6a84d7065d 100644
--- a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorHandler.java
+++ b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vendors;
 
diff --git a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorServlet.java b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorServlet.java
index a378e508ef..b70e71f9d7 100644
--- a/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorServlet.java
+++ b/backend/src/src-vendors/src/main/java/org/eclipse/sw360/vendors/VendorServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vendors;
 
diff --git a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java
index 0ecbb1e74d..57d5835bc3 100644
--- a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java
+++ b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/TestVendorClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vendors;
 
diff --git a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java
index 360befe207..e753b93dfe 100644
--- a/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java
+++ b/backend/src/src-vendors/src/test/java/org/eclipse/sw360/vendors/VendorHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vendors;
 
diff --git a/backend/src/src-vulnerabilities/pom.xml b/backend/src/src-vulnerabilities/pom.xml
index 8bd8edc136..135750e297 100644
--- a/backend/src/src-vulnerabilities/pom.xml
+++ b/backend/src/src-vulnerabilities/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityHandler.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityHandler.java
index 0f92c6e47e..34a247a7e4 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityHandler.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityHandler.java
@@ -3,12 +3,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016-2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities;
 
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityServlet.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityServlet.java
index 6b0237e0e7..9c3265fa7d 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityServlet.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/VulnerabilityServlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities;
 
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/common/VulnerabilityMapper.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/common/VulnerabilityMapper.java
index b88fb33782..57b5a38e24 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/common/VulnerabilityMapper.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/common/VulnerabilityMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities.common;
 
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityDatabaseHandler.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityDatabaseHandler.java
index 2b5f44e0a4..524ba28c21 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityDatabaseHandler.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityDatabaseHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities.db;
 
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRelationRepository.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRelationRepository.java
index dd9d3bcb72..cd9c8047df 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRelationRepository.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRelationRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities.db;
 
diff --git a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRepository.java b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRepository.java
index cf9df9404c..642fdd9953 100644
--- a/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRepository.java
+++ b/backend/src/src-vulnerabilities/src/main/java/org/eclipse/sw360/vulnerabilities/db/VulnerabilityRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.vulnerabilities.db;
 
diff --git a/backend/src/src-vulnerabilities/src/test/resources/log4j.properties b/backend/src/src-vulnerabilities/src/test/resources/log4j.properties
index 0187ff0dd3..b76876641f 100644
--- a/backend/src/src-vulnerabilities/src/test/resources/log4j.properties
+++ b/backend/src/src-vulnerabilities/src/test/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/backend/src/src-wsimport/pom.xml b/backend/src/src-wsimport/pom.xml
index 20628fd4be..7992be58bb 100644
--- a/backend/src/src-wsimport/pom.xml
+++ b/backend/src/src-wsimport/pom.xml
@@ -3,13 +3,12 @@
  ~ Copyright (c) Verifa Oy, 2017.
  ~ Part of the SW360 Portal Project.
  ~
- ~ SPDX-License-Identifier: EPL-1.0
+ ~ 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/
  ~
- ~ 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
-  -->
+ ~ SPDX-License-Identifier: EPL-2.0
+ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLibrary.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLibrary.java
index 77445a02fc..43905593aa 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLibrary.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLibrary.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLicense.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLicense.java
index d737a74121..b761cb4899 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLicense.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsLicense.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProduct.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProduct.java
index 7e9d6cd991..b2395f9327 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProduct.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProduct.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProject.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProject.java
index f35e337528..1b1e54068d 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProject.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProject.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectLibs.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectLibs.java
index b7198a9da1..20034a16e7 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectLibs.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectLibs.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitalInformation.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitalInformation.java
index 4a346275d4..521fa91e9a 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitalInformation.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitalInformation.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitals.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitals.java
index e0baf9ba71..07542bb352 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitals.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsProjectVitals.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsReference.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsReference.java
index e33cc1226c..b796e8db74 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsReference.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/domain/WsReference.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.domain;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/EntityTranslator.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/EntityTranslator.java
index 1b2ff491b3..8ea63715f6 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/EntityTranslator.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/EntityTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ComponentTranslator.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ComponentTranslator.java
index 5981940414..3c86fdc112 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ComponentTranslator.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ComponentTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ReleaseTranslator.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ReleaseTranslator.java
index f68d90bfad..9ceb7bf667 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ReleaseTranslator.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLibraryToSw360ReleaseTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLicenseToSw360LicenseTranslator.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLicenseToSw360LicenseTranslator.java
index b533d9510c..94b99ca5f5 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLicenseToSw360LicenseTranslator.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsLicenseToSw360LicenseTranslator.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsProjectToSw360ProjectTranslator.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsProjectToSw360ProjectTranslator.java
index 66c1677bd5..e6d24c8ec5 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsProjectToSw360ProjectTranslator.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/WsProjectToSw360ProjectTranslator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/helper/ReleaseRelation.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/helper/ReleaseRelation.java
index d623b6ead8..c5542d2aa2 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/helper/ReleaseRelation.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/entitytranslation/helper/ReleaseRelation.java
@@ -3,12 +3,11 @@
  * With modifications by Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.entitytranslation.helper;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsImportService.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsImportService.java
index 7e439c78ac..8034e255dc 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsImportService.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsImportService.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018-2019. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.rest;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsRestClient.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsRestClient.java
index 6ee362aa5a..53b479a796 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsRestClient.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/rest/WsRestClient.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018-2019. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.rest;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportHandler.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportHandler.java
index 562a4bdf92..8179dca72e 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportHandler.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportHandler.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.service;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportServlet.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportServlet.java
index 9dce19b4b8..b59acf5418 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportServlet.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/service/WsImportServlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.service;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftExchange.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftExchange.java
index d95fe54c05..6b74e1b9e6 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftExchange.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftExchange.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.thrift;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java
index 7bb65df7c4..89964f5486 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/ThriftUploader.java
@@ -3,12 +3,11 @@
  * With modifications by Verifa Oy, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.thrift;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportError.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportError.java
index 455cbe5101..c0f7ab2074 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportError.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportError.java
@@ -3,12 +3,11 @@
  * With modifications by Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.thrift.helper;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportResult.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportResult.java
index 51f1113912..c304605e9a 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportResult.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/thrift/helper/ProjectImportResult.java
@@ -3,12 +3,11 @@
  * With modifications by Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.thrift.helper;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/TranslationConstants.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/TranslationConstants.java
index c85c038bbf..00429a44b4 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/TranslationConstants.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/TranslationConstants.java
@@ -3,12 +3,11 @@
  * With modifications by Verifa Oy, 2018-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.utility;
 
diff --git a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/WsTokenType.java b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/WsTokenType.java
index 39b154d26e..6d2a8943f1 100644
--- a/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/WsTokenType.java
+++ b/backend/src/src-wsimport/src/main/java/org/eclipse/sw360/wsimport/utility/WsTokenType.java
@@ -1,12 +1,11 @@
 /*
  * Copyright (c) Verifa Oy, 2018. Part of the SW360 Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.wsimport.utility;
 
diff --git a/backend/svc-common/pom.xml b/backend/svc-common/pom.xml
index 9eca7bd8c1..0e89dfd746 100644
--- a/backend/svc-common/pom.xml
+++ b/backend/svc-common/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc-common/src/main/java/org/eclipse/sw360/SW360ServiceContextListener.java b/backend/svc-common/src/main/java/org/eclipse/sw360/SW360ServiceContextListener.java
index 5f33c43b1f..2f43cfd2bd 100644
--- a/backend/svc-common/src/main/java/org/eclipse/sw360/SW360ServiceContextListener.java
+++ b/backend/svc-common/src/main/java/org/eclipse/sw360/SW360ServiceContextListener.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360;
diff --git a/backend/svc/pom.xml b/backend/svc/pom.xml
index 17ff41e1e2..a33632c1b7 100644
--- a/backend/svc/pom.xml
+++ b/backend/svc/pom.xml
@@ -4,12 +4,11 @@
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~ With modifacations by Verifa Oy, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-attachments/pom.xml b/backend/svc/svc-attachments/pom.xml
index 092e342f7e..b4d5cd16dd 100644
--- a/backend/svc/svc-attachments/pom.xml
+++ b/backend/svc/svc-attachments/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/svc/svc-attachments/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-attachments/src/main/webapp/WEB-INF/web.xml
index 3d275c5184..2b18fbc647 100644
--- a/backend/svc/svc-attachments/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-attachments/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-attachments/src/main/webapp/index.jsp b/backend/svc/svc-attachments/src/main/webapp/index.jsp
index 93ab6794cb..319416316c 100644
--- a/backend/svc/svc-attachments/src/main/webapp/index.jsp
+++ b/backend/svc/svc-attachments/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 Author : johannes.najjar@tngtech.com
diff --git a/backend/svc/svc-components/pom.xml b/backend/svc/svc-components/pom.xml
index b3491b029e..b9720f0b94 100644
--- a/backend/svc/svc-components/pom.xml
+++ b/backend/svc/svc-components/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-components/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-components/src/main/webapp/WEB-INF/web.xml
index bf9990b076..a757357f43 100644
--- a/backend/svc/svc-components/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-components/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-components/src/main/webapp/index.jsp b/backend/svc/svc-components/src/main/webapp/index.jsp
index c4575d8e71..fa7b5ae7b1 100644
--- a/backend/svc/svc-components/src/main/webapp/index.jsp
+++ b/backend/svc/svc-components/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 Author : cedric.bodet@tngtech.com
 Author : johannes.najjar@tngtech.com
 
diff --git a/backend/svc/svc-cvesearch/pom.xml b/backend/svc/svc-cvesearch/pom.xml
index 4795aeda69..287244fcf8 100644
--- a/backend/svc/svc-cvesearch/pom.xml
+++ b/backend/svc/svc-cvesearch/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2015.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/backend/svc/svc-cvesearch/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-cvesearch/src/main/webapp/WEB-INF/web.xml
index 72e9521786..3e3ba1ff99 100644
--- a/backend/svc/svc-cvesearch/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-cvesearch/src/main/webapp/WEB-INF/web.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2015-2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-cvesearch/src/main/webapp/index.jsp b/backend/svc/svc-cvesearch/src/main/webapp/index.jsp
index 2e7573f684..d527efa168 100644
--- a/backend/svc/svc-cvesearch/src/main/webapp/index.jsp
+++ b/backend/svc/svc-cvesearch/src/main/webapp/index.jsp
@@ -2,12 +2,11 @@
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 With modifications from Bosch Software Innovations GmbH, 2015-2016.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : maximilian.huber@tngtech.com
 
diff --git a/backend/svc/svc-fossology/pom.xml b/backend/svc/svc-fossology/pom.xml
index 3daa73c662..e939fb394a 100644
--- a/backend/svc/svc-fossology/pom.xml
+++ b/backend/svc/svc-fossology/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-fossology/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-fossology/src/main/webapp/WEB-INF/web.xml
index 682d405299..d9071dd92d 100644
--- a/backend/svc/svc-fossology/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-fossology/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-fossology/src/main/webapp/index.jsp b/backend/svc/svc-fossology/src/main/webapp/index.jsp
index f5260dda50..1baed137df 100644
--- a/backend/svc/svc-fossology/src/main/webapp/index.jsp
+++ b/backend/svc/svc-fossology/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
diff --git a/backend/svc/svc-licenseinfo/pom.xml b/backend/svc/svc-licenseinfo/pom.xml
index bab2274d04..9c1a58cca2 100644
--- a/backend/svc/svc-licenseinfo/pom.xml
+++ b/backend/svc/svc-licenseinfo/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/svc/svc-licenseinfo/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-licenseinfo/src/main/webapp/WEB-INF/web.xml
index c0e2be20eb..a6bf15fd6b 100644
--- a/backend/svc/svc-licenseinfo/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-licenseinfo/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-licenseinfo/src/main/webapp/index.jsp b/backend/svc/svc-licenseinfo/src/main/webapp/index.jsp
index a74126659b..22972412b2 100644
--- a/backend/svc/svc-licenseinfo/src/main/webapp/index.jsp
+++ b/backend/svc/svc-licenseinfo/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : alex.borodin@evosoft.com
 
diff --git a/backend/svc/svc-licenses/pom.xml b/backend/svc/svc-licenses/pom.xml
index 6961b3c494..af97f14fb6 100644
--- a/backend/svc/svc-licenses/pom.xml
+++ b/backend/svc/svc-licenses/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-licenses/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-licenses/src/main/webapp/WEB-INF/web.xml
index 2eb553b8f9..7782e610a4 100644
--- a/backend/svc/svc-licenses/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-licenses/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-licenses/src/main/webapp/index.jsp b/backend/svc/svc-licenses/src/main/webapp/index.jsp
index 41c771b9bd..9ca52480b7 100644
--- a/backend/svc/svc-licenses/src/main/webapp/index.jsp
+++ b/backend/svc/svc-licenses/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 
diff --git a/backend/svc/svc-moderation/pom.xml b/backend/svc/svc-moderation/pom.xml
index e2ecd6404d..d1e577d39a 100644
--- a/backend/svc/svc-moderation/pom.xml
+++ b/backend/svc/svc-moderation/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-moderation/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-moderation/src/main/webapp/WEB-INF/web.xml
index 05e3955e9d..1e0a89d71d 100644
--- a/backend/svc/svc-moderation/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-moderation/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-moderation/src/main/webapp/index.jsp b/backend/svc/svc-moderation/src/main/webapp/index.jsp
index 48886c3f70..9a48ec6228 100644
--- a/backend/svc/svc-moderation/src/main/webapp/index.jsp
+++ b/backend/svc/svc-moderation/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 Author : johannes.najjar@tngtech.com
diff --git a/backend/svc/svc-projects/pom.xml b/backend/svc/svc-projects/pom.xml
index 49050bceae..c9f1110c5b 100644
--- a/backend/svc/svc-projects/pom.xml
+++ b/backend/svc/svc-projects/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/backend/svc/svc-projects/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-projects/src/main/webapp/WEB-INF/web.xml
index 45ddd00225..fc7154c705 100644
--- a/backend/svc/svc-projects/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-projects/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-projects/src/main/webapp/index.jsp b/backend/svc/svc-projects/src/main/webapp/index.jsp
index c07ed0f1f3..19f949a8bd 100644
--- a/backend/svc/svc-projects/src/main/webapp/index.jsp
+++ b/backend/svc/svc-projects/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 Author : johannes.najjar@tngtech.com
diff --git a/backend/svc/svc-schedule/pom.xml b/backend/svc/svc-schedule/pom.xml
index 49ba966391..e14a7fbd94 100644
--- a/backend/svc/svc-schedule/pom.xml
+++ b/backend/svc/svc-schedule/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/backend/svc/svc-schedule/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-schedule/src/main/webapp/WEB-INF/web.xml
index efff9dc5f9..432ba6bfe5 100644
--- a/backend/svc/svc-schedule/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-schedule/src/main/webapp/WEB-INF/web.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2015-2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-schedule/src/main/webapp/index.jsp b/backend/svc/svc-schedule/src/main/webapp/index.jsp
index 31504a3c7c..8a6874e287 100644
--- a/backend/svc/svc-schedule/src/main/webapp/index.jsp
+++ b/backend/svc/svc-schedule/src/main/webapp/index.jsp
@@ -2,12 +2,11 @@
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 With modifications from Bosch Software Innovations GmbH, 2015-2016.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : birgit.heydenreich@tngtech.com
 
diff --git a/backend/svc/svc-search/pom.xml b/backend/svc/svc-search/pom.xml
index aff936e95b..e109893a5b 100644
--- a/backend/svc/svc-search/pom.xml
+++ b/backend/svc/svc-search/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/svc/svc-search/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-search/src/main/webapp/WEB-INF/web.xml
index 77862b3aa2..e27a3ee3ce 100644
--- a/backend/svc/svc-search/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-search/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-search/src/main/webapp/index.jsp b/backend/svc/svc-search/src/main/webapp/index.jsp
index 7c4521b38c..00347fccec 100644
--- a/backend/svc/svc-search/src/main/webapp/index.jsp
+++ b/backend/svc/svc-search/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 
diff --git a/backend/svc/svc-users/pom.xml b/backend/svc/svc-users/pom.xml
index 93f4cf5f75..4b8db91f89 100644
--- a/backend/svc/svc-users/pom.xml
+++ b/backend/svc/svc-users/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-users/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-users/src/main/webapp/WEB-INF/web.xml
index 20869583dc..6dadb6b20d 100644
--- a/backend/svc/svc-users/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-users/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-users/src/main/webapp/index.jsp b/backend/svc/svc-users/src/main/webapp/index.jsp
index 94e30888c9..28b2c13e5b 100644
--- a/backend/svc/svc-users/src/main/webapp/index.jsp
+++ b/backend/svc/svc-users/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : cedric.bodet@tngtech.com
 
diff --git a/backend/svc/svc-vendors/pom.xml b/backend/svc/svc-vendors/pom.xml
index 031f5235d8..f79bb157a4 100644
--- a/backend/svc/svc-vendors/pom.xml
+++ b/backend/svc/svc-vendors/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-vendors/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-vendors/src/main/webapp/WEB-INF/web.xml
index e9d1330633..83cbaa05d6 100644
--- a/backend/svc/svc-vendors/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-vendors/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-vendors/src/main/webapp/index.jsp b/backend/svc/svc-vendors/src/main/webapp/index.jsp
index fdd34efaf1..9ac64c9f2f 100644
--- a/backend/svc/svc-vendors/src/main/webapp/index.jsp
+++ b/backend/svc/svc-vendors/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2013-2014. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 Author : cedric.bodet@tngtech.com
 
 Description: Welcome file for Vendor Service
diff --git a/backend/svc/svc-vulnerabilities/pom.xml b/backend/svc/svc-vulnerabilities/pom.xml
index c7fbfcaab0..1603d88561 100644
--- a/backend/svc/svc-vulnerabilities/pom.xml
+++ b/backend/svc/svc-vulnerabilities/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-vulnerabilities/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-vulnerabilities/src/main/webapp/WEB-INF/web.xml
index 24f63c0261..d6d5e662b6 100644
--- a/backend/svc/svc-vulnerabilities/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-vulnerabilities/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-vulnerabilities/src/main/webapp/index.jsp b/backend/svc/svc-vulnerabilities/src/main/webapp/index.jsp
index ef7a9f1fcd..92695b5996 100644
--- a/backend/svc/svc-vulnerabilities/src/main/webapp/index.jsp
+++ b/backend/svc/svc-vulnerabilities/src/main/webapp/index.jsp
@@ -1,12 +1,11 @@
 <!--
 Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 Author : stefan.jaeger@evosoft.com
 
 Description: Welcome file for Vulnerability Service
diff --git a/backend/svc/svc-wsimport/pom.xml b/backend/svc/svc-wsimport/pom.xml
index 597ed4b1a1..dee85ffcf3 100644
--- a/backend/svc/svc-wsimport/pom.xml
+++ b/backend/svc/svc-wsimport/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright (c) Verifa Oy, 2018. Part of the SW360 Portal Project.
   ~ With contributions by Siemens AG, 2019.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-wsimport/src/main/webapp/WEB-INF/web.xml b/backend/svc/svc-wsimport/src/main/webapp/WEB-INF/web.xml
index b73adf1de2..c5f055ef8f 100644
--- a/backend/svc/svc-wsimport/src/main/webapp/WEB-INF/web.xml
+++ b/backend/svc/svc-wsimport/src/main/webapp/WEB-INF/web.xml
@@ -3,12 +3,11 @@
   ~ Copyright (c) Verifa Oy, 2018.
   ~ Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/backend/svc/svc-wsimport/src/main/webapp/index.jsp b/backend/svc/svc-wsimport/src/main/webapp/index.jsp
index ff35dd82bd..ec30bfdaf2 100644
--- a/backend/svc/svc-wsimport/src/main/webapp/index.jsp
+++ b/backend/svc/svc-wsimport/src/main/webapp/index.jsp
@@ -2,12 +2,11 @@
 Copyright (c) Verifa Oy, 2018.
 Part of the SW360 Portal Project.
 
-SPDX-License-Identifier: EPL-1.0
+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/
 
-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
+SPDX-License-Identifier: EPL-2.0
 
 Author : maximilian.huber@tngtech.com
 Author : ksoranko@verifa.io
diff --git a/backend/utils/pom.xml b/backend/utils/pom.xml
index 3b703c38f0..b85d768605 100644
--- a/backend/utils/pom.xml
+++ b/backend/utils/pom.xml
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
diff --git a/backend/utils/src/main/java/org/eclipse/sw360/UtilsEntryPoint.java b/backend/utils/src/main/java/org/eclipse/sw360/UtilsEntryPoint.java
index 5ca774d66f..025a95b9ff 100644
--- a/backend/utils/src/main/java/org/eclipse/sw360/UtilsEntryPoint.java
+++ b/backend/utils/src/main/java/org/eclipse/sw360/UtilsEntryPoint.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360;
 
diff --git a/backend/utils/src/main/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloader.java b/backend/utils/src/main/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloader.java
index b9a9c9a1e2..b767d9ef58 100644
--- a/backend/utils/src/main/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloader.java
+++ b/backend/utils/src/main/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloader.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.attachments.db;
diff --git a/backend/utils/src/main/resources/log4j.properties b/backend/utils/src/main/resources/log4j.properties
index dada0779ab..059abb184f 100644
--- a/backend/utils/src/main/resources/log4j.properties
+++ b/backend/utils/src/main/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/backend/utils/src/test/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloaderTest.java b/backend/utils/src/test/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloaderTest.java
index 1085886dcd..379835b8c5 100644
--- a/backend/utils/src/test/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloaderTest.java
+++ b/backend/utils/src/test/java/org/eclipse/sw360/attachments/db/RemoteAttachmentDownloaderTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.attachments.db;
 
diff --git a/backend/utils/src/test/resources/log4j.properties b/backend/utils/src/test/resources/log4j.properties
index 1514c00763..b4b7164a99 100644
--- a/backend/utils/src/test/resources/log4j.properties
+++ b/backend/utils/src/test/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 log4j.rootLogger=OFF
diff --git a/build-configuration/pom.xml b/build-configuration/pom.xml
index b9a6a3ccdf..852f33298a 100644
--- a/build-configuration/pom.xml
+++ b/build-configuration/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/build-configuration/resources/couchdb.properties b/build-configuration/resources/couchdb.properties
index 28630374fd..dab514114f 100644
--- a/build-configuration/resources/couchdb.properties
+++ b/build-configuration/resources/couchdb.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # N.B this is the default build property file, defined in module build-configuration
diff --git a/build-configuration/resources/log4j.properties b/build-configuration/resources/log4j.properties
index 4a8bee5c27..2c305c44f9 100644
--- a/build-configuration/resources/log4j.properties
+++ b/build-configuration/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # N.B this is the default build property file, defined in module build-configuration
diff --git a/build-configuration/resources/search.properties b/build-configuration/resources/search.properties
index 2bf71a1c68..bf032a4a90 100644
--- a/build-configuration/resources/search.properties
+++ b/build-configuration/resources/search.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # N.B this is the default build property file, defined in module build-configuration
diff --git a/build-configuration/resources/sw360.properties b/build-configuration/resources/sw360.properties
index 824d82ecc5..39ff558651 100644
--- a/build-configuration/resources/sw360.properties
+++ b/build-configuration/resources/sw360.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # N.B this is the default build property file, defined in module build-configuration
diff --git a/build-configuration/test-resources/couchdb.properties b/build-configuration/test-resources/couchdb.properties
index 10c11c7b97..72e71337d9 100644
--- a/build-configuration/test-resources/couchdb.properties
+++ b/build-configuration/test-resources/couchdb.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # N.B this is the build property file, copied from module build-configuration
diff --git a/frontend/configuration/portal-ext.properties b/frontend/configuration/portal-ext.properties
index 2bdedc6f56..5687b9c0d2 100644
--- a/frontend/configuration/portal-ext.properties
+++ b/frontend/configuration/portal-ext.properties
@@ -1,11 +1,10 @@
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
-# A http://www.eclipse.org/legal/epl-v10.html
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # ***********************************
diff --git a/frontend/configuration/setenv.sh b/frontend/configuration/setenv.sh
index 58d87279b7..631754d635 100644
--- a/frontend/configuration/setenv.sh
+++ b/frontend/configuration/setenv.sh
@@ -1,11 +1,10 @@
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
-# A http://www.eclipse.org/legal/epl-v10.html
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # The following settings should be adapted to your needs
diff --git a/frontend/configuration/sw360server.properties b/frontend/configuration/sw360server.properties
index 1b0e470603..51a368ecb0 100644
--- a/frontend/configuration/sw360server.properties
+++ b/frontend/configuration/sw360server.properties
@@ -1,11 +1,10 @@
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
-# A http://www.eclipse.org/legal/epl-v10.html
+# SPDX-License-Identifier: EPL-2.0
 #
 key_foss_server_user = siemagrant
 key_foss_server_address = 192.168.1.1
diff --git a/frontend/liferay-theme/pom.xml b/frontend/liferay-theme/pom.xml
index b64c488446..6ded099357 100644
--- a/frontend/liferay-theme/pom.xml
+++ b/frontend/liferay-theme/pom.xml
@@ -3,12 +3,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/frontend/liferay-theme/src/main/resources/content/Language.properties b/frontend/liferay-theme/src/main/resources/content/Language.properties
index 308c39508c..5bd46fc447 100644
--- a/frontend/liferay-theme/src/main/resources/content/Language.properties
+++ b/frontend/liferay-theme/src/main/resources/content/Language.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 show-breadcrumbs=Show Breadcrumbs
diff --git a/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-look-and-feel.xml b/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
index 162a138bdd..0d3c1a4ccc 100644
--- a/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
+++ b/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
@@ -4,12 +4,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <look-and-feel>
diff --git a/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index a715a97704..2caed91bce 100644
--- a/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/frontend/liferay-theme/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,15 +1,16 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 author=Siemens AG
 change-log=
-licenses=EPL-1.0
+licenses=EPL-2.0
 liferay-versions=7.2.0+
 long-description=
 module-group-id=liferay
diff --git a/frontend/liferay-theme/src/main/webapp/css/_clay_variables.scss b/frontend/liferay-theme/src/main/webapp/css/_clay_variables.scss
index 4bd16fd5ed..ef3adb2864 100644
--- a/frontend/liferay-theme/src/main/webapp/css/_clay_variables.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/_clay_variables.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /*
diff --git a/frontend/liferay-theme/src/main/webapp/css/_custom.scss b/frontend/liferay-theme/src/main/webapp/css/_custom.scss
index 7934e3c12b..55d34bb4ce 100644
--- a/frontend/liferay-theme/src/main/webapp/css/_custom.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/_custom.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 @import "bootstrap43/modal";
diff --git a/frontend/liferay-theme/src/main/webapp/css/bootstrap43/_modal.scss b/frontend/liferay-theme/src/main/webapp/css/bootstrap43/_modal.scss
index 8017392662..ad9927cc41 100644
--- a/frontend/liferay-theme/src/main/webapp/css/bootstrap43/_modal.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/bootstrap43/_modal.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /*
diff --git a/frontend/liferay-theme/src/main/webapp/css/clay.scss b/frontend/liferay-theme/src/main/webapp/css/clay.scss
index 54567d5880..e82585503f 100644
--- a/frontend/liferay-theme/src/main/webapp/css/clay.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/clay.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 @import "clay/atlas";
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/_alert.scss b/frontend/liferay-theme/src/main/webapp/css/portal/_alert.scss
index dece1532db..784ce205bd 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/_alert.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/_alert.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .alert-notifications-fixed {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/_breadcrumbs.scss b/frontend/liferay-theme/src/main/webapp/css/portal/_breadcrumbs.scss
index 04606af204..f7bf0a33e9 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/_breadcrumbs.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/_breadcrumbs.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  #breadcrumbs {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/_footer.scss b/frontend/liferay-theme/src/main/webapp/css/portal/_footer.scss
index dc740b686e..f3f4d9940f 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/_footer.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/_footer.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 #footer {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/_header.scss b/frontend/liferay-theme/src/main/webapp/css/portal/_header.scss
index 62d64401e1..c2e53dba35 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/_header.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/_header.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  header {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/_loadingbar.scss b/frontend/liferay-theme/src/main/webapp/css/portal/_loadingbar.scss
index 83e05d7afa..b5b158a9a6 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/_loadingbar.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/_loadingbar.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  body > div.lfr-spa-loading-bar {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/header/_navigation.scss b/frontend/liferay-theme/src/main/webapp/css/portal/header/_navigation.scss
index 1201c73317..9a5a6e3c96 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/header/_navigation.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/header/_navigation.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  .navbar {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portal/header/_user.scss b/frontend/liferay-theme/src/main/webapp/css/portal/header/_user.scss
index e476fa3dac..c3dba1f246 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portal/header/_user.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portal/header/_user.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .portlet-user-personal-bar {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portlet/_login.scss b/frontend/liferay-theme/src/main/webapp/css/portlet/_login.scss
index 28e5ade6b5..658e9f5e4f 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portlet/_login.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portlet/_login.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .portlet-login {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portlet/_portlet_decorators.scss b/frontend/liferay-theme/src/main/webapp/css/portlet/_portlet_decorators.scss
index f6836e066e..729f0f8b4d 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portlet/_portlet_decorators.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portlet/_portlet_decorators.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .sw360-portlet-decorator {
diff --git a/frontend/liferay-theme/src/main/webapp/css/portlet/_variables_custom.scss b/frontend/liferay-theme/src/main/webapp/css/portlet/_variables_custom.scss
index 2c7a5c343b..33887aece2 100644
--- a/frontend/liferay-theme/src/main/webapp/css/portlet/_variables_custom.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/portlet/_variables_custom.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 $portlet-header-margin-bottom: map-get($spacers, 5);
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/_sw360.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/_sw360.scss
index 5060c1f1c4..816fa15da4 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/_sw360.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/_sw360.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .sw360-portlet-decorator {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_attachments.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_attachments.scss
index 3b8e7f91ce..28f5142924 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_attachments.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_attachments.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  table.attachments {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_card.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_card.scss
index 7b7b1d830c..3823ebe789 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_card.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_card.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .card {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_datatable.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_datatable.scss
index e4fd82711b..d7564a5e68 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_datatable.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_datatable.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 table.dataTable {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_form.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_form.scss
index e73fcc3902..9cc76267c6 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_form.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_form.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 :not(form) {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_jumbotron.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_jumbotron.scss
index f9ba0bb311..4b2f76199e 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_jumbotron.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_jumbotron.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  .jumbotron {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_merge.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_merge.scss
index 7988ea2c96..3b06ce7362 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_merge.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_merge.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .merge.wizardBody {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_statebox.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_statebox.scss
index 9877d53e90..1efc8ffbee 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_statebox.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_statebox.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .stateBox {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_table.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_table.scss
index 1c99a0eaf5..45aacc6e80 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_table.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_table.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 table.table {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_treetable.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_treetable.scss
index a3297571d3..e027b4dedd 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_treetable.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_treetable.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  .treetable {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_typeicon.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_typeicon.scss
index 6b7895ff6b..e6a63e59be 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_typeicon.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_typeicon.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .type-icon-component {
diff --git a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_wizard.scss b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_wizard.scss
index a85566c055..d730b9f900 100644
--- a/frontend/liferay-theme/src/main/webapp/css/sw360/components/_wizard.scss
+++ b/frontend/liferay-theme/src/main/webapp/css/sw360/components/_wizard.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  div.wizardHeader {
diff --git a/frontend/liferay-theme/src/main/webapp/js/main.js b/frontend/liferay-theme/src/main/webapp/js/main.js
index 809c5036e2..f1c396b450 100644
--- a/frontend/liferay-theme/src/main/webapp/js/main.js
+++ b/frontend/liferay-theme/src/main/webapp/js/main.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 AUI().ready('liferay-sign-in-modal', function(AUI) {
diff --git a/frontend/liferay-theme/src/main/webapp/layoutttpl/custom/2_columns_sidebar.ftl b/frontend/liferay-theme/src/main/webapp/layoutttpl/custom/2_columns_sidebar.ftl
index 046b51bd93..6838d61444 100644
--- a/frontend/liferay-theme/src/main/webapp/layoutttpl/custom/2_columns_sidebar.ftl
+++ b/frontend/liferay-theme/src/main/webapp/layoutttpl/custom/2_columns_sidebar.ftl
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <div class="columns-2-sidebar" id="main-content" role="main">
diff --git a/frontend/liferay-theme/src/main/webapp/templates/init_custom.ftl b/frontend/liferay-theme/src/main/webapp/templates/init_custom.ftl
index b93b732f62..bc13edcc7c 100644
--- a/frontend/liferay-theme/src/main/webapp/templates/init_custom.ftl
+++ b/frontend/liferay-theme/src/main/webapp/templates/init_custom.ftl
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <#assign
diff --git a/frontend/liferay-theme/src/main/webapp/templates/portal_normal.ftl b/frontend/liferay-theme/src/main/webapp/templates/portal_normal.ftl
index 7db92c05cd..3cafc1121b 100644
--- a/frontend/liferay-theme/src/main/webapp/templates/portal_normal.ftl
+++ b/frontend/liferay-theme/src/main/webapp/templates/portal_normal.ftl
@@ -3,12 +3,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <!--
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 498d71ea9f..4829919f74 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/frontend/sw360-portlet/bnd.bnd b/frontend/sw360-portlet/bnd.bnd
index 46b3966428..4f3bcb77ab 100644
--- a/frontend/sw360-portlet/bnd.bnd
+++ b/frontend/sw360-portlet/bnd.bnd
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 Bundle-Name: SW360 Portlet
@@ -14,7 +13,7 @@ Bundle-SymbolicName: sw360-portlet
 Bundle-Description: Part of the SW360 Portal Project. http://sw360.github.io/
 Bundle-Version: 1.0.0
 Bundle-Copyright: Siemens AG 2019, Bosch Software Innovations GmbH 2019
-Bundle-License: EPL-1.0
+Bundle-License: EPL-2.0
 
 -check: all
 -contract: JavaPortlet
diff --git a/frontend/sw360-portlet/pom.xml b/frontend/sw360-portlet/pom.xml
index 547dbc38eb..bee10b3934 100644
--- a/frontend/sw360-portlet/pom.xml
+++ b/frontend/sw360-portlet/pom.xml
@@ -3,12 +3,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/AttachmentPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/AttachmentPortletUtils.java
index be4117f2c4..6634436667 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/AttachmentPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/AttachmentPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.common;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CommonVulnerabilityPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CommonVulnerabilityPortletUtils.java
index 1298231dba..b89941ce5b 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CommonVulnerabilityPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CommonVulnerabilityPortletUtils.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CustomFieldHelper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CustomFieldHelper.java
index 026a3391ca..7f82e149bc 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CustomFieldHelper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/CustomFieldHelper.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2017.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ErrorMessages.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ErrorMessages.java
index fffc81ea81..48f4fe17cf 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ErrorMessages.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ErrorMessages.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/FossologyConnectionHelper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/FossologyConnectionHelper.java
index c4b9c395c1..d42b643860 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/FossologyConnectionHelper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/FossologyConnectionHelper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/JsonHelpers.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/JsonHelpers.java
index 53ba64cc7a..2b6978be08 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/JsonHelpers.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/JsonHelpers.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
index 56bea9782e..c7c389b466 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortalConstants.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortletUtils.java
index 4d04ee1dd0..820fea5e14 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/PortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ProjectSearchUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ProjectSearchUtils.java
index 8c86aa75eb..0c6b7073a2 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ProjectSearchUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ProjectSearchUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ResumableUpload.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ResumableUpload.java
index ecded9466a..f8898793c6 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ResumableUpload.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ResumableUpload.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ThriftJsonSerializer.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ThriftJsonSerializer.java
index c19f320814..714218c79e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ThriftJsonSerializer.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/ThriftJsonSerializer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/UsedAsLiferayAction.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/UsedAsLiferayAction.java
index f9aefee36a..97c7ac7750 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/UsedAsLiferayAction.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/UsedAsLiferayAction.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.common;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesParser.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesParser.java
index a1e408157e..81e26d65c2 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesParser.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesUtils.java
index c032db7c9a..d89d40304e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/DataTablesUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/PaginationParser.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/PaginationParser.java
index 8864fe376a..961e684a06 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/PaginationParser.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/PaginationParser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesColumn.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesColumn.java
index adea906620..27e27c920a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesColumn.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesColumn.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables.data;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesOrder.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesOrder.java
index 0124cb9d96..2aff19fc99 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesOrder.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesOrder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables.data;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesParameters.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesParameters.java
index 1305db5151..28e8bcb1ac 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesParameters.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesParameters.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables.data;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesSearch.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesSearch.java
index cd117465c0..2838c06951 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesSearch.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/DataTablesSearch.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables.data;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/PaginationParameters.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/PaginationParameters.java
index f574afc0b2..0a2efc3cdd 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/PaginationParameters.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/datatables/data/PaginationParameters.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables.data;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletDefaultPage.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletDefaultPage.java
index d9e62ab556..7fbc3d90cc 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletDefaultPage.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletDefaultPage.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.page;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletPage.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletPage.java
index fd74f7ebcc..02b3ccb30f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletPage.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletPage.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.page;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletReleasePage.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletReleasePage.java
index 0a1efefd71..6deb0c0882 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletReleasePage.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/common/page/PortletReleasePage.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.page;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/BuildInfoTemplateContextContributor.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/BuildInfoTemplateContextContributor.java
index 11ae9fe646..b313402374 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/BuildInfoTemplateContextContributor.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/BuildInfoTemplateContextContributor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/DynamicComponentManager.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/DynamicComponentManager.java
index d83da54fef..cdca0d9d9a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/DynamicComponentManager.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/DynamicComponentManager.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/FossologyCheckConnectionOnStartupHook.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/FossologyCheckConnectionOnStartupHook.java
index 8a8565efc1..7180bd22f0 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/FossologyCheckConnectionOnStartupHook.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/FossologyCheckConnectionOnStartupHook.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/LoggingComponent.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/LoggingComponent.java
index 05fce6d1c5..de20fe5f6c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/LoggingComponent.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/components/LoggingComponent.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/AttachmentAwarePortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/AttachmentAwarePortlet.java
index 22135ee076..aee05f088a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/AttachmentAwarePortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/AttachmentAwarePortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/FossologyAwarePortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/FossologyAwarePortlet.java
index 4dd15f8fc5..5fd2dce3b8 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/FossologyAwarePortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/FossologyAwarePortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkToPortletConfiguration.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkToPortletConfiguration.java
index 2330cb3db5..7c4677afb9 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkToPortletConfiguration.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkToPortletConfiguration.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015-2017. Part of the SW360 Portal Project,
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkedReleasesAndProjectsAwarePortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkedReleasesAndProjectsAwarePortlet.java
index 94e8c2234b..397d43b7d0 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkedReleasesAndProjectsAwarePortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/LinkedReleasesAndProjectsAwarePortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/Sw360Portlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/Sw360Portlet.java
index d8e5112ee8..bb7f8c9a2c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/Sw360Portlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/Sw360Portlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.portlets;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AdminPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AdminPortlet.java
index a39b636570..6ff47aafb9 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AdminPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AdminPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AttachmentCleanupPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AttachmentCleanupPortlet.java
index 8af08cdb1f..2f3c25cafe 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AttachmentCleanupPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/AttachmentCleanupPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/BulkReleaseEditPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/BulkReleaseEditPortlet.java
index d01ed805cb..64f9cd1ef1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/BulkReleaseEditPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/BulkReleaseEditPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/DatabaseSanitationPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/DatabaseSanitationPortlet.java
index 7a494d8e6d..a8e51e771f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/DatabaseSanitationPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/DatabaseSanitationPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/FossologyAdminPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/FossologyAdminPortlet.java
index e20660cb9b..dfdc039b2c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/FossologyAdminPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/FossologyAdminPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ImportExportPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ImportExportPortlet.java
index fc3b7e11be..e81e95813f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ImportExportPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ImportExportPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/LicenseAdminPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/LicenseAdminPortlet.java
index 79fc08a7f0..c60a5ba19c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/LicenseAdminPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/LicenseAdminPortlet.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ScheduleAdminPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ScheduleAdminPortlet.java
index 0788bf419d..705e6341fe 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ScheduleAdminPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/ScheduleAdminPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/TodoPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/TodoPortlet.java
index 66399141e1..7bb0d62ed1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/TodoPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/TodoPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/UserPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/UserPortlet.java
index c5ce26de83..0c7496e1e6 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/UserPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/UserPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/VendorPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/VendorPortlet.java
index 295d9b1cc2..67a984c30d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/VendorPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/admin/VendorPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.admin;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentFriendlyUrlMapper.java
index 02ae3de535..287b0e4dca 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
index 55053b6cd8..e2f0eeeea3 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortletUtils.java
index ff89706199..040199b053 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/components/ComponentPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.components;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/ecc/EccPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/ecc/EccPortlet.java
index 1428629406..da0783f105 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/ecc/EccPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/ecc/EccPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.ecc;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/AbstractTasksPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/AbstractTasksPortlet.java
index cad322f011..7c2c68ff57 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/AbstractTasksPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/AbstractTasksPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyComponentsPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyComponentsPortlet.java
index c926180993..020c8c21fc 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyComponentsPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyComponentsPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyProjectsPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyProjectsPortlet.java
index 99624fc26b..5a8d42eb0a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyProjectsPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyProjectsPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With contributions by Siemens Healthcare Diagnostics Inc, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MySubscriptionsPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MySubscriptionsPortlet.java
index a547666136..fa0cc8871d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MySubscriptionsPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MySubscriptionsPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskAssignmentsPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskAssignmentsPortlet.java
index cca2941de8..1542c909ce 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskAssignmentsPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskAssignmentsPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskSubmissionsPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskSubmissionsPortlet.java
index 4dcb5c2d19..71d3e98833 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskSubmissionsPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/MyTaskSubmissionsPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentComponentPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentComponentPortlet.java
index 3c65006c75..7acf7d028e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentComponentPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentComponentPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentReleasesPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentReleasesPortlet.java
index 2a9bdf56ad..67e1a15060 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentReleasesPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/RecentReleasesPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/Registrant.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/Registrant.java
index c926d7a4f9..d5841e98eb 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/Registrant.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/Registrant.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage.signup;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortlet.java
index d93b8dd137..79155f377f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage.signup;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortletUtils.java
index eb49bb12c4..fb56277bd1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/signup/SignupPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage.signup;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/welcome/WelcomePortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/welcome/WelcomePortlet.java
index d192363bef..009b93a08d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/welcome/WelcomePortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/homepage/welcome/WelcomePortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.homepage.welcome;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesFriendlyUrlMapper.java
index 9d860ab057..76eb670b63 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.licenses;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesPortlet.java
index d92654c298..f01851eb6e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/licenses/LicensesPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.licenses;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationFriendlyUrlMapper.java
index 2e9b312a3d..6a14ac5fc1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.moderation;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java
index 2ff17e44b1..f3d66698ad 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.moderation;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortletUtils.java
index 2bc74b4490..09d5bee669 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.moderation;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/preferences/UserPreferencesPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/preferences/UserPreferencesPortlet.java
index a634c55a89..dd23744cb4 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/preferences/UserPreferencesPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/preferences/UserPreferencesPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.preferences;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortlet.java
index e863e657e9..7287506518 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2015.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projectimport;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/ProjectImportConstants.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/ProjectImportConstants.java
index 784dcdf9e6..17c29a72dd 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/ProjectImportConstants.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/ProjectImportConstants.java
@@ -3,12 +3,11 @@
  * With contributions by Bosch Software Innovations GmbH, 2017.
  * With contributions by Verifa Oy, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projectimport;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortlet.java
index ab48cb8ab0..6ed369add2 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projectimport;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectFriendlyUrlMapper.java
index 060f74d2a2..d1a2b5a388 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projects;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
index 1b276b4ce2..7d8481c818 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortlet.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projects;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtils.java
index da338161fd..eb4b13487c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projects;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchFriendlyUrlMapper.java
index ed845d8f00..160771d12c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.search;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchPortlet.java
index a4f8b27317..ba33151077 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/search/SearchPortlet.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.search;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesFriendlyUrlMapper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesFriendlyUrlMapper.java
index 10507e2afb..b898d33500 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesFriendlyUrlMapper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesFriendlyUrlMapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.vulnerabilities;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesPortlet.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesPortlet.java
index 713384851c..6eb4cf699a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesPortlet.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/portlets/vulnerabilities/VulnerabilitiesPortlet.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.vulnerabilities;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareAttachments.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareAttachments.java
index 22efd5fee3..f45a16542c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareAttachments.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareAttachments.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareTodos.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareTodos.java
index fb90885e35..af5fe53f49 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareTodos.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/CompareTodos.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ComponentName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ComponentName.java
index 092c88371f..025f2742df 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ComponentName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ComponentName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ContextAwareTag.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ContextAwareTag.java
index de2d02e021..75439b713f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ContextAwareTag.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ContextAwareTag.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayApiTokenExpireDate.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayApiTokenExpireDate.java
index 3de43ed1ab..69ccedbc4e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayApiTokenExpireDate.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayApiTokenExpireDate.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayBoolean.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayBoolean.java
index c5615ef9a5..43ce3c730b 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayBoolean.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayBoolean.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCVEReferences.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCVEReferences.java
index 281a6a3990..714a87de0b 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCVEReferences.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCVEReferences.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCollection.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCollection.java
index 0903e2d0e7..4567049111 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCollection.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCollection.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayComponentChanges.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayComponentChanges.java
index 5d590b4eb8..467689af91 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayComponentChanges.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayComponentChanges.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeName.java
index e7f03882f2..030a4c1ce3 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeSelection.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeSelection.java
index f7affa77b2..7b0c13b584 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeSelection.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayCountryCodeSelection.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayDownloadReport.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayDownloadReport.java
index 36309c4c93..c9155ebf6c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayDownloadReport.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayDownloadReport.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEllipsisString.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEllipsisString.java
index 67ed6b8b21..92989b01ad 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEllipsisString.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEllipsisString.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnum.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnum.java
index ea55385a9e..3692220171 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnum.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnum.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumInfo.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumInfo.java
index 9972c8d823..cfcf669f57 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumInfo.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumInfo.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumSelection.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumSelection.java
index 3f07d843e0..bf68759493 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumSelection.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumSelection.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumShort.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumShort.java
index 059e522226..0ea7bb745a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumShort.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayEnumShort.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicenseInfoHeader.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicenseInfoHeader.java
index 6ca17b7973..dedf2f6ae1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicenseInfoHeader.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicenseInfoHeader.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicensesEdit.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicensesEdit.java
index 77a66084ad..6ae70ec68e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicensesEdit.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayLicensesEdit.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMap.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMap.java
index 01531918bd..421c682e82 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMap.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMap.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfEmailStringSets.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfEmailStringSets.java
index ded43d48ec..bd7e439a62 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfEmailStringSets.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfEmailStringSets.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfMaps.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfMaps.java
index 1d739d1074..a7a341213a 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfMaps.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayMapOfMaps.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayObligations.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayObligations.java
index 5faab02b95..1522b7afc8 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayObligations.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayObligations.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayOutputFormats.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayOutputFormats.java
index e3ecda309b..ef9ef7060e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayOutputFormats.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayOutputFormats.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectChanges.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectChanges.java
index 7decd4fbcf..00df0657a0 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectChanges.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectChanges.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
index 2564870259..a39f777393 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayProjectStateBox.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017.
  * Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayReleaseChanges.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayReleaseChanges.java
index c64120e0cc..213605792d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayReleaseChanges.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayReleaseChanges.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java
index 45df528dd4..7f7d7bf846 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayStateBoxes.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplaySubscribeButton.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplaySubscribeButton.java
index 2a0704513d..550bc9c66e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplaySubscribeButton.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplaySubscribeButton.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUser.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUser.java
index c15e6783f3..e3066d68e8 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUser.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUser.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEdit.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEdit.java
index 8bb9d6db97..1e512f9159 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEdit.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEdit.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmail.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmail.java
index 3f3fb1f304..6f46bffa77 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmail.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmail.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmailCollection.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmailCollection.java
index 75426e5822..a3cd449ef8 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmailCollection.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserEmailCollection.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserGroup.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserGroup.java
index 6f35722832..454bc8cba5 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserGroup.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayUserGroup.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorAdvisories.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorAdvisories.java
index 66a6ebe97c..a1fd7f118f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorAdvisories.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorAdvisories.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorEdit.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorEdit.java
index 3993ddae2f..52c3f8fa4e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorEdit.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/DisplayVendorEdit.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/Icon.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/Icon.java
index 2970f12f08..57e5f5e12f 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/Icon.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/Icon.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/LicenseName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/LicenseName.java
index fad909bb95..19348e88a5 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/LicenseName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/LicenseName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/NameSpaceAwareTag.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/NameSpaceAwareTag.java
index 1dc099348d..b8225f760d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/NameSpaceAwareTag.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/NameSpaceAwareTag.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.tags;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/OutTag.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/OutTag.java
index 7a524bc430..53a4205516 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/OutTag.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/OutTag.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ProjectName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ProjectName.java
index bc2869b5a9..d5280e9cf5 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ProjectName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ProjectName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ReleaseName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ReleaseName.java
index 77bfcdb806..dc856a4def 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ReleaseName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/ReleaseName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/TagUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/TagUtils.java
index 55234bea6f..2d7b3ff122 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/TagUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/TagUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserAwareTag.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserAwareTag.java
index be7cdea43a..990fe6d452 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserAwareTag.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserAwareTag.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserName.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserName.java
index 7439f4410c..1c868d781e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserName.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/UserName.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstract.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstract.java
index 13662b20c0..f07ed93241 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstract.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstract.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReport.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReport.java
index cd07109b52..42d798b129 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReport.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReport.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundle.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundle.java
index 962e899a2d..32099e8773 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundle.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundle.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFile.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFile.java
index 4ffc2fab37..7cdd4bd856 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFile.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFile.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLicenseCollection.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLicenseCollection.java
index 81c165f88f..379d79be58 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLicenseCollection.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLicenseCollection.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.tags.links;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLink.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLink.java
index 5468d96695..c6c6f41eca 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLink.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLink.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkAbstract.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkAbstract.java
index 3526b2d329..285c90b099 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkAbstract.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkAbstract.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToComponent.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToComponent.java
index 9eafb92249..7352ccadf5 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToComponent.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToComponent.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToLicense.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToLicense.java
index 7660dbdbee..75cb3b665e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToLicense.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToLicense.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015-2016. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToModerationRequest.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToModerationRequest.java
index 8a2e275385..4fd22e9baf 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToModerationRequest.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToModerationRequest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToProject.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToProject.java
index c33fe907c8..cc36e72e58 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToProject.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToProject.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToRelease.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToRelease.java
index b150bd7992..dabf947c66 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToRelease.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToRelease.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToSearchResult.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToSearchResult.java
index d4c29d6530..ae1edf4059 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToSearchResult.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToSearchResult.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToVulnerability.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToVulnerability.java
index 6f5470394e..1ada211dca 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToVulnerability.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/links/DisplayLinkToVulnerability.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/LinkedReleaseRenderer.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/LinkedReleaseRenderer.java
index 8a2bdad311..361c55da9d 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/LinkedReleaseRenderer.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/LinkedReleaseRenderer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.portal.tags.urlutils;
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriter.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriter.java
index 9d763e6153..b4c4a13aa8 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriter.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriter.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.urlutils;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriterImpl.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriterImpl.java
index 4d29480a47..c1d48f5162 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriterImpl.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/tags/urlutils/UrlWriterImpl.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.urlutils;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/HttpServletRequestAdapter.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/HttpServletRequestAdapter.java
index 069fcc506a..81ce279e0c 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/HttpServletRequestAdapter.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/HttpServletRequestAdapter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LandingPageAction.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LandingPageAction.java
index ca68d2e0f0..bab94b2804 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LandingPageAction.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LandingPageAction.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LifeRayUserSession.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LifeRayUserSession.java
index 38dc5e867b..117f9f4a26 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LifeRayUserSession.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LifeRayUserSession.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LoginAction.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LoginAction.java
index 07ec7eb9d7..547aabc740 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LoginAction.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/LoginAction.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/OrganizationHelper.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/OrganizationHelper.java
index 79a4a2bf6b..ddab9aaaa1 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/OrganizationHelper.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/OrganizationHelper.java
@@ -3,12 +3,11 @@
  * Copyright Siemens AG, 2016-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/PortletRequestAdapter.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/PortletRequestAdapter.java
index 7ca4ee1aaf..3ecd42fe3b 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/PortletRequestAdapter.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/PortletRequestAdapter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/RequestAdapter.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/RequestAdapter.java
index 46c7d23db6..7436c0bea7 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/RequestAdapter.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/RequestAdapter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/SSOAutoLogin.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/SSOAutoLogin.java
index f2bafca857..c1b43f9c0e 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/SSOAutoLogin.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/SSOAutoLogin.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/TestAutoLogin.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/TestAutoLogin.java
index 25abcb1fb1..ff90a609a9 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/TestAutoLogin.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/TestAutoLogin.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCSV.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCSV.java
index 2fd911efe8..c6d11e1d87 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCSV.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCSV.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCache.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCache.java
index cc58771f73..5716f27958 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCache.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCache.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCacheHolder.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCacheHolder.java
index 3ef3a74c56..a68f156be6 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCacheHolder.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserCacheHolder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserPortletUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserPortletUtils.java
index 4661027c9b..fd30bf93a6 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserPortletUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserPortletUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserUtils.java b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserUtils.java
index fbac68dbc7..06ea56a1df 100644
--- a/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserUtils.java
+++ b/frontend/sw360-portlet/src/main/java/org/eclipse/sw360/portal/users/UserUtils.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.users;
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/customTags.tld b/frontend/sw360-portlet/src/main/resources/META-INF/customTags.tld
index 5c8736fee0..3c2a27d501 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/customTags.tld
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/customTags.tld
@@ -4,12 +4,11 @@
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~ With contributions by Siemens Healthcare Diagnostics Inc, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <taglib
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/bootstrap43/_spinner.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/bootstrap43/_spinner.scss
index 6b7bc69207..276dfad512 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/bootstrap43/_spinner.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/bootstrap43/_spinner.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /*
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_accordion.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_accordion.scss
index b5f88fcdb7..20016e94fe 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_accordion.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_accordion.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .accordion {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_attachments.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_attachments.scss
index a8161b04f0..c1bf8fe155 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_attachments.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_attachments.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 #attachmentsDetail td.details-control {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_card.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_card.scss
index a30b7b19d3..9342f0790f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_card.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_card.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .card-deck {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_dialog.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_dialog.scss
index 052d53bff6..c4d984c08e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_dialog.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_dialog.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 @media (min-width: 768px) {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_form.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_form.scss
index d93fb5f410..9ff372e90e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_form.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_form.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 form {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_listgroup.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_listgroup.scss
index 6096951815..1868c2700c 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_listgroup.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_listgroup.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .list-group {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_merge.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_merge.scss
index b6ab7bad3e..364a92aa17 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_merge.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_merge.scss
@@ -1,12 +1,11 @@
 /**
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .merge.wizardBody {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_table.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_table.scss
index dd44401a25..681c57de8d 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_table.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_table.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 table.table.label-value-table {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_toolbar.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_toolbar.scss
index 115d9f48f1..39b78577a0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_toolbar.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_toolbar.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .portlet-toolbar {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_tooltips.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_tooltips.scss
index 3be5e6a49a..96815f6ffb 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_tooltips.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_tooltips.scss
@@ -3,10 +3,11 @@
  *
  * SPDX-License-Identifier: EPL-1-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/epl-v10-html
+ * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *
  * Description: Tooltips for sw360 enums
  */
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_treetable.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_treetable.scss
index dc948286df..83d3a37eb9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_treetable.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_treetable.scss
@@ -1,11 +1,11 @@
 /*
-* Stylesheet for jQuery treetable Plugin 3.2.0
-* http://ludo.cubicphuse.nl/jquery-treetable
-*
-* Modifications applied by Siemens AG 2016.
-* Modifications for supporting own application.
-*
-*/
+ * Stylesheet for jQuery treetable Plugin 3.2.0
+ * http://ludo.cubicphuse.nl/jquery-treetable
+ *
+ * Modifications applied by Siemens AG 2016.
+ * Modifications for supporting own application license under:
+ * SPDX-License-Identifier: EPL-2.0
+ */
 
 table.treetable {
     span {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_wizard.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_wizard.scss
index 7dc543775e..cd667ef019 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_wizard.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/components/_wizard.scss
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 div.wizardHeader {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/main.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/main.scss
index 40a13b2e8b..3b38333605 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/main.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/main.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 @import "portlets/admin/buttons";
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/_buttons.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/_buttons.scss
index 9d98363119..51c5dc3a21 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/_buttons.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/_buttons.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  #portlet_sw360_portlet_admin {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/importexport/_buttons.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/importexport/_buttons.scss
index 17941d1375..b939c2d617 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/importexport/_buttons.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/admin/importexport/_buttons.scss
@@ -2,12 +2,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  #portlet_sw360_portlet_importexport {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_signup.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_signup.scss
index d3c397766f..082afcd670 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_signup.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_signup.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 #portlet_sw360_portlet_signup {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_welcome.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_welcome.scss
index 54ca30bb18..46098699ac 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_welcome.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/homepage/_welcome.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 #portlet_sw360_portlet_welcome {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/search/_sidebar.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/search/_sidebar.scss
index 02f4dede51..7d5bdfe151 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/search/_sidebar.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/portlets/search/_sidebar.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  #portlet_sw360_portlet_search {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_align.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_align.scss
index 19df685da7..fba0ba65e0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_align.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_align.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  .content-left {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_badges.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_badges.scss
index 2c8689e803..9411fb68b9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_badges.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_badges.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 .badge.badge-empty {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_upload.scss b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_upload.scss
index eac441087d..012ed19123 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_upload.scss
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/css/utils/_upload.scss
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
  #fileupload-files {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/attachmentCleanup/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/attachmentCleanup/view.jsp
index 14304ad520..ccedf2dc25 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/attachmentCleanup/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/attachmentCleanup/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/bulkReleaseEdit/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/bulkReleaseEdit/view.jsp
index dee42aed30..7955206d0f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/bulkReleaseEdit/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/bulkReleaseEdit/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/duplicatesAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/duplicatesAjax.jsp
index 68b7d5635d..552814553e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/duplicatesAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/duplicatesAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/view.jsp
index caf20c51a1..f1f3daabfd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/databaseSanitation/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   - With contributions by Bosch Software Innovations GmbH, 2016-2017.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/fossyAdmin/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/fossyAdmin/view.jsp
index 8143c8bd9b..b9d37e0af3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/fossyAdmin/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/fossyAdmin/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/importexport/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/importexport/view.jsp
index 39f948c724..0ad11a46b4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/importexport/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/importexport/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/licenseAdmin/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/licenseAdmin/view.jsp
index 75692f8eda..b94e90a777 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/licenseAdmin/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/licenseAdmin/view.jsp
@@ -3,12 +3,11 @@
   ~ Copyright Bosch Software Innovations GmbH, 2016.
   ~ Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/scheduleAdmin/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/scheduleAdmin/view.jsp
index e48d69325f..356dbfa720 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/scheduleAdmin/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/scheduleAdmin/view.jsp
@@ -1,12 +1,11 @@
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %><%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/add.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/add.jsp
index ff80400b2f..c809ce2dfb 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/add.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/add.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@include file="/html/init.jsp"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/view.jsp
index 09cde8ea56..92856c7cc4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/todos/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/user/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/user/view.jsp
index 2861e0f49b..33218e122b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/user/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/user/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/edit.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/edit.jsp
index ac528afdb1..4c6c75223a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/edit.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/edit.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@include file="/html/init.jsp"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/mergeVendor.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/mergeVendor.jsp
index 5cc2cda8be..53f418929e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/mergeVendor.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/mergeVendor.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp" %>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/view.jsp
index 8b862a4935..82e71560d5 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/vendors/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/view.jsp
index eb68827a1e..ab04c6343a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/admin/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
   - With contributions by Bosch Software Innovations GmbH, 2016-2017.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/ajax/vendorSearch.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/ajax/vendorSearch.jsp
index 2b5c49c8e8..d3292b6af8 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/ajax/vendorSearch.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/ajax/vendorSearch.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detail.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detail.jsp
index 831acc09db..145fd41991 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detail.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detail.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="javax.portlet.PortletRequest" %>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detailRelease.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detailRelease.jsp
index a042d29dad..93b7e01c24 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detailRelease.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/detailRelease.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/edit.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/edit.jsp
index aeb79d8d17..317164e262 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/edit.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/edit.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/editRelease.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/editRelease.jsp
index 0c95883df2..96d3396489 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/editRelease.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/editRelease.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/clearingStatus.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/clearingStatus.jspf
index 1b00970aa1..4af809b2e0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/clearingStatus.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/clearingStatus.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.page.PortletReleasePage,org.eclipse.sw360.datahandler.thrift.attachments.AttachmentType" %>
 <%@ page import="org.eclipse.sw360.portal.common.FossologyConnectionHelper" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/detailOverview.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/detailOverview.jspf
index f8d016b615..925d05d015 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/detailOverview.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/detailOverview.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <portlet:renderURL var="editComponentURL">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf
index 26fe77c150..94bec71f8b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/editBasicInfo.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.components.ComponentType" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf
index fa625994f7..f0ca3b20f8 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/summary.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/vulnerabilities.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/vulnerabilities.jspf
index 36e8bfc107..2b2a61b035 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/vulnerabilities.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/components/vulnerabilities.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/clearingDetails.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/clearingDetails.jspf
index 991228461e..168e403c8c 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/clearingDetails.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/clearingDetails.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.FossologyConnectionHelper" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/commercialDetails.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/commercialDetails.jspf
index a1b7db76ef..93b0df1adc 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/commercialDetails.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/commercialDetails.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2015-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <core_rt:set var="cotsDetails" value="${release.cotsDetails}"/>
 <table class="table label-value-table" id="cotsDetailOverview">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/detailOverview.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/detailOverview.jspf
index 337fd86bc5..83062441bf 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/detailOverview.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/detailOverview.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/eccDetails.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/eccDetails.jspf
index c90b0c93ff..cfa7bd208a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/eccDetails.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/eccDetails.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <core_rt:set var="eccInfo" value="${release.eccInformation}"/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editCommercialDetails.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editCommercialDetails.jspf
index 33fe351b36..3e2fdb63e9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editCommercialDetails.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editCommercialDetails.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2015-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseClearingInformation.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseClearingInformation.jspf
index 2a3bb393dd..d83f8c73c3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseClearingInformation.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseClearingInformation.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseECCInformation.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseECCInformation.jspf
index c97aea50f1..22b7a41fb7 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseECCInformation.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseECCInformation.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseInformation.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseInformation.jspf
index 4ab5be9b91..63f1cb2f2c 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseInformation.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseInformation.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.datahandler.common.SW360Utils" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.components.Component" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseRepository.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseRepository.jspf
index 11123cdb25..aa0464ec02 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseRepository.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/editReleaseRepository.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.portal.users.UserCacheHolder" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/linkProject.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/linkProject.jspf
index 0756fa526d..abb855d9c3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/linkProject.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/linkProject.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.util.WebKeys" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/summaryRelease.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/summaryRelease.jspf
index 1215093052..3f13ef2a49 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/summaryRelease.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/releases/summaryRelease.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/addVendor.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/addVendor.jspf
index 66bb081863..299223e4d9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/addVendor.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/addVendor.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <portlet:resourceURL var="addVendorURL">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/searchVendor.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/searchVendor.jspf
index c9e930f8f3..a2cbd8108a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/searchVendor.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/searchVendor.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <portlet:resourceURL var="viewVendorURL">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/vendorDetail.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/vendorDetail.jspf
index 712fb5657c..cc34f9c5ae 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/vendorDetail.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/includes/vendors/vendorDetail.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <table class="table label-value-table" id="ReleaseDetailVendor">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeComponent.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeComponent.jsp
index d46d4d09aa..08e58b4916 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeComponent.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeComponent.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.users.User" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.components.ComponentType" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeRelease.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeRelease.jsp
index 55a63c6cee..5ec9e24c33 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeRelease.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/mergeRelease.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.users.User" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.components.ComponentType" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/view.jsp
index 96ca2887d9..91b21bc0f6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/components/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/ecc/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/ecc/view.jsp
index a61ed1d904..4581e8e3b2 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/ecc/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/ecc/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mycomponents/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mycomponents/view.jsp
index 1baf65e3fa..b4d146df06 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mycomponents/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mycomponents/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/myprojects/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/myprojects/view.jsp
index 9d71079905..a97601041e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/myprojects/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/myprojects/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With contributions by Siemens Healthcare Diagnostics Inc, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mysubscriptions/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mysubscriptions/view.jsp
index f7df06b918..2aaa5152e4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mysubscriptions/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mysubscriptions/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@ page import="org.eclipse.sw360.portal.portlets.Sw360Portlet" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytaskassignments/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytaskassignments/view.jsp
index 11d0daedee..d55a6b7052 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytaskassignments/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytaskassignments/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytasksubmissions/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytasksubmissions/view.jsp
index f8738f0c57..d540434a84 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytasksubmissions/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/mytasksubmissions/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentcomponents/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentcomponents/view.jsp
index 956ce1d396..d4b3ee3d8b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentcomponents/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentcomponents/view.jsp
@@ -4,12 +4,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentreleases/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentreleases/view.jsp
index 24d997b7cd..99ee7f7fc8 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentreleases/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/recentreleases/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@ page import="org.eclipse.sw360.portal.portlets.Sw360Portlet" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/success.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/success.jsp
index f732480130..2ae40843ba 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/success.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/success.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/view.jsp
index 9a5585f58f..cdd2514670 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/signup/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ page import="com.liferay.portal.kernel.servlet.SessionMessages" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/welcome/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/welcome/view.jsp
index 449000f01b..8bbf6adc6d 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/welcome/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/homepage/welcome/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/init.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/init.jsp
index f95abd5489..4d1f852290 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/init.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/init.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ page contentType="text/html; charset=UTF-8" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/detail.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/detail.jsp
index 45b96a12f8..012f7dd961 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/detail.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/detail.jsp
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/edit.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/edit.jsp
index 3a21c3bfb0..eb81eca775 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/edit.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/edit.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailAddTodo.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailAddTodo.jspf
index bc124a7da9..c43f35c321 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailAddTodo.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailAddTodo.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.users.RequestedAction" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailOverview.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailOverview.jspf
index 6626810898..19fc0719a9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailOverview.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailOverview.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <portlet:renderURL var="editLicenseURL">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailRisks.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailRisks.jspf
index a41c3e9531..8f033a96fd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailRisks.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailRisks.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <table class="table table-bordered" id="licenseRisks">
     <colgroup>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailSummary.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailSummary.jspf
index 4324e57e5b..20668882dd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailSummary.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailSummary.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <portlet:actionURL var="editExternalLinkURL" name="editExternalLink">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailText.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailText.jspf
index 81e3050ed0..75658e1162 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailText.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailText.jspf
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <table class="table table-bordered" id="LicenseText">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailTodos.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailTodos.jspf
index 8a60dc1dcf..dff8427cab 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailTodos.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/detailTodos.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%--This variable is used as a trick to allow referencing enum value in EL expression below--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailSummary.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailSummary.jspf
index 9b0a48ba16..dcf364c3d6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailSummary.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailSummary.jspf
@@ -4,12 +4,11 @@
 <%--
   ~ Copyright Siemens AG, 2016-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailText.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailText.jspf
index 71b778e1f2..734ac4e1fe 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailText.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/includes/editDetailText.jspf
@@ -2,12 +2,11 @@
 <%--
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <table class="table edit-table" id="LicenseText">
     <thead>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/view.jsp
index 8296ceea89..517b25affd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/licenses/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/delete.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/delete.jsp
index eb1ac4acba..1d3ad8474e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/delete.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/delete.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/merge.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/merge.jsp
index ba4e5b4bc9..ca9ca4bbef 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/merge.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/components/merge.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationHeader.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationHeader.jspf
index 956816b19d..7c883d4824 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationHeader.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationHeader.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017,2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <jsp:useBean id="moderationAllowed" type="java.lang.Boolean" scope="request"/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationInfo.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationInfo.jspf
index 32d5e1a558..a8b56ccb92 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationInfo.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/includes/moderationInfo.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/licenses/merge.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/licenses/merge.jsp
index 64bf0f8c66..c99ee1b827 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/licenses/merge.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/licenses/merge.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp"%>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/delete.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/delete.jsp
index 245d1d9376..b2f8177295 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/delete.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/delete.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp"%>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/merge.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/merge.jsp
index d8c460ca89..f883ab835f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/merge.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/projects/merge.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp"%>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/delete.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/delete.jsp
index 3161997559..deee68bf61 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/delete.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/delete.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/merge.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/merge.jsp
index c12194c768..02ea2bfcee 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/merge.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/releases/merge.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/users/merge.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/users/merge.jsp
index 65fda644d6..9b2b199292 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/users/merge.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/users/merge.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal User.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp"%>
 <%-- the following is needed by liferay to display error messages--%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp
index bc744cefc2..1a03b54285 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/preferences/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/preferences/view.jsp
index 033c09369c..4dddda1e2f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/preferences/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/preferences/view.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.users.RestApiToken" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.users.User" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/linkedProjectsAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/linkedProjectsAjax.jsp
index 9d59311986..c3f183954f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/linkedProjectsAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/linkedProjectsAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/searchProjectsAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/searchProjectsAjax.jsp
index ce3016de00..21b3f6b7b5 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/searchProjectsAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/searchProjectsAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/sendableTable.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/sendableTable.jsp
index 13e87cce66..4c5080ebbe 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/sendableTable.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/ajax/sendableTable.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/detail.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/detail.jsp
index 7298e7342c..fc0264c8d6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/detail.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/detail.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/edit.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/edit.jsp
index 540d78d67d..3155027d68 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/edit.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/edit.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/import.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/import.jsp
index 4065cccb6b..52c0661aa8 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/import.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/import.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2015-2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ taglib prefix="min-width" uri="http://liferay.com/tld/aui" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentSelectTable.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentSelectTable.jspf
index c1e26f10a8..808d3ede6a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentSelectTable.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentSelectTable.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2016-2019. Part of the SW360 Portal Project.
   ~ Copyright Bosch Software Innovations GmbH, 2017.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsages.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsages.jspf
index 7a7de1e2d7..52e1c7a39a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsages.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsages.jspf
@@ -5,12 +5,11 @@
 <%--
   ~ Copyright Siemens AG, 2018-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jsp
index 810294ec29..1a0217503e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <jsp:useBean id="projectList" type="java.util.List<org.eclipse.sw360.datahandler.thrift.projects.ProjectLink>" scope="request"/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jspf
index d322eca474..0384f71a19 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/attachmentUsagesRows.jspf
@@ -4,11 +4,12 @@
 <%--
   ~ Copyright Siemens AG, 2018-2019. Part of the SW360 Portal Project.
   ~
-  ~ 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
---%>
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  --%>
 
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/detailOverview.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/detailOverview.jspf
index 1bccd5d8d6..3ebef08b4a 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/detailOverview.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/detailOverview.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <portlet:renderURL var="editProjectURL">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjects.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjects.jspf
index 0e83bc7a14..70cb5811e0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjects.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjects.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.projects.Project" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjectsEdit.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjectsEdit.jspf
index 7c28aad49b..2034efe251 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjectsEdit.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/linkedProjectsEdit.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.projects.ProjectRelationship" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administration.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administration.jspf
index b1ad267040..a3b324bf5f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administration.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administration.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <table class="table label-value-table" id="clearing">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administrationEdit.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administrationEdit.jspf
index 04fb6b9c08..4972d23e68 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administrationEdit.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/administrationEdit.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@page import="org.eclipse.sw360.datahandler.thrift.projects.ProjectClearingState"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/basicInfo.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/basicInfo.jspf
index dd0089ba96..b0a27ae2c5 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/basicInfo.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/basicInfo.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.projects.Project" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/clearingStatus.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/clearingStatus.jspf
index 1e2cce947a..14c986d399 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/clearingStatus.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/clearingStatus.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@ page import="org.eclipse.sw360.portal.common.page.PortletReleasePage" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/eccStatus.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/eccStatus.jspf
index 5b69c0184e..2f8d28f17d 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/eccStatus.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/eccStatus.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <core_rt:if test="${releasesAndProjects.size() == 0 }">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/linkedObligations.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/linkedObligations.jspf
index 9797fd11b8..6ee909a987 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/linkedObligations.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/linkedObligations.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp"%>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligations.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligations.jspf
index 7e97b34da5..159babc094 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligations.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligations.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp"%>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsByReleases.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsByReleases.jspf
index add4c5b1f4..2d3ca3dc31 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsByReleases.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsByReleases.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp"%>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsEdit.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsEdit.jspf
index 081974da1d..48291b8728 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsEdit.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/obligationsEdit.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp"%>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/summary.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/summary.jspf
index 23370bf1cc..2e72ced3bc 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/summary.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/summary.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <core_rt:if test="${not empty project.description}">
 	<div>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/vulnerabilities.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/vulnerabilities.jspf
index 068ec274fc..1db6643be6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/vulnerabilities.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/projects/vulnerabilities.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications from Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="javax.portlet.PortletRequest" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/searchProjects.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/searchProjects.jsp
index 8993e6e33d..4dcc52fe02 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/searchProjects.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/includes/searchProjects.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/licenseInfo.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/licenseInfo.jsp
index 735b5c8398..5900175798 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/licenseInfo.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/licenseInfo.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="java.util.Map"%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/sourceCodeBundle.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/sourceCodeBundle.jsp
index 1dd51518b9..5f166b6c43 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/sourceCodeBundle.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/sourceCodeBundle.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2016-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp
index e4ac333bb2..ff9bf79dd2 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.projects.Project" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/wsimport.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/wsimport.jsp
index f5136d1920..1fb7b95cf9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/wsimport.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/wsimport.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Verifa Oy, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ taglib prefix="min-width" uri="http://liferay.com/tld/aui" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/search/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/search/view.jsp
index e512067cab..79b79a02eb 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/search/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/search/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/licenseListAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/licenseListAjax.jsp
index 2b28b9dc4b..704944d574 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/licenseListAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/licenseListAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jsp
index 59517d16a3..fea8eca97c 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <jsp:useBean id="projectList" type="java.util.List<org.eclipse.sw360.datahandler.thrift.projects.ProjectLink>" scope="request"/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jspf
index 4fd8574077..7e7d48b493 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedProjectsRows.jspf
@@ -1,11 +1,12 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ 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
---%>
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  --%>
 
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesAjax.jsp
index d4e452e605..590d143a92 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRelationAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRelationAjax.jsp
index df79ad5d3e..3c622c0699 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRelationAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRelationAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jsp
index 74b9062c51..d10e492c24 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <jsp:useBean id="releaseList" type="java.util.List<org.eclipse.sw360.datahandler.thrift.components.ReleaseLink>" scope="request"/>
 <jsp:useBean id="parent_branch_id" class="java.lang.String" scope="request"/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jspf
index eb1b3095b5..95395809e4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/linkedReleasesRows.jspf
@@ -1,11 +1,12 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ 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
---%>
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  --%>
 
 <%@include file="/html/init.jsp" %>
 <core_rt:if test="${empty parentScopeGroupId}">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/searchReleasesAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/searchReleasesAjax.jsp
index a9887881ad..d23974a209 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/searchReleasesAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/searchReleasesAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@include file="/html/init.jsp"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/userListAjax.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/userListAjax.jsp
index 14054fe77c..d898bd23a0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/userListAjax.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/ajax/userListAjax.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsDetail.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsDetail.jsp
index c92bff3662..314d5ba5ab 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsDetail.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsDetail.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants"%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsUpload.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsUpload.jspf
index 5187d3d344..3c023b98cd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsUpload.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/attachmentsUpload.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%--
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAdditionalData.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAdditionalData.jsp
index bc0568814b..330cc70810 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAdditionalData.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAdditionalData.jsp
@@ -2,12 +2,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAttachments.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAttachments.jspf
index d41e259bf3..2afc9acc64 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAttachments.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editAttachments.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <%--
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editExternalIds.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editExternalIds.jsp
index 5169fec448..e4d52dcc32 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editExternalIds.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editExternalIds.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editLinkedReleases.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editLinkedReleases.jspf
index a1fa09a88a..d9d77917f1 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editLinkedReleases.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/editLinkedReleases.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.ReleaseRelationship" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/errorKeyToMessage.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/errorKeyToMessage.jspf
index 5a77d22e7a..2067e4aacd 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/errorKeyToMessage.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/errorKeyToMessage.jspf
@@ -2,12 +2,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.eclipse.sw360.portal.common.ErrorMessages" %>
 <core_rt:set var="errorMessageList" value='<%=ErrorMessages.allErrorMessages%>'/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/fossologyClearing.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/fossologyClearing.jspf
index ffaddfd364..445298fa12 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/fossologyClearing.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/fossologyClearing.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.components.ExternalToolProcessStatus" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleaseDetails.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleaseDetails.jspf
index 1a692c780c..f733c30dff 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleaseDetails.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleaseDetails.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleasesEdit.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleasesEdit.jspf
index 471b4a72c8..44973c2322 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleasesEdit.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/linkedReleasesEdit.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <%@ page import="org.eclipse.sw360.datahandler.thrift.MainlineState" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/logError.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/logError.jspf
index 741e2ac1d6..b699db6ce3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/logError.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/logError.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 <%@ page import="org.apache.log4j.Logger" %>
 <%Logger log = Logger.getLogger(getClass());%>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/mapEdit.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/mapEdit.jspf
index c4a375d4a1..b3992060f0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/mapEdit.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/mapEdit.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016-2017.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <table class="table edit-table two-columns-with-actions" id="mapEditTable">
     <thead>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/modal.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/modal.jspf
index 94795eddc7..16bf63973f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/modal.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/modal.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <script>
     function showStatusPopup(text, modal, header) {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/pageSpinner.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/pageSpinner.jspf
index 318560e47e..7ad8f61148 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/pageSpinner.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/pageSpinner.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <div class="container container-spinner">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/quickfilter.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/quickfilter.jspf
index 1c87f41c6d..6736e294e6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/quickfilter.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/quickfilter.jspf
@@ -2,12 +2,11 @@
  ~ Copyright Siemens AG, 2017, 2019.
  ~ Part of the SW360 Portal Project.
  ~
- ~ SPDX-License-Identifier: EPL-1.0
+ ~ 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/
  ~
- ~ 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
+ ~ SPDX-License-Identifier: EPL-2.0
  --%>
 
 <div id="component-quickfilter" class="card">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/requirejs.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/requirejs.jspf
index c3a0082153..e7d7f5c0c0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/requirejs.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/requirejs.jspf
@@ -1,12 +1,11 @@
 <%--
  ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  ~
- ~ SPDX-License-Identifier: EPL-1.0
+ ~ 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/
  ~
- ~ 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
+ ~ SPDX-License-Identifier: EPL-2.0
  --%>
 <script src="<%=request.getContextPath()%>/webjars/requirejs/require.js"></script>
 <script type="text/javascript">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectLicenses.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectLicenses.jsp
index f2f226e17c..2740da0203 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectLicenses.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectLicenses.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal User.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <portlet:defineObjects/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectUsers.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectUsers.jsp
index 560e56bf80..54e06ec8b9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectUsers.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchAndSelectUsers.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal User.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <portlet:defineObjects/>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchLicenses.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchLicenses.jsp
index 00ea7252fe..96d0b95584 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchLicenses.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchLicenses.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal User.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchReleases.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchReleases.jsp
index 02b31ed231..bfb995f7b6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchReleases.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchReleases.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@include file="/html/init.jsp" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchUsers.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchUsers.jsp
index a7f67a1532..ebaf8e7e9e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchUsers.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/searchUsers.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal User.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp" %>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingComponentsTable.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingComponentsTable.jspf
index a4afe244de..debe007caf 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingComponentsTable.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingComponentsTable.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <core_rt:if test="${usingComponents != null  && usingComponents.size()>0}">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingProjectsTable.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingProjectsTable.jspf
index 2ece32d138..3ed79641d4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingProjectsTable.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingProjectsTable.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
 --%>
 
 <core_rt:if test="${usingProjects != null && allUsingProjectsCount > 0}">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingReleasesTable.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingReleasesTable.jspf
index a19ba587f3..bfe209e123 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingReleasesTable.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/usingReleasesTable.jspf
@@ -2,11 +2,12 @@
   ~ Copyright Bosch Software Innovations GmbH, 2017.
   ~ Part of the SW360 Portal Project.
   ~
-  ~ 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
---%>
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  --%>
 
 <h4><sw360:out value="${documentName}"/> is present in the following releases</h4>
 <core_rt:if test="${usingReleases != null  && usingReleases.size()>0}">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityModal.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityModal.jspf
index 85d2ec15d5..77d0c16b62 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityModal.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityModal.jspf
@@ -2,12 +2,11 @@
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~ With contributions by Siemens AG, 2019.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
 <%@ page import="org.eclipse.sw360.datahandler.thrift.RequestStatus" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityTab.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityTab.jspf
index 2c9930ac1c..67280e77f0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityTab.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/utils/includes/vulnerabilityTab.jspf
@@ -2,12 +2,11 @@
   ~ Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <a class="list-group-item list-group-item-action <core_rt:if test="${selectedTab == 'tab-Vulnerabilities'}">active</core_rt:if>" href="#tab-Vulnerabilities" data-toggle="list" role="tab">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/detail.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/detail.jsp
index c4fedd5a0c..c31afb8dad 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/detail.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/detail.jsp
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@include file="/html/init.jsp"%>
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/metaData.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/metaData.jspf
index 283d3d8459..fe8972cc93 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/metaData.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/metaData.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <table class="table">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/references.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/references.jspf
index 6baa5c26b6..06afcd4f88 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/references.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/references.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <h4>Vulnerability References</h4>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/summary.jspf b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/summary.jspf
index 4f6e3ab11e..0227b3cf8d 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/summary.jspf
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/summary.jspf
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <table class="table label-value-table">
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/view.jsp
index fcb10a5203..474c68ef6c 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/view.jsp
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/vulnerabilities/view.jsp
@@ -2,12 +2,11 @@
   ~ Copyright (c) Bosch Software Innovations GmbH 2016.
   ~ Copyright (c) Siemens AG 2016-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 <%@ page import="com.liferay.portal.kernel.portlet.PortletURLFactoryUtil" %>
 <%@ page import="org.eclipse.sw360.portal.common.PortalConstants" %>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons.svg
index 9ba0a55f46..d13642c545 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons.svg
@@ -1,12 +1,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg aria-hidden="true" style="position: absolute; width: 0; height: 0; overflow: hidden;" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <defs>
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/component.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/component.svg
index 4f2d10b0dd..32a5edbcee 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/component.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/component.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/fossology.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/fossology.svg
index 96234918a6..56722d517b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/fossology.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/fossology.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/info.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/info.svg
index dbbcefd33c..0650f9f9e4 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/info.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/info.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/license.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/license.svg
index 2a744a4efa..fbb2bd4ce2 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/license.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/license.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/project.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/project.svg
index ab86977ac1..216719251e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/project.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/project.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/release.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/release.svg
index f270ab9a62..8932dd6b61 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/release.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/release.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/todo.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/todo.svg
index 8a6cc60dee..6fc3d8f3f9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/todo.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/todo.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/type_template.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/type_template.svg
index 02aa734989..af3b5e9d7e 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/type_template.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/type_template.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/user.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/user.svg
index 26002e5e72..ffb3337820 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/user.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/user.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/vendor.svg b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/vendor.svg
index 89f4d00831..3248207c64 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/vendor.svg
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/images/icons/vendor.svg
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/bootstrap.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/bootstrap.js
index 487f64fdce..b0a9dbc34b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/bootstrap.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/bootstrap.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/datatables.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/datatables.js
index 5852e03c6e..7cd803a4e9 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/datatables.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/datatables.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/jquery-ui.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/jquery-ui.js
index 34a0cd15c3..6f148fedfa 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/jquery-ui.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/bridges/jquery-ui.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/releases/linkProject.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/releases/linkProject.js
index 3e0d6ee1d7..bc48ecd4d6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/releases/linkProject.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/releases/linkProject.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('components/includes/releases/linkProject', ['jquery', 'bridges/datatables', 'modules/dialog', 'modules/button', 'utils/keyboard', 'utils/link' ], function($, datatables, dialog, button, keyboard, link) {
     var $dialog,
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/addVendor.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/addVendor.js
index 45c31085bd..ab5ef0d082 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/addVendor.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/addVendor.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('components/includes/vendors/addVendor', ['jquery', 'modules/dialog', 'modules/validation', 'utils/keyboard' ], function($, dialog, validation, keyboard) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/searchVendor.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/searchVendor.js
index 8afdfb8d28..4fc6a30996 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/searchVendor.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/components/includes/vendors/searchVendor.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('components/includes/vendors/searchVendor', ['jquery', 'bridges/datatables', 'components/includes/vendors/addVendor', 'modules/button', 'modules/dialog', 'utils/keyboard' ], function($, datatables, vendoradd, button, dialog, keyboard) {
     var $dialog,
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/jquery.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/jquery.js
index a12f65bd39..95aa25a47b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/jquery.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/jquery.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/ajax-treetable.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/ajax-treetable.js
index 9a3b435e5a..a2ac1f6b71 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/ajax-treetable.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/ajax-treetable.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/ajax-treetable', [ 'jquery', 'utils/cssloader', /* jquery-plugins: */ 'jquery-treetable' ], function($, cssloader) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/alert.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/alert.js
index 52dc160973..ed8b346171 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/alert.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/alert.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/alert', [ 'jquery' ], function($) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/autocomplete.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/autocomplete.js
index a56406114e..922d0a8bae 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/autocomplete.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/autocomplete.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/autocomplete', ['jquery', 'bridges/jquery-ui'], function($) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/button.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/button.js
index f1a8fe348e..7b367a1756 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/button.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/button.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/button', [ 'jquery' ], function($) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-renderer.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-renderer.js
index ded1f6312d..fba994a627 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-renderer.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-renderer.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017-2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-utils.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-utils.js
index 05fc6472cd..f9894f5330 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-utils.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/datatables-utils.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/datatables-utils', ['jquery', /* jquery-plugins */ 'datatables.net'], function($) {
     $.fn.dataTable.ext.order['sort-select'] = function(settings, col) {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/dialog.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/dialog.js
index 2d8d99b5c6..5375b9aa39 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/dialog.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/dialog.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/dialog', [
 	'jquery',
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/linkListDialog.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/linkListDialog.js
index 87c51f8831..e06e8f4ea0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/linkListDialog.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/linkListDialog.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/linkListDialog', ['jquery', 'modules/dialog' ], function($, dialog) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/listgroup.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/listgroup.js
index a0e5c88109..6c03e701b5 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/listgroup.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/listgroup.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/listgroup', [
 	'jquery',
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/mergeWizard.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/mergeWizard.js
index 1fb696b151..23887d607f 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/mergeWizard.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/mergeWizard.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/mergeWizard', [ 'jquery', 'modules/sw360Wizard' ], function($, sw360Wizard) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/sw360Wizard.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/sw360Wizard.js
index 1df11d5672..f793cef063 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/sw360Wizard.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/sw360Wizard.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/sw360Wizard', [ 'jquery', 'modules/button' ], function($, button) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/validation.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/validation.js
index 3adc9ecad2..4443d10f9b 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/validation.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/modules/validation.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('modules/validation', [ 'jquery' ], function($) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/cssloader.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/cssloader.js
index fbaef4ca16..d69441cbf6 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/cssloader.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/cssloader.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /**
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/escape.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/escape.js
index c88b4284fd..ca1e3e06ef 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/escape.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/escape.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/escape', function() {
 	return {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/attachmentsUpload.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/attachmentsUpload.js
index f242ad93cf..1c5eda3403 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/attachmentsUpload.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/attachmentsUpload.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/includes/attachmentsUpload', ['jquery', 'resumable', 'modules/dialog' ], function($, Resumable, dialog) {
     var $dialog,
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/fossologyClearing.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/fossologyClearing.js
index 697d25a8dd..86ad5631c3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/fossologyClearing.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/fossologyClearing.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/includes/fossologyClearing', [
     'jquery',
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/quickfilter.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/quickfilter.js
index b9135367d2..9737b0bda1 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/quickfilter.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/quickfilter.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2017, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/includes/quickfilter', ['jquery'], function(jquery) {
     function searchCallbackApiLegacy(searchTerm) {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/searchAndSelectIds.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/searchAndSelectIds.js
index 964139a58f..1ef55f4fc0 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/searchAndSelectIds.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/includes/searchAndSelectIds.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 define('utils/includes/searchAndSelectIds', ['jquery', 'utils/keyboard', 'modules/dialog', 'bridges/datatables' ], function($, keyboard, dialog, datatables) {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/keyboard.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/keyboard.js
index f10f5d0c7b..dda34b06d2 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/keyboard.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/keyboard.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/keyboard', ['jquery'], function($) {
 
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/link.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/link.js
index a638213314..a4489693b2 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/link.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/link.js
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2019.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/link', function() {
 	var prefix = themeDisplay.getPortalURL() + '/group/guest/',
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/object.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/object.js
index 87fcb98385..ab4baf634d 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/object.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/object.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/object', function() {
 	return {
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/render.js b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/render.js
index 8123dba7d8..e8611bbde8 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/render.js
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/resources/js/utils/render.js
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 define('utils/render', [
 	'jquery',
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/tags/TrimLineBreaks.tag b/frontend/sw360-portlet/src/main/resources/META-INF/tags/TrimLineBreaks.tag
index 6e38d5b772..2ddddb00ad 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/tags/TrimLineBreaks.tag
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/tags/TrimLineBreaks.tag
@@ -1,12 +1,11 @@
 <%--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   ~
   ~ This tag file MUST NOT have any line breaks outside of this multiline comment.
   ~ It is surely possible to implement it in Java to avoid having this weird restriction,
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/tags/yesno.tag b/frontend/sw360-portlet/src/main/resources/META-INF/tags/yesno.tag
index bb64aa3075..52537970f3 100644
--- a/frontend/sw360-portlet/src/main/resources/META-INF/tags/yesno.tag
+++ b/frontend/sw360-portlet/src/main/resources/META-INF/tags/yesno.tag
@@ -3,12 +3,11 @@
 <%--
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   --%>
 
 <cYesNo:choose><cYesNo:when test="${value}">yes</cYesNo:when><cYesNo:otherwise>no</cYesNo:otherwise></cYesNo:choose>
\ No newline at end of file
diff --git a/frontend/sw360-portlet/src/main/resources/log4j.properties b/frontend/sw360-portlet/src/main/resources/log4j.properties
index f18b37f75b..7e9db83013 100644
--- a/frontend/sw360-portlet/src/main/resources/log4j.properties
+++ b/frontend/sw360-portlet/src/main/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/component-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/component-friendly-url-routes.xml
index 439a3c5848..83ee547402 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/component-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/component-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 6.2.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_6_2_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/license-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/license-friendly-url-routes.xml
index 7892b839b6..de49ab0246 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/license-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/license-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 6.2.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_6_2_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/moderation-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/moderation-friendly-url-routes.xml
index bf29811bc9..3e7212a14c 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/moderation-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/moderation-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 6.2.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_6_2_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/project-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/project-friendly-url-routes.xml
index 47afb5e15a..9685b73052 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/project-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/project-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 7.1.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_7_1_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/search-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/search-friendly-url-routes.xml
index fed0ad93b9..8f6dacd769 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/search-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/search-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 6.2.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_6_2_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/vulnerability-friendly-url-routes.xml b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/vulnerability-friendly-url-routes.xml
index 4cad863e62..cda2aa983b 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/vulnerability-friendly-url-routes.xml
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/mapper/vulnerability-friendly-url-routes.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <!DOCTYPE routes PUBLIC "-//Liferay//DTD Friendly URL Routes 6.2.0//EN"
         "http://www.liferay.com/dtd/liferay-friendly-url-routes_6_2_0.dtd">
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/admin.properties b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/admin.properties
index 0c8fe05182..c7159155d6 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/admin.properties
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/admin.properties
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 com.liferay.portlet.display-category=SW360 Administration
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/base.properties b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/base.properties
index f720ec2dab..ad9e6e69ac 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/base.properties
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/base.properties
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 com.liferay.portlet.css-class-wrapper=sw360-portlet
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/default.properties b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/default.properties
index 28a3b0c9d4..71fd584294 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/default.properties
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/default.properties
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 com.liferay.portlet.display-category=SW360
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/user.properties b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/user.properties
index 28593c97f0..847a8b3d8b 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/user.properties
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/user.properties
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 com.liferay.portlet.display-category=SW360 User
diff --git a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/welcome.properties b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/welcome.properties
index c1fd984835..92ac0a2a11 100644
--- a/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/welcome.properties
+++ b/frontend/sw360-portlet/src/main/resources/org/eclipse/sw360/portal/portlets/welcome.properties
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 com.liferay.portlet.display-category=SW360 Welcome
diff --git a/frontend/sw360-portlet/src/main/resources/orgmapping.properties b/frontend/sw360-portlet/src/main/resources/orgmapping.properties
index 879b03f98f..08f49fc1a1 100644
--- a/frontend/sw360-portlet/src/main/resources/orgmapping.properties
+++ b/frontend/sw360-portlet/src/main/resources/orgmapping.properties
@@ -1,9 +1,10 @@
 # Copyright Siemens AG, 2016-2018. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # properties for organization mapping
diff --git a/frontend/sw360-portlet/src/main/resources/sw360.properties b/frontend/sw360-portlet/src/main/resources/sw360.properties
index 9267829dc8..8f0ce6d879 100644
--- a/frontend/sw360-portlet/src/main/resources/sw360.properties
+++ b/frontend/sw360-portlet/src/main/resources/sw360.properties
@@ -1,12 +1,12 @@
 #
 # Copyright Siemens AG, 2013-2016, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
-
 
 # --------------------------------------------------#
 #                       NOTE                        #
diff --git a/frontend/sw360-portlet/src/main/resources/welcomePageGuideline.html b/frontend/sw360-portlet/src/main/resources/welcomePageGuideline.html
index c876ea63d6..cf6b56bcfb 100644
--- a/frontend/sw360-portlet/src/main/resources/welcomePageGuideline.html
+++ b/frontend/sw360-portlet/src/main/resources/welcomePageGuideline.html
@@ -1,3 +1,12 @@
+<!--
+  ~ Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
+  ~
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+-->
 <h1 class="display-4">Welcome to SW360!</h1>
 <p class="lead">SW360 is an open source software project that
     provides both a web application and a repository to collect,
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/TestUserCacheHolder.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/TestUserCacheHolder.java
index b2947acc3d..c8bce56f92 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/TestUserCacheHolder.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/TestUserCacheHolder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/PortletUtilsTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/PortletUtilsTest.java
index bc26e93f1b..d71363a902 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/PortletUtilsTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/PortletUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/datatables/DataTablesParserTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/datatables/DataTablesParserTest.java
index 1844deade1..52be79490d 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/datatables/DataTablesParserTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/common/datatables/DataTablesParserTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.common.datatables;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortletTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortletTest.java
index 7d49999e66..8055ac3ecc 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortletTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/BdpImportPortletTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2015.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projectimport;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortletTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortletTest.java
index 688c0fa119..09aec2447c 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortletTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projectimport/WsImportPortletTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Verifa Oy, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projectimport;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletTest.java
index 02589ae64c..aa27285970 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projects;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtilsTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtilsTest.java
index 21ae37dfb2..69ed6cf7b5 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtilsTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/portlets/projects/ProjectPortletUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.portlets.projects;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstractTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstractTest.java
index cc851277b8..15268f1fb1 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstractTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAbstractTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReportTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReportTest.java
index bcf1b5ef61..8ed9f32109 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReportTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadApprovedClearingReportTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundleTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundleTest.java
index a28648a8c3..ea9f7e444f 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundleTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentBundleTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFileTest.java b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFileTest.java
index 7f8ee83858..a921ecb52a 100644
--- a/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFileTest.java
+++ b/frontend/sw360-portlet/src/test/java/org/eclipse/sw360/portal/tags/links/DisplayDownloadAttachmentFileTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.portal.tags.links;
 
diff --git a/libraries/commonIO/bnd.bnd b/libraries/commonIO/bnd.bnd
index 99992feef5..9aae3c0a68 100644
--- a/libraries/commonIO/bnd.bnd
+++ b/libraries/commonIO/bnd.bnd
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 Bundle-Name: SW360 CommonIO
diff --git a/libraries/commonIO/pom.xml b/libraries/commonIO/pom.xml
index 29142b53dc..9306059a13 100644
--- a/libraries/commonIO/pom.xml
+++ b/libraries/commonIO/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/AttachmentFrontendUtils.java b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/AttachmentFrontendUtils.java
index b508d93a35..51effd1c0d 100644
--- a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/AttachmentFrontendUtils.java
+++ b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/AttachmentFrontendUtils.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.commonIO;
 
diff --git a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/ConvertUtil.java b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/ConvertUtil.java
index 575378618e..27af884cbc 100644
--- a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/ConvertUtil.java
+++ b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/ConvertUtil.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.commonIO;
 
diff --git a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/SampleOptions.java b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/SampleOptions.java
index 5b1cdb0aa8..060c1572dd 100644
--- a/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/SampleOptions.java
+++ b/libraries/commonIO/src/main/java/org/eclipse/sw360/commonIO/SampleOptions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.commonIO;
 
diff --git a/libraries/exporters/bnd.bnd b/libraries/exporters/bnd.bnd
index c64c37a099..6cff33404e 100644
--- a/libraries/exporters/bnd.bnd
+++ b/libraries/exporters/bnd.bnd
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 Bundle-Name: SW360 Exporters
diff --git a/libraries/exporters/pom.xml b/libraries/exporters/pom.xml
index 7e524c8d8b..0955cc69cc 100644
--- a/libraries/exporters/pom.xml
+++ b/libraries/exporters/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~ With modifications by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/CSVExport.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/CSVExport.java
index b141e6433d..be2a7b4771 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/CSVExport.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/CSVExport.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ComponentExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ComponentExporter.java
index 4211b1f3d2..c28f210366 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ComponentExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ComponentExporter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ExcelExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ExcelExporter.java
index 1373d62e11..9d0cbea1e6 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ExcelExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ExcelExporter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicenseExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicenseExporter.java
index 904704758e..e7beb2c711 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicenseExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicenseExporter.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicsExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicsExporter.java
index 37e66d29f4..bcdff19152 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicsExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/LicsExporter.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2016,2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ProjectExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ProjectExporter.java
index 66f9572737..5418068681 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ProjectExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ProjectExporter.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ReleaseExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ReleaseExporter.java
index cddb213caf..ad67ceab8a 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ReleaseExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/ReleaseExporter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/VendorExporter.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/VendorExporter.java
index a64504e419..43b5dcd3d1 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/VendorExporter.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/VendorExporter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ComponentHelper.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ComponentHelper.java
index f2efd24237..0635a466a7 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ComponentHelper.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ComponentHelper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.helper;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ExporterHelper.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ExporterHelper.java
index 7a8b8f3d9f..cf77bfc346 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ExporterHelper.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ExporterHelper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.exporter.helper;
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ProjectHelper.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ProjectHelper.java
index adad435923..2d40308a75 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ProjectHelper.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ProjectHelper.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.helper;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ReleaseHelper.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ReleaseHelper.java
index 1b378fe550..35861b33ae 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ReleaseHelper.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/helper/ReleaseHelper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.helper;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ConvertRecord.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ConvertRecord.java
index 5ad6cbee0c..bc98296b53 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ConvertRecord.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ConvertRecord.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/LicsArchive.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/LicsArchive.java
index 8b8f22de0b..4ba142e617 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/LicsArchive.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/LicsArchive.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/SubTable.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/SubTable.java
index 9f2e1f759f..36619a45af 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/SubTable.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/SubTable.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/TypeMappings.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/TypeMappings.java
index 99a20d923e..a37ff7ae35 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/TypeMappings.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/TypeMappings.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ZipTools.java b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ZipTools.java
index e798f51748..1373030fd9 100644
--- a/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ZipTools.java
+++ b/libraries/exporters/src/main/java/org/eclipse/sw360/exporter/utils/ZipTools.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2016,2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/ProjectExporterTest.java b/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/ProjectExporterTest.java
index 38ac308108..7b76adb482 100644
--- a/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/ProjectExporterTest.java
+++ b/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/ProjectExporterTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter;
 
diff --git a/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/utils/ConvertRecordTest.java b/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/utils/ConvertRecordTest.java
index 65508d3f24..d9190bc690 100644
--- a/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/utils/ConvertRecordTest.java
+++ b/libraries/exporters/src/test/java/org/eclipse/sw360/exporter/utils/ConvertRecordTest.java
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.exporter.utils;
 
diff --git a/libraries/importers/bnd.bnd b/libraries/importers/bnd.bnd
index 124d0397d9..de5ac98160 100644
--- a/libraries/importers/bnd.bnd
+++ b/libraries/importers/bnd.bnd
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 Bundle-Name: SW360 Importers
diff --git a/libraries/importers/pom.xml b/libraries/importers/pom.xml
index dda1ff6f34..892470fb95 100644
--- a/libraries/importers/pom.xml
+++ b/libraries/importers/pom.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-     ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
-	 ~
-     ~ SPDX-License-Identifier: EPL-1.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/epl-v10.html
--->
+  ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
+  ~
+  ~ 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/
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecord.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecord.java
index 987a5f525f..19cae5f89e 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecord.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecord.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilder.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilder.java
index 03b3f19a25..1b3befa155 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilder.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAwareCSVRecord.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAwareCSVRecord.java
index 98a8d08e20..59911d02d8 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAwareCSVRecord.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentAwareCSVRecord.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecord.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecord.java
index 4bf287d5dc..40f91e1e9e 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecord.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecord.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilder.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilder.java
index fa3d92fa49..81f72c2a6e 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilder.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentImportUtils.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentImportUtils.java
index 3bf9235bc6..536dd702d6 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentImportUtils.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ComponentImportUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecord.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecord.java
index 90ea9b5419..96cbb0c2de 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecord.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecord.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecordBuilder.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecordBuilder.java
index 5630d80e79..b7da09b1c8 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecordBuilder.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/CustomizedCSVRecordBuilder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/LicsImporter.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/LicsImporter.java
index a7dab97cda..2ea81af2d1 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/LicsImporter.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/LicsImporter.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecord.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecord.java
index 63d87ae5b1..395f6ee459 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecord.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecord.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilder.java b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilder.java
index 0f087b8604..493e0f0d53 100644
--- a/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilder.java
+++ b/libraries/importers/src/main/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilder.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/main/resources/couchdb.properties b/libraries/importers/src/main/resources/couchdb.properties
index cdc433f79f..bc0d027d57 100644
--- a/libraries/importers/src/main/resources/couchdb.properties
+++ b/libraries/importers/src/main/resources/couchdb.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 couch_db_url=http://localhost:5984
 couch_db_database=sw360db
\ No newline at end of file
diff --git a/libraries/importers/src/main/resources/csvfiles.properties b/libraries/importers/src/main/resources/csvfiles.properties
index a1f8d5117e..7c417e74ed 100644
--- a/libraries/importers/src/main/resources/csvfiles.properties
+++ b/libraries/importers/src/main/resources/csvfiles.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 licenseFilename=dbo.License.csv
diff --git a/libraries/importers/src/main/resources/log4j.properties b/libraries/importers/src/main/resources/log4j.properties
index 0eac420706..b8dcb32298 100644
--- a/libraries/importers/src/main/resources/log4j.properties
+++ b/libraries/importers/src/main/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAndAttachmentAwareDBTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAndAttachmentAwareDBTest.java
index 2b6c662daf..4ee4507366 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAndAttachmentAwareDBTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAndAttachmentAwareDBTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilderTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilderTest.java
index 43d2c5b19e..eb066e1421 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilderTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentAttachmentCSVRecordBuilderTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilderTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilderTest.java
index 11278b9298..ee04b0defd 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilderTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentCSVRecordBuilderTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentImportUtilsTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentImportUtilsTest.java
index b4bcb8a932..c269b2ad22 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentImportUtilsTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ComponentImportUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.importer;
 
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ConvertUtilTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ConvertUtilTest.java
index 1ba9795c5a..0ad1029731 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ConvertUtilTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ConvertUtilTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ImportCSVTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ImportCSVTest.java
index 2f03554327..f6820e8a26 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ImportCSVTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ImportCSVTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilderTest.java b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilderTest.java
index d775505a2a..2118e58a93 100644
--- a/libraries/importers/src/test/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilderTest.java
+++ b/libraries/importers/src/test/java/org/eclipse/sw360/importer/ReleaseLinkCSVRecordBuilderTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.importer;
diff --git a/libraries/importers/src/test/resources/log4j.properties b/libraries/importers/src/test/resources/log4j.properties
index 73ecd1052c..c5f67465c5 100644
--- a/libraries/importers/src/test/resources/log4j.properties
+++ b/libraries/importers/src/test/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/libraries/importers/tools/convertSqlDumpToCsv b/libraries/importers/tools/convertSqlDumpToCsv
index ab1801941e..8109d1f5bd 100755
--- a/libraries/importers/tools/convertSqlDumpToCsv
+++ b/libraries/importers/tools/convertSqlDumpToCsv
@@ -3,12 +3,11 @@
 # 
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 # 
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 # 
 
 import sys
diff --git a/libraries/lib-datahandler/bnd.bnd b/libraries/lib-datahandler/bnd.bnd
index 5a5ad98365..aeeb406b85 100644
--- a/libraries/lib-datahandler/bnd.bnd
+++ b/libraries/lib-datahandler/bnd.bnd
@@ -1,12 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# SPDX-License-Identifier: EPL-2.0
 #
 
 Bundle-Name: SW360 Datahandler
diff --git a/libraries/lib-datahandler/pom.xml b/libraries/lib-datahandler/pom.xml
index c362ef61db..c5948ebb06 100644
--- a/libraries/lib-datahandler/pom.xml
+++ b/libraries/lib-datahandler/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/businessrules/ReleaseClearingStateSummaryComputer.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/businessrules/ReleaseClearingStateSummaryComputer.java
index e638c43ecb..47fcb5df82 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/businessrules/ReleaseClearingStateSummaryComputer.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/businessrules/ReleaseClearingStateSummaryComputer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.businessrules;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/CommonUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/CommonUtils.java
index a9c21aba91..3912b424bb 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/CommonUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/CommonUtils.java
@@ -3,12 +3,11 @@
  * With modifications by Bosch Software Innovations GmbH, 2016
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStream.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStream.java
index 03136d39db..78fe69408f 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStream.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStream.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/DatabaseSettings.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/DatabaseSettings.java
index c72f12d348..67f28e89e9 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/DatabaseSettings.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/DatabaseSettings.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Duration.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Duration.java
index 1a10d4407c..9053fcd560 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Duration.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Duration.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/FossologyUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/FossologyUtils.java
index f8c1079c24..1aa0af794b 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/FossologyUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/FossologyUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ImportCSV.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ImportCSV.java
index 59bc5f48d6..3590a6b17a 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ImportCSV.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ImportCSV.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/JacksonUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/JacksonUtils.java
index 3ef8fac446..f2b55d29fd 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/JacksonUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/JacksonUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Moderator.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Moderator.java
index e66dc62a08..b130616779 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Moderator.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/Moderator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Assert.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Assert.java
index eb9de0d493..9b5b607af2 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Assert.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Assert.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Constants.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Constants.java
index f04483259d..c42598877c 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Constants.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Constants.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Utils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Utils.java
index bbf728f2e5..0836c4bc01 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Utils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/SW360Utils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java
index a6b53361fb..1de28571db 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtils.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017, 2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.common;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/WrappedException.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/WrappedException.java
index 87388525a7..da69f6eb0d 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/WrappedException.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/common/WrappedException.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnector.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnector.java
index 61da9ec44e..4935a66121 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnector.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnector.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloader.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloader.java
index 878036dee3..c7bf24e0a5 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloader.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloader.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapper.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapper.java
index d3a32bc641..de4f961d5c 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapper.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnector.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnector.java
index c75b61345f..8fae548a1d 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnector.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnector.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2017.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnector.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnector.java
index d75d79ac50..60bd8cca6f 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnector.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnector.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstance.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstance.java
index e5d7302097..d156cb53fd 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstance.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstance.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstanceTracker.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstanceTracker.java
index b2472c7b6d..d750e521da 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstanceTracker.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseInstanceTracker.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseMixIn.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseMixIn.java
index 15e16ac8b7..bb77472894 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseMixIn.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseMixIn.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseNestedMixIn.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseNestedMixIn.java
index 9f98697976..fbccc37e7a 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseNestedMixIn.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseNestedMixIn.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseRepository.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseRepository.java
index 0269bb4baf..e810bde2e5 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseRepository.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DatabaseRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapper.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapper.java
index 44b2a54369..25a0564bc4 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapper.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/MapperFactory.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/MapperFactory.java
index 8d66ea0383..1fbac0b614 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/MapperFactory.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/MapperFactory.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/deserializer/UsageDataDeserializer.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/deserializer/UsageDataDeserializer.java
index ffbbea8455..73a9d1e5ff 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/deserializer/UsageDataDeserializer.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/deserializer/UsageDataDeserializer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb.deserializer;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneAwareDatabaseConnector.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneAwareDatabaseConnector.java
index 1c1dd127d5..466aa35bdd 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneAwareDatabaseConnector.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneAwareDatabaseConnector.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb.lucene;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneSearchView.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneSearchView.java
index 87a1670b77..8318ff4bc0 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneSearchView.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/couchdb/lucene/LuceneSearchView.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb.lucene;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ComponentPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ComponentPermissions.java
index c7ded03ca1..f9486756e4 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ComponentPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ComponentPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissions.java
index 9d9f17292d..6f5e61ea4b 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/LicensePermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/LicensePermissions.java
index faaec74c9d..58cd8cdfac 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/LicensePermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/LicensePermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/PermissionUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/PermissionUtils.java
index e31f8355d3..62804e8a9d 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/PermissionUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/PermissionUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissions.java
index cea5a10805..517fa706e5 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissions.java
index 829b2f4e09..691ffbd741 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/UserPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/UserPermissions.java
index 34409316e0..236393f793 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/UserPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/UserPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VendorPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VendorPermissions.java
index f80a62e4be..b6de20266d 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VendorPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VendorPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VulnerabilityPermissions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VulnerabilityPermissions.java
index 592b0317bd..8b8be78d4a 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VulnerabilityPermissions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/permissions/VulnerabilityPermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptions.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptions.java
index 186e2fc25f..eb7fa72894 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptions.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptions.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationParameterException.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationParameterException.java
index 4ddb481979..4448e60c89 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationParameterException.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationParameterException.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResult.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResult.java
index 9087d4b3c8..6ffa9f6bc7 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResult.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResult.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceClassNotFoundException.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceClassNotFoundException.java
index f361da6a71..f6e0c96268 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceClassNotFoundException.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceClassNotFoundException.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGenerator.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGenerator.java
index 6f9c10dbd4..a2268325a8 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGenerator.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGenerator.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListController.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListController.java
index c53ee84999..8e078f4f0b 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListController.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListController.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftClients.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftClients.java
index c0f7733a9f..8b70840ff5 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftClients.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftClients.java
@@ -3,12 +3,11 @@
  * With modifications by Bosch Software Innovations GmbH, 2016.
  * With modifications by Verifa Oy, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.thrift;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftUtils.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftUtils.java
index f7b1e3fe7c..ce0d2d8ec1 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftUtils.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftUtils.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2019. Part of the SW360 Portal Project.
  * With modifications by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.thrift;
 
diff --git a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftValidate.java b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftValidate.java
index 5a92959d5a..e4f9e61047 100644
--- a/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftValidate.java
+++ b/libraries/lib-datahandler/src/main/java/org/eclipse/sw360/datahandler/thrift/ThriftValidate.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.thrift;
 
diff --git a/libraries/lib-datahandler/src/main/resources/sw360.properties b/libraries/lib-datahandler/src/main/resources/sw360.properties
index 99ef35d851..e9e414b0a5 100644
--- a/libraries/lib-datahandler/src/main/resources/sw360.properties
+++ b/libraries/lib-datahandler/src/main/resources/sw360.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 
diff --git a/libraries/lib-datahandler/src/main/thrift/attachments.thrift b/libraries/lib-datahandler/src/main/thrift/attachments.thrift
index 32f8230863..f6c128cd64 100644
--- a/libraries/lib-datahandler/src/main/thrift/attachments.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/attachments.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "users.thrift"
 include "sw360.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/components.thrift b/libraries/lib-datahandler/src/main/thrift/components.thrift
index fe5811b7f2..dd6c0cd2fe 100644
--- a/libraries/lib-datahandler/src/main/thrift/components.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/components.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "sw360.thrift"
 include "attachments.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/cvesearch.thrift b/libraries/lib-datahandler/src/main/thrift/cvesearch.thrift
index 0dfd0b7d7b..8302b66bbf 100644
--- a/libraries/lib-datahandler/src/main/thrift/cvesearch.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/cvesearch.thrift
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 
diff --git a/libraries/lib-datahandler/src/main/thrift/fossology.thrift b/libraries/lib-datahandler/src/main/thrift/fossology.thrift
index 8ca3ae5e22..826f251065 100644
--- a/libraries/lib-datahandler/src/main/thrift/fossology.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/fossology.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2015, 2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "sw360.thrift"
 include "users.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/importstatus.thrift b/libraries/lib-datahandler/src/main/thrift/importstatus.thrift
index d562b6b2b5..5a3cdcf836 100644
--- a/libraries/lib-datahandler/src/main/thrift/importstatus.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/importstatus.thrift
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2015.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /*
diff --git a/libraries/lib-datahandler/src/main/thrift/licenseinfo.thrift b/libraries/lib-datahandler/src/main/thrift/licenseinfo.thrift
index e860100642..77316d10a9 100644
--- a/libraries/lib-datahandler/src/main/thrift/licenseinfo.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/licenseinfo.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2016-2018. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "users.thrift"
 include "components.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/licenses.thrift b/libraries/lib-datahandler/src/main/thrift/licenses.thrift
index cd98ef751a..6a71aaa0bf 100644
--- a/libraries/lib-datahandler/src/main/thrift/licenses.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/licenses.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "users.thrift"
 include "sw360.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/moderation.thrift b/libraries/lib-datahandler/src/main/thrift/moderation.thrift
index 4ebc9282ce..8ad09dd176 100644
--- a/libraries/lib-datahandler/src/main/thrift/moderation.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/moderation.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 include "sw360.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/projectimport.thrift b/libraries/lib-datahandler/src/main/thrift/projectimport.thrift
index 64233938a5..1f30f317cf 100644
--- a/libraries/lib-datahandler/src/main/thrift/projectimport.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/projectimport.thrift
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2015.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 /*
diff --git a/libraries/lib-datahandler/src/main/thrift/projects.thrift b/libraries/lib-datahandler/src/main/thrift/projects.thrift
index 20d17d9b31..e434efe21e 100644
--- a/libraries/lib-datahandler/src/main/thrift/projects.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/projects.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2018. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "users.thrift"
 include "attachments.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/schedule.thrift b/libraries/lib-datahandler/src/main/thrift/schedule.thrift
index b3337637a0..9e8a04c8cb 100644
--- a/libraries/lib-datahandler/src/main/thrift/schedule.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/schedule.thrift
@@ -2,12 +2,11 @@
  * Copyright (c) Bosch Software Innovations GmbH 2016.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 
diff --git a/libraries/lib-datahandler/src/main/thrift/search.thrift b/libraries/lib-datahandler/src/main/thrift/search.thrift
index 32e78aeb9f..e0435b5396 100644
--- a/libraries/lib-datahandler/src/main/thrift/search.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/search.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "users.thrift"
 
diff --git a/libraries/lib-datahandler/src/main/thrift/sw360.thrift b/libraries/lib-datahandler/src/main/thrift/sw360.thrift
index 1b4506bc8e..16c00f41f1 100644
--- a/libraries/lib-datahandler/src/main/thrift/sw360.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/sw360.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017, 2019. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 namespace java org.eclipse.sw360.datahandler.thrift
diff --git a/libraries/lib-datahandler/src/main/thrift/users.thrift b/libraries/lib-datahandler/src/main/thrift/users.thrift
index c45c0c1588..053e2a4e4e 100644
--- a/libraries/lib-datahandler/src/main/thrift/users.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/users.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2017. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "sw360.thrift"
 namespace java org.eclipse.sw360.datahandler.thrift.users
diff --git a/libraries/lib-datahandler/src/main/thrift/vendors.thrift b/libraries/lib-datahandler/src/main/thrift/vendors.thrift
index 2eec4f5bb1..f00120bb97 100644
--- a/libraries/lib-datahandler/src/main/thrift/vendors.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/vendors.thrift
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  * With contributions by Bosch Software Innovations GmbH, 2016.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "sw360.thrift"
 include "users.thrift"
diff --git a/libraries/lib-datahandler/src/main/thrift/vulnerabilities.thrift b/libraries/lib-datahandler/src/main/thrift/vulnerabilities.thrift
index bd43796e65..ccb6fcddb8 100644
--- a/libraries/lib-datahandler/src/main/thrift/vulnerabilities.thrift
+++ b/libraries/lib-datahandler/src/main/thrift/vulnerabilities.thrift
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 include "sw360.thrift"
 include "users.thrift"
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TEnumToString.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TEnumToString.java
index 39efbb30ac..8a92328b2c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TEnumToString.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TEnumToString.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TestUtils.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TestUtils.java
index caba72f6bf..3aeba4b6fa 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TestUtils.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/TestUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/CommonUtilsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/CommonUtilsTest.java
index 8d448092b0..b901a41a79 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/CommonUtilsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/CommonUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStreamTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStreamTest.java
index b6abd8c47a..f9ac00a14f 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStreamTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ConcatClosingInputStreamTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.common;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/FossologyUtilsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/FossologyUtilsTest.java
index 8a29e31fd9..655a420b67 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/FossologyUtilsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/FossologyUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360AssertTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360AssertTest.java
index 093434a7cc..6c01cac49b 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360AssertTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360AssertTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.common;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360ConstantsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360ConstantsTest.java
index 4833dae391..9d582c7b37 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360ConstantsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360ConstantsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.common;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360UtilsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360UtilsTest.java
index 1a48975e12..27fb8bba7f 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360UtilsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/SW360UtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.common;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtilsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtilsTest.java
index 5ed47464e3..50f1a978ee 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtilsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/common/ThriftEnumUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.common;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnectorTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnectorTest.java
index 4fdbd74a9f..d9a4e16b2a 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnectorTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentConnectorTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloaderTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloaderTest.java
index 6b42473fbf..225e5a95e4 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloaderTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentDownloaderTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapperTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapperTest.java
index 9564ee5300..3ba2e2b528 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapperTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentContentWrapperTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnectorTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnectorTest.java
index 7c42642e6a..f518d27176 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnectorTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/AttachmentStreamConnectorTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.couchdb;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnectorTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnectorTest.java
index 62b1da047f..078fb039f8 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnectorTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseConnectorTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseTestProperties.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseTestProperties.java
index 04219cb7f9..90d06d282b 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseTestProperties.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DatabaseTestProperties.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapperTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapperTest.java
index eb663dae26..a76260e54f 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapperTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/DocumentWrapperTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/MapperFactoryTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/MapperFactoryTest.java
index 5c2cfe6662..49dbf087d3 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/MapperFactoryTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/couchdb/MapperFactoryTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.couchdb;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissionsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissionsTest.java
index 3de5eb4ddb..947b6e14fd 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissionsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/DocumentPermissionsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsTest.java
index 8ef284c4a7..57be5d486b 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsVisibilityTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsVisibilityTest.java
index f0e609de72..1ca0b1a3a0 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsVisibilityTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ProjectPermissionsVisibilityTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2016. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.permissions;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissionsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissionsTest.java
index c7f5a3cc54..4c19695165 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissionsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/ReleasePermissionsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/GivenProject.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/GivenProject.java
index 87ae3261d5..4c19bac707 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/GivenProject.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/GivenProject.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.permissions.jgivens;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenHighestAllowedAction.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenHighestAllowedAction.java
index 6bb443dd87..d2faa92909 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenHighestAllowedAction.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenHighestAllowedAction.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.permissions.jgivens;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenVisible.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenVisible.java
index a3095bb49c..89cb125b1c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenVisible.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/ThenVisible.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions.jgivens;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputePermissions.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputePermissions.java
index 6f3b61d131..66f78ae95c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputePermissions.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputePermissions.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.permissions.jgivens;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputeVisibility.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputeVisibility.java
index 2375854c96..6e7fa74462 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputeVisibility.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/permissions/jgivens/WhenComputeVisibility.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.permissions.jgivens;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptionsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptionsTest.java
index 6fe8f6d783..d5c790cf59 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptionsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationOptionsTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResultTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResultTest.java
index a5f4a229e4..a6709bac2c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResultTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/PaginationResultTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGeneratorTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGeneratorTest.java
index bc3d1240bc..62336e7650 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGeneratorTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceComparatorGeneratorTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListControllerTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListControllerTest.java
index 79c6778728..2809b849f9 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListControllerTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/resourcelists/ResourceListControllerTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.resourcelists;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandler.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandler.java
index fff9b2dc40..b85a1caca9 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandler.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.test;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandlerTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandlerTest.java
index 12328ae7e3..7adf28081c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandlerTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/test/TestServiceHandlerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.datahandler.test;
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftUtilsTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftUtilsTest.java
index 58ea5f9c67..add483125f 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftUtilsTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftUtilsTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.thrift;
 
diff --git a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftValidateTest.java b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftValidateTest.java
index d7c93740b6..c44fd88b3c 100644
--- a/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftValidateTest.java
+++ b/libraries/lib-datahandler/src/test/java/org/eclipse/sw360/datahandler/thrift/ThriftValidateTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.datahandler.thrift;
 
diff --git a/libraries/lib-datahandler/src/test/resources/databasetest.properties b/libraries/lib-datahandler/src/test/resources/databasetest.properties
index fe8fcc99cc..8c6eeffcf8 100644
--- a/libraries/lib-datahandler/src/test/resources/databasetest.properties
+++ b/libraries/lib-datahandler/src/test/resources/databasetest.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 couch_db_url=http://localhost:5984
 couch_db_database=datahandlertestdb
\ No newline at end of file
diff --git a/libraries/lib-datahandler/src/test/resources/log4j.properties b/libraries/lib-datahandler/src/test/resources/log4j.properties
index 7077d6a29b..f4f97a13fb 100644
--- a/libraries/lib-datahandler/src/test/resources/log4j.properties
+++ b/libraries/lib-datahandler/src/test/resources/log4j.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Root logger option
diff --git a/libraries/lib-datahandler/src/test/thrift/test.thrift b/libraries/lib-datahandler/src/test/thrift/test.thrift
index b569f6ae65..dda0c0e5f8 100644
--- a/libraries/lib-datahandler/src/test/thrift/test.thrift
+++ b/libraries/lib-datahandler/src/test/thrift/test.thrift
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 namespace java org.eclipse.sw360.testthrift
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 265b79a1a7..442d10105b 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -3,12 +3,11 @@
   ~ Copyright Siemens AG, 2013-2015. Part of the SW360 Portal Project.
   ~ With contributions by Bosch Software Innovations GmbH, 2016.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/pom.xml b/pom.xml
index 001f7e7ae0..87806307ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2013-2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -16,8 +15,8 @@
 
     <licenses>
         <license>
-            <name>Eclipse Public License 1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+            <name>Eclipse Public License 2.0</name>
+            <url>https://www.eclipse.org/legal/epl-2.0/</url>
         </license>
     </licenses>
 
diff --git a/rest/authorization-server/pom.xml b/rest/authorization-server/pom.xml
index 60bc6a0397..3bae09a6b1 100644
--- a/rest/authorization-server/pom.xml
+++ b/rest/authorization-server/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/StringTransformer.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/StringTransformer.java
index ebd82e9105..bd6de6553d 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/StringTransformer.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/StringTransformer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/Sw360AuthorizationServer.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/Sw360AuthorizationServer.java
index 45ee4c36fa..b9612cbaf9 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/Sw360AuthorizationServer.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/Sw360AuthorizationServer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver;
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientEntity.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientEntity.java
index 5f4dd0fd4b..ce90c79936 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientEntity.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientEntity.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.persistence;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepository.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepository.java
index da373f3b06..b3c1c90a02 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepository.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepository.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.persistence;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java
index 540cbaff7c..1bfdf2f2c7 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientController.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.rest;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientResource.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientResource.java
index 0649675597..f1d22d1134 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientResource.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientResource.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.rest;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java
index 7b54f24a8b..6030005b3e 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/client/service/Sw360ClientDetailsService.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.service;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360AuthorizationServerConfiguration.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360AuthorizationServerConfiguration.java
index 9e77518bb2..7b90a71c4e 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360AuthorizationServerConfiguration.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360AuthorizationServerConfiguration.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthoritiesCalculator.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthoritiesCalculator.java
index ddd430b193..117d594fb7 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthoritiesCalculator.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthoritiesCalculator.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthority.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthority.java
index 9c4ace1471..05638de16c 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthority.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360GrantedAuthority.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver.security;
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360SecurityEncryptor.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360SecurityEncryptor.java
index 553eda620f..83dc8b7d23 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360SecurityEncryptor.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360SecurityEncryptor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver.security;
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsProvider.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsProvider.java
index ae25440684..78c7967a82 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsProvider.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsProvider.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsService.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsService.java
index 09a1fd1608..e2817a3b24 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsService.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360UserDetailsService.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360WebSecurityConfiguration.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360WebSecurityConfiguration.java
index 7ef3798065..7e6f68081a 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360WebSecurityConfiguration.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/Sw360WebSecurityConfiguration.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/basicauth/Sw360LiferayAuthenticationProvider.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/basicauth/Sw360LiferayAuthenticationProvider.java
index f46035c85b..3d31c45ee2 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/basicauth/Sw360LiferayAuthenticationProvider.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/basicauth/Sw360LiferayAuthenticationProvider.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security.basicauth;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationFilter.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationFilter.java
index 98abd8c9a6..c4f6e38374 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationFilter.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationFilter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security.customheaderauth;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationProvider.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationProvider.java
index 9172c79a38..7198980d40 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationProvider.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderAuthenticationProvider.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security.customheaderauth;
 
diff --git a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderServletRequestWrapper.java b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderServletRequestWrapper.java
index 868e4a1a21..92ff9d9d5a 100644
--- a/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderServletRequestWrapper.java
+++ b/rest/authorization-server/src/main/java/org/eclipse/sw360/rest/authserver/security/customheaderauth/Sw360CustomHeaderServletRequestWrapper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.security.customheaderauth;
 
diff --git a/rest/authorization-server/src/main/resources/application-dev.yml b/rest/authorization-server/src/main/resources/application-dev.yml
index 6acbfbc226..369330a4db 100644
--- a/rest/authorization-server/src/main/resources/application-dev.yml
+++ b/rest/authorization-server/src/main/resources/application-dev.yml
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 couchdb:
diff --git a/rest/authorization-server/src/main/resources/application.yml b/rest/authorization-server/src/main/resources/application.yml
index 7060715a10..6b2d66da8f 100644
--- a/rest/authorization-server/src/main/resources/application.yml
+++ b/rest/authorization-server/src/main/resources/application.yml
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 # Port to open in standalone mode
diff --git a/rest/authorization-server/src/main/resources/banner.txt b/rest/authorization-server/src/main/resources/banner.txt
index 616beb7e2f..335d4c33ba 100644
--- a/rest/authorization-server/src/main/resources/banner.txt
+++ b/rest/authorization-server/src/main/resources/banner.txt
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ${AnsiColor.BRIGHT_BLUE}                ${AnsiColor.BRIGHT_GREEN}________   _______________
diff --git a/rest/authorization-server/src/main/webapp/WEB-INF/web.xml b/rest/authorization-server/src/main/webapp/WEB-INF/web.xml
index d2d279a7ce..2b2f4da0b7 100644
--- a/rest/authorization-server/src/main/webapp/WEB-INF/web.xml
+++ b/rest/authorization-server/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsBasicAuthTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsBasicAuthTest.java
index 652091cd4d..a42b7ee9f8 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsBasicAuthTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsBasicAuthTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsCustomHeaderAuthTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsCustomHeaderAuthTest.java
index 41e2462a19..10d5f25461 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsCustomHeaderAuthTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsCustomHeaderAuthTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsTestBase.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsTestBase.java
index f70f078f32..f9799daead 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsTestBase.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypeClientCredentialsTestBase.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver;
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordBasicAuthTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordBasicAuthTest.java
index 32dc49a9f5..7afb507200 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordBasicAuthTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordBasicAuthTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderGetTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderGetTest.java
index a2d6107b84..15aa193593 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderGetTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderGetTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderPostTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderPostTest.java
index ce48121d70..9792c7e784 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderPostTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordCustomHeaderPostTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordTestBase.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordTestBase.java
index 77c6b09b67..45b3391bc2 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordTestBase.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/GrantTypePasswordTestBase.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver;
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/IntegrationTestBase.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/IntegrationTestBase.java
index c332750f79..125ae8de51 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/IntegrationTestBase.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/IntegrationTestBase.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/SecurityEncryptorTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/SecurityEncryptorTest.java
index 2b883cc942..4c9d2d3535 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/SecurityEncryptorTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/SecurityEncryptorTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.authserver;
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepositoryTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepositoryTest.java
index bd802b98e2..34de785c4c 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepositoryTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/persistence/OAuthClientRepositoryTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.persistence;
 
diff --git a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientControllerTest.java b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientControllerTest.java
index c791885d0c..7d13646146 100644
--- a/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientControllerTest.java
+++ b/rest/authorization-server/src/test/java/org/eclipse/sw360/rest/authserver/client/rest/OAuthClientControllerTest.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.authserver.client.rest;
 
diff --git a/rest/authorization-server/src/test/resources/application-test.yml b/rest/authorization-server/src/test/resources/application-test.yml
index 13adaeb79d..4e7722342d 100644
--- a/rest/authorization-server/src/test/resources/application-test.yml
+++ b/rest/authorization-server/src/test/resources/application-test.yml
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 security:
diff --git a/rest/authorization-server/tools/generateJwtStore.bat b/rest/authorization-server/tools/generateJwtStore.bat
index be739e11ff..e2a881783b 100644
--- a/rest/authorization-server/tools/generateJwtStore.bat
+++ b/rest/authorization-server/tools/generateJwtStore.bat
@@ -1,10 +1,11 @@
 REM
 REM Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 REM
-REM All rights reserved. This configuration file is provided to you under the
-REM terms and conditions of the Eclipse Distribution License v1.0 which
-REM accompanies this distribution, and is available at
-REM http://www.eclipse.org/org/documents/edl-v10.php
+REM This program and the accompanying materials are made
+REM available under the terms of the Eclipse Public License 2.0
+REM which is available at https://www.eclipse.org/legal/epl-2.0/
+REM
+REM SPDX-License-Identifier: EPL-2.0
 REM
 
 keytool -genkeypair -alias jwt -keyalg RSA -dname "CN=jwt, L=Munich, S=Munich, C=DE" -keypass sw360SecretKey -keystore jwt-keaystore.jks -storepass sw360SecretKey
diff --git a/rest/authorization-server/tools/printKeyPair.bat b/rest/authorization-server/tools/printKeyPair.bat
index cf06554799..ad5a60f0f4 100644
--- a/rest/authorization-server/tools/printKeyPair.bat
+++ b/rest/authorization-server/tools/printKeyPair.bat
@@ -1,10 +1,11 @@
 REM
 REM Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 REM
-REM All rights reserved. This configuration file is provided to you under the
-REM terms and conditions of the Eclipse Distribution License v1.0 which
-REM accompanies this distribution, and is available at
-REM http://www.eclipse.org/org/documents/edl-v10.php
+REM This program and the accompanying materials are made
+REM available under the terms of the Eclipse Public License 2.0
+REM which is available at https://www.eclipse.org/legal/epl-2.0/
+REM
+REM SPDX-License-Identifier: EPL-2.0
 REM
 
 keytool -list -rfc --keystore jwt.jks | openssl x509 -inform pem -pubkey
diff --git a/rest/pom.xml b/rest/pom.xml
index e1f3e9273b..2abca280ae 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/rest/resource-server/pom.xml b/rest/resource-server/pom.xml
index de1e14fe58..dc4a781876 100644
--- a/rest/resource-server/pom.xml
+++ b/rest/resource-server/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017-2019. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/rest/resource-server/src/docs/asciidoc/api-guide.adoc b/rest/resource-server/src/docs/asciidoc/api-guide.adoc
index e7eb7d6aec..05f5b1dd87 100644
--- a/rest/resource-server/src/docs/asciidoc/api-guide.adoc
+++ b/rest/resource-server/src/docs/asciidoc/api-guide.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 = sw360 REST API Guide
diff --git a/rest/resource-server/src/docs/asciidoc/attachments.adoc b/rest/resource-server/src/docs/asciidoc/attachments.adoc
index 99028c3c86..07d9521159 100644
--- a/rest/resource-server/src/docs/asciidoc/attachments.adoc
+++ b/rest/resource-server/src/docs/asciidoc/attachments.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-attachments]]
diff --git a/rest/resource-server/src/docs/asciidoc/components.adoc b/rest/resource-server/src/docs/asciidoc/components.adoc
index 742e54428f..e1cc8e584a 100644
--- a/rest/resource-server/src/docs/asciidoc/components.adoc
+++ b/rest/resource-server/src/docs/asciidoc/components.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-components]]
diff --git a/rest/resource-server/src/docs/asciidoc/index.adoc b/rest/resource-server/src/docs/asciidoc/index.adoc
index 9b8fd7f66f..25bdbe775f 100644
--- a/rest/resource-server/src/docs/asciidoc/index.adoc
+++ b/rest/resource-server/src/docs/asciidoc/index.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 = SW360 REST API
diff --git a/rest/resource-server/src/docs/asciidoc/licenses.adoc b/rest/resource-server/src/docs/asciidoc/licenses.adoc
index 33e6006ff9..7a67c007bc 100644
--- a/rest/resource-server/src/docs/asciidoc/licenses.adoc
+++ b/rest/resource-server/src/docs/asciidoc/licenses.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-licenses]]
diff --git a/rest/resource-server/src/docs/asciidoc/projects.adoc b/rest/resource-server/src/docs/asciidoc/projects.adoc
index 3b1337e44d..2b98429af5 100644
--- a/rest/resource-server/src/docs/asciidoc/projects.adoc
+++ b/rest/resource-server/src/docs/asciidoc/projects.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-projects]]
diff --git a/rest/resource-server/src/docs/asciidoc/releases.adoc b/rest/resource-server/src/docs/asciidoc/releases.adoc
index 0661e8bad0..59d584ebe9 100644
--- a/rest/resource-server/src/docs/asciidoc/releases.adoc
+++ b/rest/resource-server/src/docs/asciidoc/releases.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-releases]]
diff --git a/rest/resource-server/src/docs/asciidoc/users.adoc b/rest/resource-server/src/docs/asciidoc/users.adoc
index e8cce0a528..1d1cc7334e 100644
--- a/rest/resource-server/src/docs/asciidoc/users.adoc
+++ b/rest/resource-server/src/docs/asciidoc/users.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-users]]
diff --git a/rest/resource-server/src/docs/asciidoc/vendors.adoc b/rest/resource-server/src/docs/asciidoc/vendors.adoc
index 7e25f1f183..af7796ac69 100644
--- a/rest/resource-server/src/docs/asciidoc/vendors.adoc
+++ b/rest/resource-server/src/docs/asciidoc/vendors.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-vendors]]
diff --git a/rest/resource-server/src/docs/asciidoc/vulnerabilities.adoc b/rest/resource-server/src/docs/asciidoc/vulnerabilities.adoc
index 65c5a572a7..8b76e4c5e1 100644
--- a/rest/resource-server/src/docs/asciidoc/vulnerabilities.adoc
+++ b/rest/resource-server/src/docs/asciidoc/vulnerabilities.adoc
@@ -1,10 +1,11 @@
 //
 // Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
 //
-// All rights reserved. This configuration file is provided to you under the
-// terms and conditions of the Eclipse Distribution License v1.0 which
-// accompanies this distribution, and is available at
-// http://www.eclipse.org/org/documents/edl-v10.php
+// 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/
+//
+// SPDX-License-Identifier: EPL-2.0
 //
 
 [[resources-vulnerabilities]]
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/Sw360ResourceServer.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/Sw360ResourceServer.java
index eaf9a0882f..b5ed6e27e1 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/Sw360ResourceServer.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/Sw360ResourceServer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentController.java
index de1a452dfc..6489e3ce1f 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentController.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.attachment;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentInfo.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentInfo.java
index 6107b401fd..4656a0b8dc 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentInfo.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentInfo.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.attachment;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentResourceProcessor.java
index 208b51a21f..31344008e0 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/AttachmentResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.attachment;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/Sw360AttachmentService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/Sw360AttachmentService.java
index f42be8b8aa..14de9f569b 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/Sw360AttachmentService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/attachment/Sw360AttachmentService.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.attachment;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
index 4a05be8e4e..f600a05fb9 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentController.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.component;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentResourceProcessor.java
index dd18f9e86f..359574b982 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/ComponentResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.component;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/Sw360ComponentService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/Sw360ComponentService.java
index 7390986b75..4433f691e7 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/Sw360ComponentService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/component/Sw360ComponentService.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.component;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/AwareOfRestServices.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/AwareOfRestServices.java
index 13dbb4071c..38519a6b0f 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/AwareOfRestServices.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/AwareOfRestServices.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.core;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java
index fef81006e2..e1b844a947 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/HalResource.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.core;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java
index 9d3add5e1f..e643c3af9c 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/JacksonCustomizations.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017-2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/MultiStatus.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/MultiStatus.java
index a24bcf03c9..5b20e09158 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/MultiStatus.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/MultiStatus.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/PropertyKeyMapping.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/PropertyKeyMapping.java
index 3e054e6604..575af1d1a4 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/PropertyKeyMapping.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/PropertyKeyMapping.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
index 07725594a5..48079ac9db 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestControllerHelper.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.core;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestExceptionHandler.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestExceptionHandler.java
index 296f95617f..8e81a7ff2c 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestExceptionHandler.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/RestExceptionHandler.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonInstantSerializer.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonInstantSerializer.java
index 14b401b4e2..bbfbf32482 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonInstantSerializer.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonInstantSerializer.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core.serializer;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonProjectRelationSerializer.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonProjectRelationSerializer.java
index bc5f03eb33..719b793eac 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonProjectRelationSerializer.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonProjectRelationSerializer.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core.serializer;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonReleaseRelationSerializer.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonReleaseRelationSerializer.java
index 793bc315fb..f663b16266 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonReleaseRelationSerializer.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/core/serializer/JsonReleaseRelationSerializer.java
@@ -2,12 +2,11 @@
  * Copyright Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.core.serializer;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseController.java
index 85e6d40a0d..63c0009f25 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseController.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.license;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseResourceProcessor.java
index fd59d6d3bb..399a9f892b 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/LicenseResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.license;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/Sw360LicenseService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/Sw360LicenseService.java
index 4625aa3a9e..b8bf8f60c5 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/Sw360LicenseService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/license/Sw360LicenseService.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.license;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoController.java
index 0b08b3cc63..a07cda6221 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoController.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.licenseinfo;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoResourceProcessor.java
index a498a11ee3..b2758b560a 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/LicenseInfoResourceProcessor.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.licenseinfo;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/Sw360LicenseInfoService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/Sw360LicenseInfoService.java
index b1f7650c4a..a4ff7ad24e 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/Sw360LicenseInfoService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/licenseinfo/Sw360LicenseInfoService.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.licenseinfo;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/EmbeddedProject.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/EmbeddedProject.java
index bf05b0d4cf..402c4006dd 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/EmbeddedProject.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/EmbeddedProject.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.project;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
index 7c8e68689d..1d88958216 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectController.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.project;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectResourceProcessor.java
index b81ad255c1..d89b013cad 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/ProjectResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.project;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java
index 7919130073..92a11cf923 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/project/Sw360ProjectService.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.project;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseController.java
index ac29d6560f..d45b53b769 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseController.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.release;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseResourceProcessor.java
index 487f1e9430..f7a1f15a17 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/ReleaseResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.release;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/Sw360ReleaseService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/Sw360ReleaseService.java
index 1b7754b4b8..0247ffb903 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/Sw360ReleaseService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/release/Sw360ReleaseService.java
@@ -3,12 +3,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.release;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/ResourceServerConfiguration.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/ResourceServerConfiguration.java
index 58853bf256..2782b7fcd2 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/ResourceServerConfiguration.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/ResourceServerConfiguration.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.security;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationFilter.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationFilter.java
index ece13aea23..538eeb8d3c 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationFilter.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationFilter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.security.apiToken;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationProvider.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationProvider.java
index d89a65909f..08be0e258f 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationProvider.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/apiToken/ApiTokenAuthenticationProvider.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.security.apiToken;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/keycloak/KeycloakAccessTokenConverter.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/keycloak/KeycloakAccessTokenConverter.java
index 71d244aefb..27cbc18476 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/keycloak/KeycloakAccessTokenConverter.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/security/keycloak/KeycloakAccessTokenConverter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Bosch Software Innovations GmbH, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.security.keycloak;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/Sw360UserService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/Sw360UserService.java
index 33acc2206d..7f3d6cfbb3 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/Sw360UserService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/Sw360UserService.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.user;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
index ff0d6d5624..5eb7b8b4d4 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserController.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.user;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserResourceProcessor.java
index a7464ebea1..5d00b6a98b 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/user/UserResourceProcessor.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.user;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/Sw360VendorService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/Sw360VendorService.java
index 1e83cad1cf..f4d29f9bfc 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/Sw360VendorService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/Sw360VendorService.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Vendor.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.vendor;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorController.java
index a1f87ec2d9..f237f04d8f 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorController.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Vendor.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.vendor;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorResourceProcessor.java
index 4c6f181f28..85ceb8650e 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vendor/VendorResourceProcessor.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Vendor.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.vendor;
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/Sw360VulnerabilityService.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/Sw360VulnerabilityService.java
index c4183e4443..55c09e6f78 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/Sw360VulnerabilityService.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/Sw360VulnerabilityService.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.vulnerability;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityController.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityController.java
index 2e70bddb35..104a49631e 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityController.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityController.java
@@ -3,12 +3,11 @@
  * With modifications by Siemens AG, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.vulnerability;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityDTOResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityDTOResourceProcessor.java
index 93621db94e..5f01c2df07 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityDTOResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityDTOResourceProcessor.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.vulnerability;
 
diff --git a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityResourceProcessor.java b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityResourceProcessor.java
index 540b816785..fe48002549 100644
--- a/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityResourceProcessor.java
+++ b/rest/resource-server/src/main/java/org/eclipse/sw360/rest/resourceserver/vulnerability/VulnerabilityResourceProcessor.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2017.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.vulnerability;
 
diff --git a/rest/resource-server/src/main/resources/application.yml b/rest/resource-server/src/main/resources/application.yml
index aa307be8d0..1e3d0c4955 100644
--- a/rest/resource-server/src/main/resources/application.yml
+++ b/rest/resource-server/src/main/resources/application.yml
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 server:
diff --git a/rest/resource-server/src/main/resources/banner.txt b/rest/resource-server/src/main/resources/banner.txt
index 53b7ee47de..4f1513ad87 100644
--- a/rest/resource-server/src/main/resources/banner.txt
+++ b/rest/resource-server/src/main/resources/banner.txt
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 ${AnsiColor.BRIGHT_BLUE}                ${AnsiColor.BRIGHT_GREEN}________   _______________
diff --git a/rest/resource-server/src/main/webapp/WEB-INF/web.xml b/rest/resource-server/src/main/webapp/WEB-INF/web.xml
index ac7a482188..d1bb067f61 100644
--- a/rest/resource-server/src/main/webapp/WEB-INF/web.xml
+++ b/rest/resource-server/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/TestHelper.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/TestHelper.java
index 5a314a53b5..f8880608ce 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/TestHelper.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/TestHelper.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  * Copyright Bosch Software Innovations GmbH, 2018.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationFilter.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationFilter.java
index 30ea9ae196..62749b8eb9 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationFilter.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationFilter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.configuration.security;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationProvider.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationProvider.java
index 69750acf3f..22c9371b8c 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationProvider.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthenticationProvider.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.configuration.security;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthorizationServerConfiguration.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthorizationServerConfiguration.java
index 3927c02aaa..d84160fa2e 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthorizationServerConfiguration.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360AuthorizationServerConfiguration.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.configuration.security;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360WebSecurityConfiguration.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360WebSecurityConfiguration.java
index 1fdbfe265d..ec4bbec801 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360WebSecurityConfiguration.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/configuration/security/Sw360WebSecurityConfiguration.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.configuration.security;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ComponentTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ComponentTest.java
index 23ef2fdd06..1ea0156c38 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ComponentTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ComponentTest.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  * Copyright Bosch Software Innovations GmbH, 2018.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.integration;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ProjectTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ProjectTest.java
index b1f9180968..607a6a2d21 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ProjectTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ProjectTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.integration;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ReleaseTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ReleaseTest.java
index 5ae86cba3b..6df7cf89fb 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ReleaseTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/ReleaseTest.java
@@ -2,12 +2,11 @@
  * Copyright Bosch Software Innovations GmbH, 2018.
  * Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.integration;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/TestIntegrationBase.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/TestIntegrationBase.java
index 0fbfc88ab9..5590d9025b 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/TestIntegrationBase.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/TestIntegrationBase.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.integration;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/UserTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/UserTest.java
index 675775202c..e6c1aed009 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/UserTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/integration/UserTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.integration;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ApiSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ApiSpecTest.java
index 2fefd5d54e..66d4b2c4a6 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ApiSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ApiSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.restdocs;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/AttachmentSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/AttachmentSpecTest.java
index fc1d71e2e8..cbf309fd5f 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/AttachmentSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/AttachmentSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ComponentSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ComponentSpecTest.java
index 71b12ee780..4cca49f8b7 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ComponentSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ComponentSpecTest.java
@@ -2,10 +2,11 @@
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  * Copyright Bosch Software Innovations GmbH, 2018.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.restdocs;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/LicenseSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/LicenseSpecTest.java
index 5ef145e867..91266c2769 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/LicenseSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/LicenseSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java
index a75758737d..fe9081b32c 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ProjectSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ReleaseSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ReleaseSpecTest.java
index 9fabe7e827..287c9b3836 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ReleaseSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/ReleaseSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/TestRestDocsSpecBase.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/TestRestDocsSpecBase.java
index 3d7cb47aa2..1087fe6da9 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/TestRestDocsSpecBase.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/TestRestDocsSpecBase.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017,2019. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.restdocs;
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
index a65669a41b..d1555887b3 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/UserSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VendorSpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VendorSpecTest.java
index a46f9fa481..577d3662b7 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VendorSpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VendorSpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2017-2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.resourceserver.restdocs;
 
diff --git a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VulnerabilitySpecTest.java b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VulnerabilitySpecTest.java
index a9963aaaa0..3f15674db4 100644
--- a/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VulnerabilitySpecTest.java
+++ b/rest/resource-server/src/test/java/org/eclipse/sw360/rest/resourceserver/restdocs/VulnerabilitySpecTest.java
@@ -1,10 +1,11 @@
 /*
  * Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
  *
- * 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
+  * 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/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.resourceserver.restdocs;
diff --git a/rest/resource-server/src/test/resources/application.properties b/rest/resource-server/src/test/resources/application.properties
index c8b25a9142..b35d7c3575 100644
--- a/rest/resource-server/src/test/resources/application.properties
+++ b/rest/resource-server/src/test/resources/application.properties
@@ -1,10 +1,11 @@
 #
 # Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 
 spring.profiles.active=SECURITY_MOCK
diff --git a/rest/rest-common/pom.xml b/rest/rest-common/pom.xml
index 1cb2ad8177..efc6f6a0ce 100644
--- a/rest/rest-common/pom.xml
+++ b/rest/rest-common/pom.xml
@@ -2,12 +2,11 @@
 <!--
   ~ Copyright Bosch Software Innovations GmbH, 2018.
   ~
-  ~ SPDX-License-Identifier: EPL-1.0
+  ~ 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/
   ~
-  ~ 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
+  ~ SPDX-License-Identifier: EPL-2.0
   -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0"
diff --git a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/PropertyUtils.java b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/PropertyUtils.java
index 053e39eb7d..b8f3a5aedd 100644
--- a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/PropertyUtils.java
+++ b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/PropertyUtils.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 package org.eclipse.sw360.rest.common;
 
diff --git a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/Sw360CORSFilter.java b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/Sw360CORSFilter.java
index 85b4c6fa91..014a7d0fa0 100644
--- a/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/Sw360CORSFilter.java
+++ b/rest/rest-common/src/main/java/org/eclipse/sw360/rest/common/Sw360CORSFilter.java
@@ -1,12 +1,11 @@
 /*
  * Copyright Bosch Software Innovations GmbH, 2018.
  *
- * SPDX-License-Identifier: EPL-1.0
+ * 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/
  *
- * 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
+ * SPDX-License-Identifier: EPL-2.0
  */
 
 package org.eclipse.sw360.rest.common;
diff --git a/scripts/addUnsafeDefaultClient.sh b/scripts/addUnsafeDefaultClient.sh
index 84a7c4f3fd..0f49a1ec27 100755
--- a/scripts/addUnsafeDefaultClient.sh
+++ b/scripts/addUnsafeDefaultClient.sh
@@ -2,12 +2,11 @@
 # Copyright (c) Bosch Software Innovations GmbH 2019.
 # Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 
 # Usage:
 # addUnsafeDefaultClient.sh [-d]
diff --git a/scripts/catalinaOpts.sh b/scripts/catalinaOpts.sh
index 1c5ae7983b..31f41ceb75 100755
--- a/scripts/catalinaOpts.sh
+++ b/scripts/catalinaOpts.sh
@@ -4,12 +4,11 @@
 #
 # Copyright Siemens AG, 2014-2015. Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 #
 # script for setting debugging options while deploying SW360
 #
diff --git a/scripts/compileWithDocker.sh b/scripts/compileWithDocker.sh
index a82fc640c5..04b7b82a2e 100755
--- a/scripts/compileWithDocker.sh
+++ b/scripts/compileWithDocker.sh
@@ -2,12 +2,11 @@
 # Copyright (c) Bosch Software Innovations GmbH 2019.
 # Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 tempdir=$(mktemp -d)
diff --git a/scripts/install-thrift.sh b/scripts/install-thrift.sh
index c22218a565..d8bf47d8bc 100755
--- a/scripts/install-thrift.sh
+++ b/scripts/install-thrift.sh
@@ -4,10 +4,11 @@
 # Copyright (c) Bosch Software Innovations GmbH 2019.
 # Part of the SW360 Portal Project.
 #
-# All rights reserved. This configuration file is provided to you under the
-# terms and conditions of the Eclipse Distribution License v1.0 which
-# accompanies this distribution, and is available at
-# http://www.eclipse.org/org/documents/edl-v10.php
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # script automatically generating keys for password-free login onto
 # the vagrantbox
diff --git a/scripts/migrations/001_migrate_license_shortname_to_id.py b/scripts/migrations/001_migrate_license_shortname_to_id.py
index d2e8a86b9c..7b61e7f66a 100755
--- a/scripts/migrations/001_migrate_license_shortname_to_id.py
+++ b/scripts/migrations/001_migrate_license_shortname_to_id.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/002_remove_project_comoderators.py b/scripts/migrations/002_remove_project_comoderators.py
index edf0b8df6d..9a439321f1 100755
--- a/scripts/migrations/002_remove_project_comoderators.py
+++ b/scripts/migrations/002_remove_project_comoderators.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/003_rename_release_contacts_to_contributors.py b/scripts/migrations/003_rename_release_contacts_to_contributors.py
index 20768d0b93..64933a51e6 100755
--- a/scripts/migrations/003_rename_release_contacts_to_contributors.py
+++ b/scripts/migrations/003_rename_release_contacts_to_contributors.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/004_move_release_ecc_fields_to_release_information.py b/scripts/migrations/004_move_release_ecc_fields_to_release_information.py
index 052c03eec6..a940d06fec 100755
--- a/scripts/migrations/004_move_release_ecc_fields_to_release_information.py
+++ b/scripts/migrations/004_move_release_ecc_fields_to_release_information.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2016. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/005_convert_compatibility_fields_to_ternary.py b/scripts/migrations/005_convert_compatibility_fields_to_ternary.py
index 501b9a82a0..12234ebef6 100755
--- a/scripts/migrations/005_convert_compatibility_fields_to_ternary.py
+++ b/scripts/migrations/005_convert_compatibility_fields_to_ternary.py
@@ -3,10 +3,11 @@
 # Copyright (c) Bosch Software Innovations GmbH 2017.
 # Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/006_convert_project_release_relationship_to_enums.py b/scripts/migrations/006_convert_project_release_relationship_to_enums.py
index d04b14eda0..be6dc20522 100755
--- a/scripts/migrations/006_convert_project_release_relationship_to_enums.py
+++ b/scripts/migrations/006_convert_project_release_relationship_to_enums.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/007_add_submitters_usergroup_to_moderation_request.py b/scripts/migrations/007_add_submitters_usergroup_to_moderation_request.py
index 38bb6a3727..2ad323ec6f 100755
--- a/scripts/migrations/007_add_submitters_usergroup_to_moderation_request.py
+++ b/scripts/migrations/007_add_submitters_usergroup_to_moderation_request.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/008_add_component_type_to_moderation_requests.py b/scripts/migrations/008_add_component_type_to_moderation_requests.py
index ba76d16adf..50a1328d28 100755
--- a/scripts/migrations/008_add_component_type_to_moderation_requests.py
+++ b/scripts/migrations/008_add_component_type_to_moderation_requests.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/009_overwrite_release_name_with_component_name.py b/scripts/migrations/009_overwrite_release_name_with_component_name.py
index 4906bd5f95..cb36e1f7e0 100755
--- a/scripts/migrations/009_overwrite_release_name_with_component_name.py
+++ b/scripts/migrations/009_overwrite_release_name_with_component_name.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/010_repair_missing_vendorId_links_in_releases.py b/scripts/migrations/010_repair_missing_vendorId_links_in_releases.py
index 05d011bcef..01f05adce9 100755
--- a/scripts/migrations/010_repair_missing_vendorId_links_in_releases.py
+++ b/scripts/migrations/010_repair_missing_vendorId_links_in_releases.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2018. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/011_migrate_attachment_usages_license_info.py b/scripts/migrations/011_migrate_attachment_usages_license_info.py
index 9062ff5b7b..0c17bea02f 100755
--- a/scripts/migrations/011_migrate_attachment_usages_license_info.py
+++ b/scripts/migrations/011_migrate_attachment_usages_license_info.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/012_migrate_todoid_to_title.py b/scripts/migrations/012_migrate_todoid_to_title.py
index a51d90e2f6..9f463da1f2 100755
--- a/scripts/migrations/012_migrate_todoid_to_title.py
+++ b/scripts/migrations/012_migrate_todoid_to_title.py
@@ -3,10 +3,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/013_migrate_releases_external_tool_requests.py b/scripts/migrations/013_migrate_releases_external_tool_requests.py
index fb1c3ac3cb..cdf2648b92 100755
--- a/scripts/migrations/013_migrate_releases_external_tool_requests.py
+++ b/scripts/migrations/013_migrate_releases_external_tool_requests.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/014_migrate_fossology_rest.py b/scripts/migrations/014_migrate_fossology_rest.py
index 6e3c80571e..e1b58928ae 100755
--- a/scripts/migrations/014_migrate_fossology_rest.py
+++ b/scripts/migrations/014_migrate_fossology_rest.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/scripts/migrations/dockerized-migration-runner.Dockerfile b/scripts/migrations/dockerized-migration-runner.Dockerfile
index 9878cbb683..89d17ed3f8 100644
--- a/scripts/migrations/dockerized-migration-runner.Dockerfile
+++ b/scripts/migrations/dockerized-migration-runner.Dockerfile
@@ -1,12 +1,11 @@
 # Copyright Bosch Software Innovations GmbH, 2017.
 # Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 
 FROM debian:jessie
 MAINTAINER admin@sw360.org
diff --git a/scripts/migrations/dockerized-migration-runner.sh b/scripts/migrations/dockerized-migration-runner.sh
index 40bb8945e4..efb1ea709a 100755
--- a/scripts/migrations/dockerized-migration-runner.sh
+++ b/scripts/migrations/dockerized-migration-runner.sh
@@ -3,12 +3,11 @@
 # Copyright Bosch Software Innovations GmbH, 2017.
 # Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 
 # call as:
 # $ ./dockerized-migration-runner.sh [--build|--save|--load] [migrationScript [migrationScript [...]]]
diff --git a/scripts/migrations/repair_missing_sha1_hashes.py b/scripts/migrations/repair_missing_sha1_hashes.py
index f7e92b5275..ad0b7740d8 100755
--- a/scripts/migrations/repair_missing_sha1_hashes.py
+++ b/scripts/migrations/repair_missing_sha1_hashes.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2017. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This script finds all objects that have attachments, but do not have the SHA1
 # digest saved in the attachment metadata, and calculates and savesthis missing
diff --git a/scripts/utilities/001_update_project_field_value.py b/scripts/utilities/001_update_project_field_value.py
index 9d849f4e01..7a6113b993 100755
--- a/scripts/utilities/001_update_project_field_value.py
+++ b/scripts/utilities/001_update_project_field_value.py
@@ -2,10 +2,11 @@
 # -----------------------------------------------------------------------------
 # Copyright Siemens AG, 2019. Part of the SW360 Portal Project.
 #
-# 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
+# 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/
+#
+# SPDX-License-Identifier: EPL-2.0
 #
 # This is a manual database migration script. It is assumed that a
 # dedicated framework for automatic migration will be written in the
diff --git a/sw360dev.Dockerfile b/sw360dev.Dockerfile
index 14df963002..d70b107d2a 100644
--- a/sw360dev.Dockerfile
+++ b/sw360dev.Dockerfile
@@ -1,12 +1,11 @@
 # Copyright (c) Bosch Software Innovations GmbH 2016.
 # Part of the SW360 Portal Project.
 #
-# SPDX-License-Identifier: EPL-1.0
+# 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/
 #
-# 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
+# SPDX-License-Identifier: EPL-2.0
 
 # This can be used to compile SW360 via:
 # $ docker build -f sw360dev.Dockerfile -t sw360/sw360dev --rm=true --force-rm=true .