From 75d2ec8ff60130f1e19d4aee6ff88c3100a9704e Mon Sep 17 00:00:00 2001
From: Martin Kanis <mkanis@redhat.com>
Date: Thu, 8 Aug 2019 10:01:07 +0200
Subject: [PATCH] KEYCLOAK-11012 Unable to install EAP6 adapter

---
 adapters/oidc/as7-eap6/as7-subsystem/pom.xml      | 15 ++++++++++++++-
 .../subsystem/as7/logging/KeycloakLogger.java     |  6 +++---
 .../subsystem/as7/logging/KeycloakMessages.java   |  2 +-
 adapters/saml/as7-eap6/subsystem/pom.xml          | 15 ++++++++++++++-
 .../saml/as7/logging/KeycloakLogger.java          |  6 +++---
 .../saml/as7/logging/KeycloakMessages.java        |  2 +-
 prod-arguments.json                               |  4 +++-
 7 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
index c57255831c..a7d18ff036 100755
--- a/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
+++ b/adapters/oidc/as7-eap6/as7-subsystem/pom.xml
@@ -82,7 +82,20 @@
 
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
+            <artifactId>jboss-logging</artifactId>
+            <!-- Needed for jboss-logging-processor-->
+            <version>3.3.2.Final</version>
+       </dependency>
+
+        <!-- Do not ever delete this dependency. It's needed for eap6 adapter build in PNC.-->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-processor</artifactId>
+            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+projects that depend on this project.-->
+            <scope>provided</scope>
+            <optional>true</optional>
+            <version>1.0.0.Final</version>
         </dependency>
 
         <dependency>
diff --git a/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakLogger.java b/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakLogger.java
index e7971ed922..fb4bc0f3a3 100755
--- a/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakLogger.java
+++ b/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakLogger.java
@@ -17,10 +17,10 @@
 package org.keycloak.subsystem.as7.logging;
 
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.LogMessage;
 import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.jboss.logging.Message;
+import org.jboss.logging.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
diff --git a/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakMessages.java b/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakMessages.java
index 1861b26bf2..10c8e6f02a 100755
--- a/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakMessages.java
+++ b/adapters/oidc/as7-eap6/as7-subsystem/src/main/java/org/keycloak/subsystem/as7/logging/KeycloakMessages.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.subsystem.as7.logging;
 
-import org.jboss.logging.annotations.MessageBundle;
+import org.jboss.logging.MessageBundle;
 import org.jboss.logging.Messages;
 
 /**
diff --git a/adapters/saml/as7-eap6/subsystem/pom.xml b/adapters/saml/as7-eap6/subsystem/pom.xml
index fcde3e0203..fb12a094a9 100755
--- a/adapters/saml/as7-eap6/subsystem/pom.xml
+++ b/adapters/saml/as7-eap6/subsystem/pom.xml
@@ -87,7 +87,20 @@
 
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-annotations</artifactId>
+            <artifactId>jboss-logging</artifactId>
+            <!-- Needed for jboss-logging-processor-->
+            <version>3.3.2.Final</version>
+        </dependency>
+
+        <!-- Do not ever delete this dependency. It's needed for eap6 adapter build in PNC.-->
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-processor</artifactId>
+            <!-- This is a compile-time dependency of this project, but is not needed at compile or runtime by other
+projects that depend on this project.-->
+            <scope>provided</scope>
+            <optional>true</optional>
+            <version>1.0.0.Final</version>
         </dependency>
 
         <dependency>
diff --git a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakLogger.java b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakLogger.java
index 8197eec5bb..b7e235493e 100755
--- a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakLogger.java
+++ b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakLogger.java
@@ -17,10 +17,10 @@
 package org.keycloak.subsystem.saml.as7.logging;
 
 import org.jboss.logging.BasicLogger;
-import org.jboss.logging.annotations.LogMessage;
+import org.jboss.logging.LogMessage;
 import org.jboss.logging.Logger;
-import org.jboss.logging.annotations.Message;
-import org.jboss.logging.annotations.MessageLogger;
+import org.jboss.logging.Message;
+import org.jboss.logging.MessageLogger;
 
 import static org.jboss.logging.Logger.Level.DEBUG;
 import static org.jboss.logging.Logger.Level.INFO;
diff --git a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakMessages.java b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakMessages.java
index 68872e7110..58501b157f 100755
--- a/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakMessages.java
+++ b/adapters/saml/as7-eap6/subsystem/src/main/java/org/keycloak/subsystem/saml/as7/logging/KeycloakMessages.java
@@ -16,7 +16,7 @@
  */
 package org.keycloak.subsystem.saml.as7.logging;
 
-import org.jboss.logging.annotations.MessageBundle;
+import org.jboss.logging.MessageBundle;
 import org.jboss.logging.Messages;
 
 /**
diff --git a/prod-arguments.json b/prod-arguments.json
index f0aa40ba75..a5b0d16eb4 100644
--- a/prod-arguments.json
+++ b/prod-arguments.json
@@ -22,7 +22,9 @@
       "dependencyOverride.org.apache.httpcomponents:httpclient@org.keycloak.testsuite:integration-arquillian-tests": "",
       "dependencyOverride.org.apache.httpcomponents:httpcore@*": "4.4.5.redhat-1",
       "dependencyOverride.org.apache.httpcomponents:httpclient@*": "4.5.4.redhat-00001",
-      "dependencyOverride.org.jboss.logging:jboss-logging-processor@*": ""
+      "dependencyOverride.org.jboss.logging:jboss-logging-processor@*": "",
+      "dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-as7-subsystem": "",
+      "dependencyOverride.org.jboss.logging:jboss-logging@org.keycloak:keycloak-saml-as7-subsystem": ""
     }
   }
 }