From 9d55ebb95ed0a917bbc09dae4a904fde7cff3aba Mon Sep 17 00:00:00 2001
From: Valera V Harseko <vharseko@3a-systems.ru>
Date: Fri, 26 Jun 2026 09:53:38 +0300
Subject: [PATCH 1/2] Fix duplicate opendj-server-legacy classes in
 distribution lib/

The dependencySet exclude in opendj-archive-component.xml used the pre-fork
groupId org.forgerock.opendj, so it no longer matched the module's own
artifact (org.openidentityplatform.opendj). As a result lib/ shipped both
opendj.jar and an identical org.openidentityplatform.opendj.opendj-server-legacy.jar.
Correct the groupId so the duplicate is excluded; opendj.jar remains the
canonical jar referenced by the bootstrap manifests.
---
 .../src/main/assembly/opendj-archive-component.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index 5ae64db7d2..7b9e573c2e 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -26,7 +26,7 @@
       <outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
       <excludes>
         <exclude>javax.activation:activation</exclude>
-        <exclude>org.forgerock.opendj:opendj-server-legacy</exclude>
+        <exclude>org.openidentityplatform.opendj:opendj-server-legacy</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

From 5289e0cf1d7bd92210a6e07f1c3de2c3dcab74f1 Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Fri, 26 Jun 2026 09:55:10 +0300
Subject: [PATCH 2/2] Update copyright year in opendj-archive-component.xml

---
 .../src/main/assembly/opendj-archive-component.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index 7b9e573c2e..490d841f66 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -13,7 +13,7 @@
   information: "Portions Copyright [year] [name of copyright owner]".
 
   Copyright 2015-2016 ForgeRock AS.
-  Portions Copyright 2018-2024 3A Systems, LLC
+  Portions Copyright 2018-2026 3A Systems, LLC
 -->
 <!-- OpenDJ final archive content descriptor -->
 <component>