diff --git a/LICENSE.txt b/LICENSE.txt
index d462c7b12..d3087e4c5 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,88 +1,277 @@
+Eclipse Public License - v 2.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.
+    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.
+  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, 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.
+  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
 
-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
+3.1 If a Contributor Distributes the Program in any form, then:
 
-b) its license agreement:
+  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
 
-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;
+  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 Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+     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) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; 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.
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
 
-When the Program is made available in source code form:
+3.2 When the Program is Distributed as Source Code:
 
-a) it must be made available under this Agreement; and
+  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.
+  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.
+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.
+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.
+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, 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.
+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.
-
-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.
+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.
diff --git a/README.md b/README.md
index 47160648a..5bbe8cafa 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/biz.netcentric.cq.tools.accesscontroltool/accesscontroltool/badge.svg)](https://maven-badges.herokuapp.com/maven-central/biz.netcentric.cq.tools.accesscontroltool/accesscontroltool)
-[![License](https://img.shields.io/badge/License-EPL%201.0-red.svg)](https://opensource.org/licenses/EPL-1.0)
+[![License](https://img.shields.io/badge/License-EPL%202.0-red.svg)](https://opensource.org/licenses/EPL-2.0)
 [![Build Status](https://github.com/netcentric/accesscontroltool/actions/workflows/maven.yml/badge.svg?branch=develop)](https://github.com/Netcentric/accesscontroltool/actions/workflows/maven.yml)
 [![SonarCloud Status](https://sonarcloud.io/api/project_badges/measure?project=Netcentric_accesscontroltool&metric=alert_status)](https://sonarcloud.io/dashboard?id=Netcentric_accesscontroltool)
 [![SonarCloud Coverage](https://sonarcloud.io/api/project_badges/measure?project=Netcentric_accesscontroltool&metric=coverage)](https://sonarcloud.io/project/activity?id=Netcentric_accesscontroltool&graph=coverage)
@@ -74,4 +74,4 @@ If needed you can [build the AC Tool yourself](docs/BuildPackage.md).
 
 # License
 
-The AC Tool is licensed under the [Eclipse Public License - v 1.0](LICENSE.txt).
+The AC Tool is licensed under the [Eclipse Public License - v 2.0](LICENSE.txt).
diff --git a/accesscontroltool-apps-package/pom.xml b/accesscontroltool-apps-package/pom.xml
index e9ceff37b..d86923234 100644
--- a/accesscontroltool-apps-package/pom.xml
+++ b/accesscontroltool-apps-package/pom.xml
@@ -3,9 +3,9 @@
     (C) Copyright 2019 Netcentric AG.
 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 -->
 <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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml
index f17c697fb..ba0782039 100644
--- a/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-apps-package/src/main/META-INF/vault/filter.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/.content.xml
index 4decfe490..e67469b43 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/.content.xml
index 4decfe490..e67469b43 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/.content.xml
index 4decfe490..e67469b43 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/.content.xml
index 4decfe490..e67469b43 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/.content.xml
index 3f902c0c9..e550bb974 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/.content.xml
index b927c352c..ec4d88876 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/_rep_policy.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/_rep_policy.xml
index 0d448ca75..0f7b17d10 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/_rep_policy.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/cq/core/content/nav/tools/security/actool/_rep_policy.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/clientlibs/overview/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/clientlibs/overview/.content.xml
index 60699041c..344f8d3b0 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/clientlibs/overview/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/clientlibs/overview/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/.content.xml
index 8aefd45ed..88042a62c 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/.content.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/.content.xml
index 5f52d1c13..196515bc7 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/.content.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/_rep_policy.xml b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/_rep_policy.xml
index 6595ffbd4..3b562f185 100644
--- a/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/_rep_policy.xml
+++ b/accesscontroltool-apps-package/src/main/jcr_root/apps/netcentric/actool/content/overview/_rep_policy.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-bundle/pom.xml b/accesscontroltool-bundle/pom.xml
index 7d654723b..1b4f764a8 100644
--- a/accesscontroltool-bundle/pom.xml
+++ b/accesscontroltool-bundle/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) Copyright 2015 Netcentric AG. All rights reserved. This program
     and the accompanying materials are made available under the terms of the
-    Eclipse Public License v1.0 which accompanies this distribution, and is available
-    at http://www.eclipse.org/legal/epl-v10.html -->
+    Eclipse Public License v2.0 which accompanies this distribution, and is available
+    at https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
 <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 ">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstaller.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstaller.java
index 023e75044..6d0102f92 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstaller.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstaller.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerClassic.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerClassic.java
index e52f5b954..0a89f40b8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerClassic.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerClassic.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncremental.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncremental.java
index 8ace16749..7a689f7fd 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncremental.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncremental.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java
index d39d629d8..99e66fece 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aceinstaller/BaseAceBeanInstaller.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AcToolCqActions.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AcToolCqActions.java
index 4dc1c6996..2be583cc5 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AcToolCqActions.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AcToolCqActions.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AemCryptoDecryptionService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AemCryptoDecryptionService.java
index e0a2730eb..648ea42ea 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AemCryptoDecryptionService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/aem/AemCryptoDecryptionService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/AcInstallationService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/AcInstallationService.java
index 50327a6bd..4bb793e0c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/AcInstallationService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/AcInstallationService.java
@@ -9,10 +9,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/HistoryEntry.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/HistoryEntry.java
index 52b6b4eb7..d89b559b1 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/HistoryEntry.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/HistoryEntry.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLog.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLog.java
index 361bc7303..69b1747ab 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLog.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLog.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLogLevel.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLogLevel.java
index b631271fd..7270fe639 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLogLevel.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationLogLevel.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptions.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptions.java
index 1a6acd00a..83373d310 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptions.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptions.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilder.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilder.java
index defb7106d..6c1ccc173 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilder.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilder.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationResult.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationResult.java
index d2415f55f..896c66e78 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationResult.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/InstallationResult.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/package-info.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/package-info.java
index baf368567..73ed870d1 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/package-info.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/api/package-info.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableCreatorException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableCreatorException.java
index f36116206..23e1f9d2b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableCreatorException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableCreatorException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableInstallerService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableInstallerService.java
index 57ffeaa8f..ce6623720 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableInstallerService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/AuthorizableInstallerService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManager.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManager.java
index 954c5d60f..ce0b98690 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManager.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManager.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImpl.java
index 28a5ee760..f2fa5cc47 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java
index b33b33eac..b9700d9d7 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImpl.java
index 2bac8ecc3..476ab0d4c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImpl.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImpl.java
index 828bfc639..a63a955b9 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImpl.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePathComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePathComparator.java
index f6995b18b..d0aee368c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePathComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePathComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparator.java
index 5d4479e9f..a85fff9d3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AuthorizableBeanIDComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AuthorizableBeanIDComparator.java
index 30c319ef3..6155bdfc8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AuthorizableBeanIDComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/AuthorizableBeanIDComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/HistoryEntryComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/HistoryEntryComparator.java
index 851525c38..34a063ac2 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/HistoryEntryComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/HistoryEntryComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/JcrCreatedComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/JcrCreatedComparator.java
index 46fd51d0e..181f69001 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/JcrCreatedComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/JcrCreatedComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/NodeCreatedComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/NodeCreatedComparator.java
index 337a18244..2edd89c09 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/NodeCreatedComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/NodeCreatedComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/TimestampPropertyComparator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/TimestampPropertyComparator.java
index f690a9ce0..9065fa37f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/TimestampPropertyComparator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/comparators/TimestampPropertyComparator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcConfiguration.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcConfiguration.java
index 7f11fa4b0..5028240f3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcConfiguration.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcConfiguration.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AceBean.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AceBean.java
index 00c195e25..dd7bb62df 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AceBean.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AceBean.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcesConfig.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcesConfig.java
index 40c60f28f..784aa3192 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcesConfig.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AcesConfig.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizableConfigBean.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizableConfigBean.java
index 8a6d03fe6..5b722e9a6 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizableConfigBean.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizableConfigBean.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfig.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfig.java
index 86d4c7dce..a5aaf23a3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfig.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfig.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfig.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfig.java
index dbf339eca..5fa2585b7 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfig.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfig.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/GlobalConfiguration.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/GlobalConfiguration.java
index 9015d2be0..ca2213b35 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/GlobalConfiguration.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/GlobalConfiguration.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/Restriction.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/Restriction.java
index 61af2691b..c2246c678 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/Restriction.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/Restriction.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/BouncycastlePkcs8EncryptedPrivateKeyDecryptor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/BouncycastlePkcs8EncryptedPrivateKeyDecryptor.java
index 2dadb9058..81d80905c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/BouncycastlePkcs8EncryptedPrivateKeyDecryptor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/BouncycastlePkcs8EncryptedPrivateKeyDecryptor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerData.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerData.java
index 5cba0fd59..04ad1961f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerData.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerData.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerType.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerType.java
index 7378d08a8..e4d668689 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerType.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerType.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/JcaPkcs8EncryptedPrivateKeyDecryptor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/JcaPkcs8EncryptedPrivateKeyDecryptor.java
index 4e197cb50..27da1db03 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/JcaPkcs8EncryptedPrivateKeyDecryptor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/JcaPkcs8EncryptedPrivateKeyDecryptor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/Key.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/Key.java
index 4abc016be..4eabff7a7 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/Key.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/Key.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/PrivateKeyDecryptor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/PrivateKeyDecryptor.java
index f24b6e323..26fbeebea 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/PrivateKeyDecryptor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/PrivateKeyDecryptor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/RandomPassword.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/RandomPassword.java
index a559cab0a..c682c2af3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/RandomPassword.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/RandomPassword.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetriever.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetriever.java
index c3a597dd5..98ead3da9 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetriever.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetriever.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImpl.java
index d6e37c6b5..1cfcdee75 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigReader.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigReader.java
index 8ef391ed0..b387ff061 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigReader.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigReader.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigurationMerger.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigurationMerger.java
index 90bd4479e..b107a4430 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigurationMerger.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/ConfigurationMerger.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreator.java
index b6fc8220f..9f90ec41b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessor.java
index 69bc629d0..f52a3d766 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessor.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReader.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReader.java
index c900a1a7c..7c1b87e48 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReader.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReader.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationAdminPluginScalarConstructor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationAdminPluginScalarConstructor.java
index 5704e8afc..26de23767 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationAdminPluginScalarConstructor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationAdminPluginScalarConstructor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMerger.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMerger.java
index 4935c6632..6539d3dfe 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMerger.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMerger.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProvider.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProvider.java
index 656c025c5..7da8cbdfd 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProvider.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProvider.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProviderImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProviderImpl.java
index bd73fe397..993c48781 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProviderImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroChildNodeObjectsProviderImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluator.java
index c1cbf2ee6..ffcc6dec2 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessor.java
index 2d040fff4..c038124bf 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorImpl.java
index c6658b821..00c32d5bc 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/UploadListenerService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/UploadListenerService.java
index 0fb5cb8a3..8769977af 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/UploadListenerService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/UploadListenerService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/impl/UploadListenerServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/impl/UploadListenerServiceImpl.java
index ca0a18928..49cef3a6e 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/impl/UploadListenerServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/configuploadlistener/impl/UploadListenerServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/DecryptionService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/DecryptionService.java
index 522838420..12040d9de 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/DecryptionService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/DecryptionService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/SimpleDecryptionService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/SimpleDecryptionService.java
index e8c918efa..7277ae8cd 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/SimpleDecryptionService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/crypto/SimpleDecryptionService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElement.java
index 674216faf..a4d8faf85 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementVisitor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementVisitor.java
index 080141839..593a4c4df 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementVisitor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementVisitor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementYamlVisitor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementYamlVisitor.java
index af7da3512..b81598780 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementYamlVisitor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AcDumpElementYamlVisitor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AceDumpData.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AceDumpData.java
index 1899c02b0..93265c97f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AceDumpData.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/AceDumpData.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CommentingDumpElement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CommentingDumpElement.java
index a4876a6cb..2c5962249 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CommentingDumpElement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CommentingDumpElement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CompleteAcDump.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CompleteAcDump.java
index b4f446b32..c450360cf 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CompleteAcDump.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/CompleteAcDump.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/ConfigDumpService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/ConfigDumpService.java
index b318046ab..71e367ec8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/ConfigDumpService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/ConfigDumpService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpComment.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpComment.java
index 5de4fd32c..cfda64576 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpComment.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpComment.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpSectionElement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpSectionElement.java
index 00e93ad8d..9a1adebfe 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpSectionElement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/DumpSectionElement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/MapKey.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/MapKey.java
index bda4a90a7..11d9b0f45 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/MapKey.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/MapKey.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/StructuralDumpElement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/StructuralDumpElement.java
index 1a16f3781..947225f1c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/StructuralDumpElement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/StructuralDumpElement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/impl/DumpServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/impl/DumpServiceImpl.java
index 033f7ecdd..0e4ae346b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/impl/DumpServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/dumpservice/impl/DumpServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/externalusermanagement/ExternalGroupManagement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/externalusermanagement/ExternalGroupManagement.java
index 2526b4e9f..7ae85705e 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/externalusermanagement/ExternalGroupManagement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/externalusermanagement/ExternalGroupManagement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/healthcheck/LastRunSuccessHealthCheck.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/healthcheck/LastRunSuccessHealthCheck.java
index 5b999799c..db453add3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/healthcheck/LastRunSuccessHealthCheck.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/healthcheck/LastRunSuccessHealthCheck.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AcHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AcHelper.java
index 46fe524da..b63c61e74 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AcHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AcHelper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AccessControlUtils.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AccessControlUtils.java
index f47a0831d..3f8526049 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AccessControlUtils.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AccessControlUtils.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AceWrapper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AceWrapper.java
index 25a744d23..925dafa90 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AceWrapper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AceWrapper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AclBean.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AclBean.java
index c8df52d96..e0b043177 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AclBean.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/AclBean.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/Constants.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/Constants.java
index 63276da51..6237c15cc 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/Constants.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/Constants.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/ContentHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/ContentHelper.java
index 710ed431a..7229e4b73 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/ContentHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/ContentHelper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/PurgeHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/PurgeHelper.java
index 93a225932..91fc8e4b9 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/PurgeHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/PurgeHelper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
index 8d3f65263..5426bd8af 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/RestrictionsHolder.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/RestrictionsHolder.java
index 0fa8f7f32..38c0b0050 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/RestrictionsHolder.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/RestrictionsHolder.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/UncheckedRepositoryException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/UncheckedRepositoryException.java
index 7137346a2..c196a6765 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/UncheckedRepositoryException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/UncheckedRepositoryException.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2024 Cognizant Netcentric.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.helper;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java
index aec9ef859..76d2d6c64 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/runtime/RuntimeHelper.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcHistoryService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcHistoryService.java
index c9ef20bed..caf91ff51 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcHistoryService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcHistoryService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcToolExecution.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcToolExecution.java
index d0425c1f5..3d416bbd6 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcToolExecution.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/AcToolExecution.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationListener.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationListener.java
index fb6293259..536562c18 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationListener.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationListener.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationLogger.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationLogger.java
index 6a04f073b..7e79b6bba 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationLogger.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/InstallationLogger.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcHistoryServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcHistoryServiceImpl.java
index 127743085..b9a8df00b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcHistoryServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcHistoryServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcToolExecutionImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcToolExecutionImpl.java
index 0b9cf3df3..94601801d 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcToolExecutionImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/AcToolExecutionImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java
index f49a812e1..f4cb47971 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtils.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HtmlConstants.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HtmlConstants.java
index 89e115164..dc8ad4b32 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HtmlConstants.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/HtmlConstants.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/PersistableInstallationLogger.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/PersistableInstallationLogger.java
index 116ba5963..12158719f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/PersistableInstallationLogger.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/PersistableInstallationLogger.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/ProgressTrackerListenerInstallationLogger.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/ProgressTrackerListenerInstallationLogger.java
index e24d0173b..47aed573a 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/ProgressTrackerListenerInstallationLogger.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/history/impl/ProgressTrackerListenerInstallationLogger.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java
index cd627bd6b..8163da6ff 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcConfigChangeTracker.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java
index d2e7fc500..546b32f29 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceInternal.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceInternal.java
index 5e92b8ead..797b0fc66 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceInternal.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceInternal.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/Activator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/Activator.java
index ff717572f..c1d1bd754 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/Activator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/Activator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/JcrInstallUrlHandler.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/JcrInstallUrlHandler.java
index 8295e23cc..1f6618738 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/JcrInstallUrlHandler.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/JcrInstallUrlHandler.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagement.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagement.java
index a7f5a88cb..cf00d5770 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagement.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagement.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/ActionCommand.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/ActionCommand.java
index b02f293cd..478076a0e 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/ActionCommand.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/ActionCommand.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembers.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembers.java
index e8a340b9a..fb08ead58 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembers.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembers.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembership.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembership.java
index 54dca1afb..c28c7186e 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembership.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/AddGroupMembership.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/CreateGroupStep.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/CreateGroupStep.java
index 9a3532d2a..a8af51393 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/CreateGroupStep.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/CreateGroupStep.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/RemoveGroupMembership.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/RemoveGroupMembership.java
index 6c81392c2..a02d0f3c4 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/RemoveGroupMembership.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/RemoveGroupMembership.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/Step.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/Step.java
index 52bd7d492..d9099ccb6 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/Step.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/Step.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserActionCommand.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserActionCommand.java
index 01045e658..e76823d0f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserActionCommand.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserActionCommand.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserGroupActionCommand.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserGroupActionCommand.java
index 437deb69f..5442a0e1f 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserGroupActionCommand.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/request/UserGroupActionCommand.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/AccessToken.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/AccessToken.java
index 017b0a037..3a398d515 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/AccessToken.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/AccessToken.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandError.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandError.java
index 1aec7432c..0bc21c128 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandError.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandError.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandIssue.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandIssue.java
index bdc7f4981..ffcec8bff 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandIssue.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandIssue.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandResponse.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandResponse.java
index bffa474f9..5d439f6ac 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandResponse.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandResponse.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandWarning.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandWarning.java
index 8782252af..f46a72e1b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandWarning.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/ActionCommandWarning.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/GroupResponse.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/GroupResponse.java
index 86a70cb9a..33092cec3 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/GroupResponse.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/GroupResponse.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSGroup.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSGroup.java
index b0f7fa537..8e6e809ff 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSGroup.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSGroup.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSUser.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSUser.java
index 665060299..0e0de50b8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSUser.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/IMSUser.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/UsersInGroupResponse.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/UsersInGroupResponse.java
index e1450afaf..cddcf09ad 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/UsersInGroupResponse.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ims/response/UsersInGroupResponse.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java
index 288e5f78a..cfae5d678 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHook.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHookService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHookService.java
index 5f8febf44..18184ddcf 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHookService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/AcToolInstallHookService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/OsgiAwareInstallHook.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/OsgiAwareInstallHook.java
index d0d6ec552..e970129f6 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/OsgiAwareInstallHook.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/OsgiAwareInstallHook.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java
index 878c9d6de..3968afd80 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/impl/AcToolInstallHookServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/package-info.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/package-info.java
index 3c88494b0..6cb8b9f49 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/package-info.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/installhook/package-info.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBean.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBean.java
index 8a2628c32..c7a6d591b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBean.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBean.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBeanImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBeanImpl.java
index 12e501e1b..d5348ed4c 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBeanImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/jmx/AceServiceMBeanImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsService.java
index fc1f8c835..ea3a23d38 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsService.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2020 Netcentric, A Cognizant Digital Business.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.slingsettings;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java
index 448e1a573..e232440e9 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImpl.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2020 Netcentric, A Cognizant Digital Business.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.slingsettings;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolTouchUiServlet.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolTouchUiServlet.java
index 07dc2126b..6191a585b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolTouchUiServlet.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolTouchUiServlet.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2019 Netcentric, A Cognizant Digital Business.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.ui;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolUiService.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolUiService.java
index 6d29ec085..0e210a499 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolUiService.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolUiService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolWebconsolePlugin.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolWebconsolePlugin.java
index 105c7c1d0..e38522625 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolWebconsolePlugin.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolWebconsolePlugin.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2019 Netcentric, A Cognizant Digital Business.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.ui;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/HtmlWriter.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/HtmlWriter.java
index 164880291..7df617ef9 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/HtmlWriter.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/HtmlWriter.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/PrincipalUtil.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/PrincipalUtil.java
index 2bcb4c25d..630bad111 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/PrincipalUtil.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/PrincipalUtil.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/UserProcessor.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/UserProcessor.java
index 218659312..379928ec1 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/UserProcessor.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/UserProcessor.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/impl/UserProcessorImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/impl/UserProcessorImpl.java
index 2b40bddc9..75dd75078 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/impl/UserProcessorImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/user/impl/UserProcessorImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AceBeanValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AceBeanValidator.java
index 391f4c8aa..decd57fb7 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AceBeanValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AceBeanValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AuthorizableValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AuthorizableValidator.java
index 4076f1221..996aabf8a 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AuthorizableValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/AuthorizableValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ConfigurationsValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ConfigurationsValidator.java
index 8db5a55fe..11ab1a052 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ConfigurationsValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ConfigurationsValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidator.java
index 5c512530f..fd3a4a710 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidator.java
index 6e3a06f64..706607766 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ObsoleteAuthorizablesValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ObsoleteAuthorizablesValidator.java
index 13ad9410d..5db5742aa 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ObsoleteAuthorizablesValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/ObsoleteAuthorizablesValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipChecker.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipChecker.java
index 4d97c0ea8..dad2afc98 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipChecker.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipChecker.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/Validators.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/Validators.java
index c23642930..f6b4aa987 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/Validators.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/Validators.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/YamlConfigurationsValidator.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/YamlConfigurationsValidator.java
index 59d6c6247..0cd498e51 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/YamlConfigurationsValidator.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/YamlConfigurationsValidator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/AcConfigBeanValidationException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/AcConfigBeanValidationException.java
index bd023b4b6..2161009b5 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/AcConfigBeanValidationException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/AcConfigBeanValidationException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedActionException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedActionException.java
index 133a27c45..32b5c1eff 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedActionException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedActionException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedJcrPrivilegeException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedJcrPrivilegeException.java
index 37ac3e8b1..370a1ae1b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedJcrPrivilegeException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/DoubledDefinedJcrPrivilegeException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidActionException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidActionException.java
index 0c670688e..d94af4e17 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidActionException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidActionException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidAuthorizableException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidAuthorizableException.java
index ca13a765d..628a6ea3b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidAuthorizableException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidAuthorizableException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidExternalGroupUsageValidationException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidExternalGroupUsageValidationException.java
index 82ade384c..8fefa224e 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidExternalGroupUsageValidationException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidExternalGroupUsageValidationException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidGroupNameException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidGroupNameException.java
index 17d5cefdb..235e430b8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidGroupNameException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidGroupNameException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidIntermediatePathException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidIntermediatePathException.java
index e3d9e716e..13c3a2d1a 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidIntermediatePathException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidIntermediatePathException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidJcrPrivilegeException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidJcrPrivilegeException.java
index 3289497a3..ced3251b2 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidJcrPrivilegeException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidJcrPrivilegeException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPathException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPathException.java
index 19aa0ca7f..f5bda692a 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPathException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPathException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPermissionException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPermissionException.java
index 6750f4d2d..d73221cea 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPermissionException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidPermissionException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRepGlobException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRepGlobException.java
index 91aa24207..6a2751c50 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRepGlobException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRepGlobException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRestrictionsException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRestrictionsException.java
index 0a8487625..f8aad424d 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRestrictionsException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidRestrictionsException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidYamlException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidYamlException.java
index 8f0d75ee5..1feb3d668 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidYamlException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/InvalidYamlException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoActionOrPrivilegeDefinedException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoActionOrPrivilegeDefinedException.java
index 3a94bcb74..835179aad 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoActionOrPrivilegeDefinedException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoActionOrPrivilegeDefinedException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoGroupDefinedException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoGroupDefinedException.java
index 940815a3d..59d9c4e04 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoGroupDefinedException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoGroupDefinedException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoListOnTopLevelException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoListOnTopLevelException.java
index 266401636..ed718a5e8 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoListOnTopLevelException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/NoListOnTopLevelException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/TooManyActionsException.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/TooManyActionsException.java
index 014703a0a..8ef76514b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/TooManyActionsException.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/exceptions/TooManyActionsException.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AceBeanValidatorImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AceBeanValidatorImpl.java
index ab2922531..afa5e57dd 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AceBeanValidatorImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AceBeanValidatorImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AuthorizableValidatorImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AuthorizableValidatorImpl.java
index 70f8566f8..ade45f08b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AuthorizableValidatorImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/AuthorizableValidatorImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/ObsoleteAuthorizablesValidatorImpl.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/ObsoleteAuthorizablesValidatorImpl.java
index e7fe6a2c8..4b153b1b6 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/ObsoleteAuthorizablesValidatorImpl.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/validators/impl/ObsoleteAuthorizablesValidatorImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/main/resources/res/actooluiservice.js b/accesscontroltool-bundle/src/main/resources/res/actooluiservice.js
index 3bb017c7e..cfb80aa3d 100644
--- a/accesscontroltool-bundle/src/main/resources/res/actooluiservice.js
+++ b/accesscontroltool-bundle/src/main/resources/res/actooluiservice.js
@@ -4,10 +4,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 const EVENT_NAME_INSTALLATION_DONE = 'acinstallationdone';
@@ -127,4 +128,4 @@ function openDialogJQueryUI() {
         });
     }
     $(dialog).dialog("open");
-}
\ No newline at end of file
+}
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncrementalTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncrementalTest.java
index 637a924f9..b2da5e7cc 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncrementalTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/aceinstaller/AceBeanInstallerIncrementalTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilderTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilderTest.java
index d595b91ae..546dfda18 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilderTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/api/InstallationOptionsBuilderTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImplTest.java
index 68dc3349b..2fb508a23 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthInstallerUserManagerPrefetchingImplTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java
index 87e7835ac..fd7e2180e 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/AuthorizableInstallerServiceImplTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImplTest.java
index 281b7ff34..0df63ac67 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ExternalGroupInstallerServiceImplTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2025 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImplTest.java
index b6100f740..b3abf42c4 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/authorizableinstaller/impl/ImpersonationInstallerServiceImplTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparatorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparatorTest.java
index 68e7f5974..90d66b1af 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparatorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/comparators/AcePermissionComparatorTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfigTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfigTest.java
index 5e983d0d8..2d038e7a0 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfigTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AuthorizablesConfigTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfigTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfigTest.java
index 7f7d071b6..bb9a760d5 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfigTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/AutoCreateTestUsersConfigTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/TestDecryptionService.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/TestDecryptionService.java
index e9b663f6a..830e15d87 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/TestDecryptionService.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/TestDecryptionService.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerDataTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerDataTest.java
index 4bf301a4b..591183a75 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerDataTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/DerDataTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/KeyTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/KeyTest.java
index 9fd71f134..9f4188583 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/KeyTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configmodel/pkcs/KeyTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java
index 7afa86508..79b0cb6ea 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/ConfigFilesRetrieverImplTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAceBean.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAceBean.java
index bfd2ca3ac..ec84c6064 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAceBean.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAceBean.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAuthorizableConfigBean.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAuthorizableConfigBean.java
index 94e70dd35..fa06f8b0d 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAuthorizableConfigBean.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestAuthorizableConfigBean.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreatorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreatorTest.java
index 441399368..0b6d80949 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreatorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestUserConfigsCreatorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestYamlConfigReader.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestYamlConfigReader.java
index 9d39d7551..26b3f812a 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestYamlConfigReader.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/TestYamlConfigReader.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessorTest.java
index 9bdfb6c58..644170e1d 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/VirtualGroupProcessorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReaderTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReaderTest.java
index 9802c85e4..5112bdc43 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReaderTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigReaderTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMergerTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMergerTest.java
index 58548eace..9f32299ed 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMergerTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlConfigurationMergerTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluatorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluatorTest.java
index e317b6062..002aa4a16 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluatorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroElEvaluatorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorTest.java
index 27ade1e2d..c4889ba46 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/configreader/YamlMacroProcessorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/extensions/OakRepository.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/extensions/OakRepository.java
index 7c5c2ae5c..2e7e89489 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/extensions/OakRepository.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/extensions/OakRepository.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2023 Cognizant Netcentric.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.extensions;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AcHelperTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AcHelperTest.java
index e151be581..e3c72b74f 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AcHelperTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AcHelperTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AceWrapperTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AceWrapperTest.java
index 7fe983f2b..b1f726b80 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AceWrapperTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/AceWrapperTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperIT.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperIT.java
index 597ec52ad..9039ed259 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperIT.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperIT.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2023 Cognizant Netcentric.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.helper;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperTest.java
index 728f1f13f..044b77042 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ContentHelperTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperIT.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperIT.java
index 5d10e3c13..ec063f7c4 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperIT.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperIT.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2023 Cognizant Netcentric.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.helper;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperTest.java
index 6f73df8b4..f2265a92a 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/QueryHelperTest.java
@@ -2,9 +2,9 @@
  * (C) Copyright 2023 Cognizant Netcentric.
  *
  * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
  */
 package biz.netcentric.cq.tools.actool.helper;
 
@@ -14,10 +14,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ValidatorsTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ValidatorsTest.java
index 451c114d0..be34cc70a 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ValidatorsTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/helper/ValidatorsTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtilsTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtilsTest.java
index 584ac0214..de995dcca 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtilsTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/history/impl/HistoryUtilsTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImplTest.java
index c813f72ba..baf2aa2a4 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImplTest.java
@@ -8,10 +8,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AceServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AceServiceImplTest.java
index 12629b0be..afc848d57 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AceServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/impl/AceServiceImplTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementIT.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementIT.java
index ab6266880..3fe9f48e3 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementIT.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementIT.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementTest.java
index b1796b344..ceef6f7c0 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/ims/IMSUserManagementTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImplTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImplTest.java
index 887bcb339..95d62ab17 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImplTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/slingsettings/ExtendedSlingSettingsServiceImplTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/BeanValidatorsTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/BeanValidatorsTest.java
index 09fc07052..de8063325 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/BeanValidatorsTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/BeanValidatorsTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidatorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidatorTest.java
index 0c1776953..e2110e43e 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidatorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ExternalGroupsInIsMemberOfValidatorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidatorTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidatorTest.java
index d6f216b38..d79692bfb 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidatorTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/GlobalConfigurationValidatorTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/RestrictionValidationTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/RestrictionValidationTest.java
index 2f0d9fb13..3c9918364 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/RestrictionValidationTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/RestrictionValidationTest.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipCheckerTest.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipCheckerTest.java
index a5ef479d0..3dbd5712e 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipCheckerTest.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/UnmangedExternalMemberRelationshipCheckerTest.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ValidatorTestHelper.java b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ValidatorTestHelper.java
index 9db5de2d5..12492822f 100644
--- a/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ValidatorTestHelper.java
+++ b/accesscontroltool-bundle/src/test/java/biz/netcentric/cq/tools/actool/validators/ValidatorTestHelper.java
@@ -7,10 +7,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-correctly-on-role-only.yaml b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-correctly-on-role-only.yaml
index 32f77ae2f..d7de7ac04 100644
--- a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-correctly-on-role-only.yaml
+++ b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-correctly-on-role-only.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2024 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-invalid.yaml b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-invalid.yaml
index d2892ce9d..93e9a6817 100644
--- a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-invalid.yaml
+++ b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-invalid.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2024 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-overruled-by-config-to-be-allowed.yaml b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-overruled-by-config-to-be-allowed.yaml
index 7775cccab..3e58312e1 100644
--- a/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-overruled-by-config-to-be-allowed.yaml
+++ b/accesscontroltool-bundle/src/test/resources/externalIds/test-externalId-set-on-fragment-overruled-by-config-to-be-allowed.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2024 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf1.yaml b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf1.yaml
index dc24b38fd..67d0f300d 100644
--- a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf1.yaml
+++ b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf1.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf2.yaml b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf2.yaml
index 914e97e3e..82416dcb7 100644
--- a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf2.yaml
+++ b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-isMemberOf2.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members1.yaml b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members1.yaml
index ad39227f2..eddad9cde 100644
--- a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members1.yaml
+++ b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members1.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members2.yaml b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members2.yaml
index 12d9ef36e..749bbe7c7 100644
--- a/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members2.yaml
+++ b/accesscontroltool-bundle/src/test/resources/invalid-unmanaged/test-invalid-unmanged-members2.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-array-containsAllItems-function.yaml b/accesscontroltool-bundle/src/test/resources/test-array-containsAllItems-function.yaml
index d353bf3a9..8047cd3f1 100644
--- a/accesscontroltool-bundle/src/test/resources/test-array-containsAllItems-function.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-array-containsAllItems-function.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-array-containsAnyItem-function.yaml b/accesscontroltool-bundle/src/test/resources/test-array-containsAnyItem-function.yaml
index 8867606c3..8e8b987f9 100644
--- a/accesscontroltool-bundle/src/test/resources/test-array-containsAnyItem-function.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-array-containsAnyItem-function.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-array-containsItem-function.yaml b/accesscontroltool-bundle/src/test/resources/test-array-containsItem-function.yaml
index e57efc9a0..dc1e77549 100644
--- a/accesscontroltool-bundle/src/test/resources/test-array-containsItem-function.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-array-containsItem-function.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-def-complex-nested-loops.yaml b/accesscontroltool-bundle/src/test/resources/test-def-complex-nested-loops.yaml
index 3144afb16..190ea8ab5 100644
--- a/accesscontroltool-bundle/src/test/resources/test-def-complex-nested-loops.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-def-complex-nested-loops.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - DEF basePath=/content/base
diff --git a/accesscontroltool-bundle/src/test/resources/test-def-complex-structure.yaml b/accesscontroltool-bundle/src/test/resources/test-def-complex-structure.yaml
index 9d6234529..45e0db8c9 100644
--- a/accesscontroltool-bundle/src/test/resources/test-def-complex-structure.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-def-complex-structure.yaml
@@ -3,9 +3,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - DEF simpleArray=:
diff --git a/accesscontroltool-bundle/src/test/resources/test-def-global-1-set.yaml b/accesscontroltool-bundle/src/test/resources/test-def-global-1-set.yaml
index 0d81c4180..4ac79265b 100644
--- a/accesscontroltool-bundle/src/test/resources/test-def-global-1-set.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-def-global-1-set.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - global_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-def-global-2-use.yaml b/accesscontroltool-bundle/src/test/resources/test-def-global-2-use.yaml
index 2fad42f89..de7a956cb 100644
--- a/accesscontroltool-bundle/src/test/resources/test-def-global-2-use.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-def-global-2-use.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - DEF globalVarToBeOverridden="localValOverridingGlobal"
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-def-with-underscore.yaml b/accesscontroltool-bundle/src/test/resources/test-def-with-underscore.yaml
index 7a89895b6..78ac389b9 100644
--- a/accesscontroltool-bundle/src/test/resources/test-def-with-underscore.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-def-with-underscore.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - DEF NAME_WITH_UNDERSCORE=[test1,test2,test3]
diff --git a/accesscontroltool-bundle/src/test/resources/test-empty-glob.yaml b/accesscontroltool-bundle/src/test/resources/test-empty-glob.yaml
index 484b33113..cd33ed72a 100644
--- a/accesscontroltool-bundle/src/test/resources/test-empty-glob.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-empty-glob.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-if.yaml b/accesscontroltool-bundle/src/test/resources/test-if.yaml
index d0f754212..70e09cbf6 100644
--- a/accesscontroltool-bundle/src/test/resources/test-if.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-if.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-children-of.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-children-of.yaml
index dadc0fc68..8e2ae5b4c 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-children-of.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-children-of.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-children-with-content-of.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-children-with-content-of.yaml
index 36a79ed3a..052cdde07 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-children-with-content-of.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-children-with-content-of.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-over-runmodes.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-over-runmodes.yaml
index 593e58ee8..be98da348 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-over-runmodes.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-over-runmodes.yaml
@@ -3,9 +3,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config: 
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-with-colon.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-with-colon.yaml
index 58ac79254..0c89d376e 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-with-colon.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-with-colon.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-with-hyphen.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-with-hyphen.yaml
index 60d23a791..ba54911de 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-with-hyphen.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-with-hyphen.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-with-special-characters.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-with-special-characters.yaml
index 19c2a9347..0c800bb47 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-with-special-characters.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-with-special-characters.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop-with-variable-evaluating-to-arr.yaml b/accesscontroltool-bundle/src/test/resources/test-loop-with-variable-evaluating-to-arr.yaml
index 0c501d52b..bf7a75feb 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop-with-variable-evaluating-to-arr.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop-with-variable-evaluating-to-arr.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2017 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-loop.yaml b/accesscontroltool-bundle/src/test/resources/test-loop.yaml
index 628b069ec..ae45494c5 100644
--- a/accesscontroltool-bundle/src/test/resources/test-loop.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-loop.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-membergroups.yaml b/accesscontroltool-bundle/src/test/resources/test-membergroups.yaml
index bdae335d9..363c15700 100644
--- a/accesscontroltool-bundle/src/test/resources/test-membergroups.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-membergroups.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-multiple-aces-same-path.yaml b/accesscontroltool-bundle/src/test/resources/test-multiple-aces-same-path.yaml
index 26953a461..472ce727b 100644
--- a/accesscontroltool-bundle/src/test/resources/test-multiple-aces-same-path.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-multiple-aces-same-path.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-nested-loops.yaml b/accesscontroltool-bundle/src/test/resources/test-nested-loops.yaml
index 93c0bd89c..3c1f8af10 100644
--- a/accesscontroltool-bundle/src/test/resources/test-nested-loops.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-nested-loops.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-no-aces.yaml b/accesscontroltool-bundle/src/test/resources/test-no-aces.yaml
index 47a782b17..7de69b668 100644
--- a/accesscontroltool-bundle/src/test/resources/test-no-aces.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-no-aces.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-no-actions.yaml b/accesscontroltool-bundle/src/test/resources/test-no-actions.yaml
index b644746d1..297fda44a 100644
--- a/accesscontroltool-bundle/src/test/resources/test-no-actions.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-no-actions.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-no-groups.yaml b/accesscontroltool-bundle/src/test/resources/test-no-groups.yaml
index 8881f5c67..0d75855bf 100644
--- a/accesscontroltool-bundle/src/test/resources/test-no-groups.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-no-groups.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
          
 - ace_config:
diff --git a/accesscontroltool-bundle/src/test/resources/test-null-actions.yaml b/accesscontroltool-bundle/src/test/resources/test-null-actions.yaml
index 93ee2a4e8..ab1e50b42 100644
--- a/accesscontroltool-bundle/src/test/resources/test-null-actions.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-null-actions.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-placeholders.yaml b/accesscontroltool-bundle/src/test/resources/test-placeholders.yaml
index 389c52845..9c0b69e5c 100644
--- a/accesscontroltool-bundle/src/test/resources/test-placeholders.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-placeholders.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2020 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - user_config:
   - editor:
diff --git a/accesscontroltool-bundle/src/test/resources/test-rep-usermanagement.yaml b/accesscontroltool-bundle/src/test/resources/test-rep-usermanagement.yaml
index 000489f15..90424cde3 100644
--- a/accesscontroltool-bundle/src/test/resources/test-rep-usermanagement.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-rep-usermanagement.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-templates.yaml b/accesscontroltool-bundle/src/test/resources/test-templates.yaml
index 19181390c..c9ee44607 100644
--- a/accesscontroltool-bundle/src/test/resources/test-templates.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-templates.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-variables-ldap.yaml b/accesscontroltool-bundle/src/test/resources/test-variables-ldap.yaml
index a3becf2c6..b95ee083b 100644
--- a/accesscontroltool-bundle/src/test/resources/test-variables-ldap.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-variables-ldap.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2017 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
     
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-variables.yaml b/accesscontroltool-bundle/src/test/resources/test-variables.yaml
index a42d3303d..1f5b9bc0e 100644
--- a/accesscontroltool-bundle/src/test/resources/test-variables.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-variables.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2017 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-inherit-from-multiple-vgroups.yaml b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-inherit-from-multiple-vgroups.yaml
index 79372074a..f79af8cd3 100644
--- a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-inherit-from-multiple-vgroups.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-inherit-from-multiple-vgroups.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-invalid-use-of-members.yaml b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-invalid-use-of-members.yaml
index 315dcca5e..0530ffd96 100644
--- a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-invalid-use-of-members.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-invalid-use-of-members.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-multiple-levels.yaml b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-multiple-levels.yaml
index 35f02c58b..e575e3862 100644
--- a/accesscontroltool-bundle/src/test/resources/test-virtualgroups-multiple-levels.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-virtualgroups-multiple-levels.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/test-virtualgroups.yaml b/accesscontroltool-bundle/src/test/resources/test-virtualgroups.yaml
index 794bba3e3..abc15a142 100644
--- a/accesscontroltool-bundle/src/test/resources/test-virtualgroups.yaml
+++ b/accesscontroltool-bundle/src/test/resources/test-virtualgroups.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2018 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions1.yaml b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions1.yaml
index 205b431ff..38bb8b3e1 100644
--- a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions1.yaml
+++ b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions1.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions2.yaml b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions2.yaml
index 7eddd9f03..4411c7ee4 100644
--- a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions2.yaml
+++ b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions2.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions3.yaml b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions3.yaml
index 5f29f4bbf..0abf003ef 100644
--- a/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions3.yaml
+++ b/accesscontroltool-bundle/src/test/resources/testRestrictionsConfigs/test-restrictions3.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 
 - group_config:
diff --git a/accesscontroltool-bundle/src/test/resources/testconfig.yaml b/accesscontroltool-bundle/src/test/resources/testconfig.yaml
index 6d7a977e9..4c8e628d8 100644
--- a/accesscontroltool-bundle/src/test/resources/testconfig.yaml
+++ b/accesscontroltool-bundle/src/test/resources/testconfig.yaml
@@ -2,9 +2,9 @@
 # (C) Copyright 2015 Netcentric AG.
 #
 # All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License v2.0
 # which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 #
 - group_config:
 
diff --git a/accesscontroltool-content-package/pom.xml b/accesscontroltool-content-package/pom.xml
index b6bf7b42b..2ac00ada4 100644
--- a/accesscontroltool-content-package/pom.xml
+++ b/accesscontroltool-content-package/pom.xml
@@ -3,9 +3,9 @@
     (C) Copyright 2019 Netcentric AG.
 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 -->
 <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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/accesscontroltool-content-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-content-package/src/main/META-INF/vault/filter.xml
index b65e9a702..7d41608dd 100644
--- a/accesscontroltool-content-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-content-package/src/main/META-INF/vault/filter.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-content-package/src/main/jcr_root/_rep_policy.xml b/accesscontroltool-content-package/src/main/jcr_root/_rep_policy.xml
index b9020aca0..3d2eca456 100644
--- a/accesscontroltool-content-package/src/main/jcr_root/_rep_policy.xml
+++ b/accesscontroltool-content-package/src/main/jcr_root/_rep_policy.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-content-package/src/main/jcr_root/_rep_repoPolicy.xml b/accesscontroltool-content-package/src/main/jcr_root/_rep_repoPolicy.xml
index b9020aca0..3d2eca456 100644
--- a/accesscontroltool-content-package/src/main/jcr_root/_rep_repoPolicy.xml
+++ b/accesscontroltool-content-package/src/main/jcr_root/_rep_repoPolicy.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/.content.xml b/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/.content.xml
index f2b4346d3..8d0964a55 100644
--- a/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/.content.xml
+++ b/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/actool-service/.content.xml b/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/actool-service/.content.xml
index 754727811..2f431f749 100644
--- a/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/actool-service/.content.xml
+++ b/accesscontroltool-content-package/src/main/jcr_root/home/users/system/actool/actool-service/.content.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-exampleconfig-package/pom.xml b/accesscontroltool-exampleconfig-package/pom.xml
index 2f8029740..149851cb4 100644
--- a/accesscontroltool-exampleconfig-package/pom.xml
+++ b/accesscontroltool-exampleconfig-package/pom.xml
@@ -3,9 +3,9 @@
     (C) Copyright 2016 Netcentric AG.
 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 -->
 <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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/config.xml b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/config.xml
index d4143cc62..1dfe80ea0 100644
--- a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/config.xml
+++ b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/config.xml
@@ -4,10 +4,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 <vaultfs version="1.1">
diff --git a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/filter.xml
index 4b5b9fde4..66f5ee839 100644
--- a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/filter.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/settings.xml b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/settings.xml
index f32f50fb0..75f91b5a2 100644
--- a/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/settings.xml
+++ b/accesscontroltool-exampleconfig-package/src/main/META-INF/vault/settings.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-oakindex-package/pom.xml b/accesscontroltool-oakindex-package/pom.xml
index e75a05bfc..c6f4f9300 100644
--- a/accesscontroltool-oakindex-package/pom.xml
+++ b/accesscontroltool-oakindex-package/pom.xml
@@ -3,9 +3,9 @@
     (C) Copyright 2015 Netcentric AG.
 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 -->
 <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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
index 604aefb25..19543b9ba 100644
--- a/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-1-custom-1.xml b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-1-custom-1.xml
index 19e5184a2..f8b2160e8 100644
--- a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-1-custom-1.xml
+++ b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-1-custom-1.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-package/pom.xml b/accesscontroltool-package/pom.xml
index 59a6669cf..c7dbeaf65 100644
--- a/accesscontroltool-package/pom.xml
+++ b/accesscontroltool-package/pom.xml
@@ -3,9 +3,9 @@
     (C) Copyright 2015 Netcentric AG.
 
     All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
+    are made available under the terms of the Eclipse Public License v2.0
     which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
+    https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
 -->
 <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">
     <modelVersion>4.0.0</modelVersion>
diff --git a/accesscontroltool-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-package/src/main/META-INF/vault/filter.xml
index 417afee0f..88f44cfc2 100644
--- a/accesscontroltool-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-package/src/main/META-INF/vault/filter.xml
@@ -5,10 +5,11 @@
   %%
   Copyright (C) 2015 - 2024 Cognizant Netcentric
   %%
-  All rights reserved. This program and the accompanying materials
-  are made available under the 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
   #L%
   -->
 
diff --git a/accesscontroltool-startuphook-bundle/pom.xml b/accesscontroltool-startuphook-bundle/pom.xml
index ddafa2e2e..e326984dc 100644
--- a/accesscontroltool-startuphook-bundle/pom.xml
+++ b/accesscontroltool-startuphook-bundle/pom.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) Copyright 2015 Netcentric AG. All rights reserved. This program
     and the accompanying materials are made available under the terms of the
-    Eclipse Public License v1.0 which accompanies this distribution, and is
-available
-    at http://www.eclipse.org/legal/epl-v10.html -->
-<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
-                        ">
+    Eclipse Public License v2.0 which accompanies this distribution, and is available
+    at https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
+<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 ">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
     <!-- P A R E N T P R O J E C T D E S C R I P T I O N -->
diff --git a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java
index 35a32dad5..7cc94dbc4 100644
--- a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java
+++ b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/AcToolStartupHookServiceImpl.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/StartupBundleActivator.java b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/StartupBundleActivator.java
index ce9e4090f..d9fa2fb0f 100644
--- a/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/StartupBundleActivator.java
+++ b/accesscontroltool-startuphook-bundle/src/main/java/biz/netcentric/cq/tools/actool/startuphook/impl/StartupBundleActivator.java
@@ -6,10 +6,11 @@
  * %%
  * Copyright (C) 2015 - 2024 Cognizant Netcentric
  * %%
- * All rights reserved. This program and the accompanying materials
- * are made available under the 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
  * #L%
  */
 
diff --git a/pom.xml b/pom.xml
index 7d1c6f31c..a0df54de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- (C) Copyright 2015 Netcentric AG. All rights reserved. This program
     and the accompanying materials are made available under the terms of the
-    Eclipse Public License v1.0 which accompanies this distribution, and is available
-    at http://www.eclipse.org/legal/epl-v10.html -->
+    Eclipse Public License v2.0 which accompanies this distribution, and is available
+    at https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
 <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">
     <modelVersion>4.0.0</modelVersion>
     <!-- ====================================================================== -->
@@ -44,8 +44,8 @@
     </ciManagement>
     <licenses>
         <license>
-            <name>Eclipse Public License, Version 1.0</name>
-            <url>https://www.eclipse.org/legal/epl-v10.html</url>
+            <name>Eclipse Public License, Version 2.0</name>
+            <url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -506,7 +506,7 @@
                     <artifactId>license-maven-plugin</artifactId>
                     <version>2.4.0</version>
                     <configuration>
-                        <licenseName>epl_only_v1</licenseName>
+                        <licenseName>epl_only_v2</licenseName>
                         <excludes>test/resources/**,it/**,**/*.cfg.json</excludes>
                     </configuration>
                 </plugin>