[RHPAM-4714] wildfly-elytron as provided (#2961)

* wildfly-elytron as provided * Added wildfly-elytron-auth-server as test dependency * bundle wildfly-elytron-auth-server only for tomcat9 profile
kiegroup · May 25, 2023 · 26e1901 · 26e1901
1 parent 52f4b1c
commit 26e1901
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 0 deletions.
diff --git a/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-common/pom.xml b/kie-server-parent/kie-server-remote/kie-server-rest/kie-server-rest-common/pom.xml
@@ -98,6 +98,12 @@
       <artifactId>simpleclient_httpserver</artifactId>
     </dependency>
 
+    <!-- Test - Wildfly Elytron -->
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-auth-server</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 

diff --git a/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml b/kie-server-parent/kie-server-services/kie-server-services-common/pom.xml
@@ -76,6 +76,7 @@
     <dependency>
       <groupId>org.wildfly.security</groupId>
       <artifactId>wildfly-elytron</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <!-- security -->
@@ -214,4 +215,21 @@
 
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>tomcat9</id>
+      <activation>
+        <property>
+          <name>container.profile</name>
+          <value>tomcat9</value>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.wildfly.security</groupId>
+          <artifactId>wildfly-elytron-auth-server</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/kie-server-parent/kie-server-services/kie-server-services-jbpm/pom.xml b/kie-server-parent/kie-server-services/kie-server-services-jbpm/pom.xml
@@ -162,6 +162,7 @@
     <dependency>
       <groupId>org.wildfly.security</groupId>
       <artifactId>wildfly-elytron</artifactId>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>

diff --git a/...boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/pom.xml b/...boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/pom.xml
@@ -267,6 +267,13 @@
         <artifactId>jakarta.json-api</artifactId>
          <scope>test</scope>
     </dependency>
+
+    <!-- Test - Wildfly Elytron -->
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-auth-server</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/pom.xml b/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/pom.xml
@@ -142,6 +142,13 @@
       <artifactId>wildfly-client-config</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Test - Wildfly Elytron -->
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-auth-server</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <dependencyManagement>

diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/pom.xml b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/pom.xml
@@ -142,6 +142,13 @@
       <artifactId>toxiproxy</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Test - Wildfly Elytron -->
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-auth-server</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/pom.xml b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/pom.xml
@@ -123,6 +123,13 @@
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- Test - Wildfly Elytron -->
+    <dependency>
+      <groupId>org.wildfly.security</groupId>
+      <artifactId>wildfly-elytron-auth-server</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>