Merge pull request #2107 from darranl/ELY-2319

[ELY-2319] Delete the deprecated GSSCredentialSecurityFactory implementation.
wildfly-security · Mar 14, 2024 · f860fb2 · f860fb2
2 parents 1c16651 + 4f5e6d4
commit f860fb2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 593 deletions.
diff --git a/auth/client/pom.xml b/auth/client/pom.xml
@@ -60,6 +60,10 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-mechanism</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.security</groupId>
+            <artifactId>wildfly-elytron-mechanism-gssapi</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-password-impl</artifactId>

diff --git a/auth/util/pom.xml b/auth/util/pom.xml
@@ -40,10 +40,6 @@
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-auth</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-base</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron-credential</artifactId>
@@ -54,13 +50,10 @@
         </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-mechanism-gssapi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.wildfly.security</groupId>
-            <artifactId>wildfly-elytron-security-manager-action</artifactId>
+            <artifactId>wildfly-elytron-x500</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
@@ -90,10 +83,5 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/auth/util/src/main/java/org/wildfly/security/auth/util/ElytronMessages.java b/auth/util/src/main/java/org/wildfly/security/auth/util/ElytronMessages.java
@@ -19,9 +19,6 @@
 package org.wildfly.security.auth.util;
 
 import java.io.IOException;
-import java.security.GeneralSecurityException;
-
-import javax.security.auth.login.LoginException;
 
 import org.jboss.logging.BasicLogger;
 import org.jboss.logging.Logger;
@@ -51,32 +48,32 @@ interface ElytronMessages extends BasicLogger {
 
     ElytronMessages log = Logger.getMessageLogger(ElytronMessages.class, "org.wildfly.security");
 
-    @Message(id = 3, value = "This builder has already been built")
-    IllegalStateException builderAlreadyBuilt();
+    //@Message(id = 3, value = "This builder has already been built")
+    //IllegalStateException builderAlreadyBuilt();
 
     @Message(id = 1065, value = "Pattern requires a capture group")
     IllegalArgumentException patternRequiresCaptureGroup();
 
-    @Message(id = 1121, value = "Unable to perform initial JAAS login.")
-    GeneralSecurityException unableToPerformInitialLogin(@Cause LoginException cause);
+    //@Message(id = 1121, value = "Unable to perform initial JAAS login.")
+    //GeneralSecurityException unableToPerformInitialLogin(@Cause LoginException cause);
 
-    @Message(id = 1122, value = "No Kerberos principals found.")
-    GeneralSecurityException noKerberosPrincipalsFound();
+    //@Message(id = 1122, value = "No Kerberos principals found.")
+    //GeneralSecurityException noKerberosPrincipalsFound();
 
-    @Message(id = 1123, value = "Too many Kerberos principals found.")
-    GeneralSecurityException tooManyKerberosPrincipalsFound();
+    //@Message(id = 1123, value = "Too many Kerberos principals found.")
+    //GeneralSecurityException tooManyKerberosPrincipalsFound();
 
-    @Message(id = 1160, value = "KeyTab [%s] does not exists.")
-    IOException keyTabDoesNotExists(String keyTab);
+    //@Message(id = 1160, value = "KeyTab [%s] does not exists.")
+    //IOException keyTabDoesNotExists(String keyTab);
 
-    @Message(id = 1161, value = "No keys for Kerberos principal [%s] was found in KeyTab [%s].")
-    IOException noKeysForPrincipalInKeyTab(String principal, String keyTab);
+    //@Message(id = 1161, value = "No keys for Kerberos principal [%s] was found in KeyTab [%s].")
+    //IOException noKeysForPrincipalInKeyTab(String principal, String keyTab);
 
-    @Message(id = 1165, value = "Initial JAAS login skipped as it has failed in last %d seconds")
-    GeneralSecurityException initialLoginSkipped(long seconds);
+    //@Message(id = 1165, value = "Initial JAAS login skipped as it has failed in last %d seconds")
+    //GeneralSecurityException initialLoginSkipped(long seconds);
 
-    @Message(id = 3031, value = "Too many KerberosTicket instances in private credentials")
-    GeneralSecurityException tooManyKerberosTicketsFound();
+    //@Message(id = 3031, value = "Too many KerberosTicket instances in private credentials")
+    //GeneralSecurityException tooManyKerberosTicketsFound();
 
     @Message(id = 17000, value = "Failed to create credential")
     IOException xmlFailedToCreateCredential(@Cause Throwable cause);