From cb66461fe7290a302162b3482a37f50807318ce0 Mon Sep 17 00:00:00 2001
From: Cameron Rodriguez <dev@camrod.me>
Date: Thu, 10 Aug 2023 18:41:58 -0400
Subject: [PATCH] [WFCORE-5279] Add dependency on wildfly-elytron-ssl-base

See wildfly-security/wildfly-elytron#1729 and ELY-2084 (https://issues.redhat.com/browse/ELY-2084)
---
 core-feature-pack/common/pom.xml              |  4 ++
 .../security/elytron-base/main/module.xml     |  7 +++
 elytron-common/pom.xml                        |  2 +-
 elytron/pom.xml                               | 50 +++++++++++++++++++
 pom.xml                                       |  5 ++
 .../CustomCredentialSecurityFactoryImpl.java  |  2 +-
 6 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/core-feature-pack/common/pom.xml b/core-feature-pack/common/pom.xml
index 33811d2fee4..626a75790ee 100644
--- a/core-feature-pack/common/pom.xml
+++ b/core-feature-pack/common/pom.xml
@@ -512,6 +512,10 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-ssl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-ssl-base</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-ssh-util</artifactId>
diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml
index 86f9d2f0ebd..73c2468ba5b 100644
--- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml
+++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/security/elytron-base/main/module.xml
@@ -37,6 +37,11 @@
     </exports>
 
     <resources>
+        <!--
+            When the dependencies on `wildfly-elytron-auth-server` are removed from `wildfly-elytron-ssl-base`,
+            resources that aren't associated with security domains should be moved to a new module. For more information,
+            see WFCORE-5279: https://github.com/wildfly/wildfly-proposals/pull/500
+        -->
         <artifact name="${org.wildfly.security:wildfly-elytron-asn1}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-audit}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-auth}"/>
@@ -94,6 +99,8 @@
         <artifact name="${org.wildfly.security:wildfly-elytron-security-manager}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-security-manager-action}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-ssl}"/>
+        <!-- To be moved after dependencies on security domains are fully removed-->
+        <artifact name="${org.wildfly.security:wildfly-elytron-ssl-base}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-ssh-util}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-util}"/>
         <artifact name="${org.wildfly.security:wildfly-elytron-x500}"/>
diff --git a/elytron-common/pom.xml b/elytron-common/pom.xml
index 2ac4382224d..addde32494e 100644
--- a/elytron-common/pom.xml
+++ b/elytron-common/pom.xml
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-ssl</artifactId>
+            <artifactId>wildfly-elytron-ssl-base</artifactId>
         </dependency>
 
         <dependency>
diff --git a/elytron/pom.xml b/elytron/pom.xml
index d856d234b16..f03cc1fbf36 100644
--- a/elytron/pom.xml
+++ b/elytron/pom.xml
@@ -66,6 +66,41 @@
             <artifactId>jakarta.authorization-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-audit</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-auth-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-auth-server-deprecated</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-auth-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-http-util</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-realm-ldap</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-realm-jdbc</artifactId>
@@ -76,6 +111,21 @@
             <artifactId>wildfly-elytron-realm-token</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-sasl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-ssl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-x500-principal</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.security.jakarta</groupId>
             <artifactId>jakarta-authentication</artifactId>
diff --git a/pom.xml b/pom.xml
index 054353e5450..598f14aad2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2033,6 +2033,11 @@
                 <artifactId>wildfly-elytron-ssl</artifactId>
                 <version>${version.org.wildfly.security.elytron}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.security</groupId>
+                <artifactId>wildfly-elytron-ssl-base</artifactId>
+                <version>${version.org.wildfly.security.elytron}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.security</groupId>
                 <artifactId>wildfly-elytron-util</artifactId>
diff --git a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/elytron/CustomCredentialSecurityFactoryImpl.java b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/elytron/CustomCredentialSecurityFactoryImpl.java
index 9ff40c2a9b8..bb772d9e543 100644
--- a/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/elytron/CustomCredentialSecurityFactoryImpl.java
+++ b/testsuite/manualmode/src/test/java/org/jboss/as/test/manualmode/elytron/CustomCredentialSecurityFactoryImpl.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import org.wildfly.extension.elytron.Configurable;
-import org.wildfly.extension.elytron.capabilities.CredentialSecurityFactory;
+import org.wildfly.extension.elytron.common.capabilities.CredentialSecurityFactory;
 import org.wildfly.security.credential.Credential;
 import org.wildfly.security.credential.PasswordCredential;
 import org.wildfly.security.password.PasswordFactory;