[KEYCLOAK-8412] - Upgrade to Drools 7.11.0.Final

authz/policy/drools/src/main/java/org/keycloak/authorization/policy/provider/drools/DroolsPolicyProviderFactory.java

@@ -104,7 +104,7 @@ public class DroolsPolicyProviderFactory implements PolicyProviderFactory<RulePo
 
     @Override
     public void init(Config.Scope config) {
-        this.ks = Factory.get();
+        this.ks = KieServices.get();
     }
 
     @Override

dependencies/drools-bom/pom.xml

@@ -18,23 +18,22 @@
 
     <properties>
         <aopalliance.version>1.0</aopalliance.version>
-        <xstream.version>1.4.9</xstream.version>
+        <xstream.version>1.4.10</xstream.version>
-        <antlr-runtime.version>3.5</antlr-runtime.version>
+        <antlr-runtime.version>3.5.2</antlr-runtime.version>
-        <ant.version>1.8.3</ant.version>
+        <ant.version>1.8.4</ant.version>
-        <maven.version>3.2.5</maven.version>
+        <maven.version>3.3.9</maven.version>
-        <wagon.version>2.6</wagon.version>
+        <wagon.version>3.0.0</wagon.version>
         <plexus-classworlds.version>2.5.2</plexus-classworlds.version>
-        <plexus-component-annotations.version>1.5.5</plexus-component-annotations.version>
+        <plexus-component-annotations.version>1.6</plexus-component-annotations.version>
         <plexus-interpolation.version>1.21</plexus-interpolation.version>
-        <plexus-utils.version>3.0.20</plexus-utils.version>
+        <plexus-utils.version>3.0.22</plexus-utils.version>
-        <aether.version>1.0.0.v20140518</aether.version>
+        <aether.version>1.1.0</aether.version>
-        <sisu.version>0.3.0.M1</sisu.version>
+        <org.eclipse.sisu>0.3.2</org.eclipse.sisu>
-        <mvel2.version>2.2.8.Final</mvel2.version>
+        <mvel2.version>2.4.0.Final</mvel2.version>
         <plexus-cipher.version>1.7</plexus-cipher.version>
         <plexus-sec-dispatcher.version>1.3</plexus-sec-dispatcher.version>
-        <sisu-guice.version>3.2.3</sisu-guice.version>
+        <sisu-guice.version>4.0</sisu-guice.version>
         <ecj.version>4.4.2</ecj.version>
-        <itext.version>2.1.2</itext.version>
     </properties>
 
     <dependencyManagement>
@@ -46,6 +45,13 @@
                 <version>${version.org.drools}</version>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.kie.soup</groupId>
+                <artifactId>kie-soup-bom</artifactId>
+                <type>pom</type>
+                <version>${version.org.drools}</version>
+                <scope>import</scope>
+            </dependency>
 
             <dependency>
                 <groupId>aopalliance</groupId>
@@ -122,6 +128,11 @@
                 <artifactId>maven-settings-builder</artifactId>
                 <version>${maven.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-builder-support</artifactId>
+                <version>${maven.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-http</artifactId>
@@ -200,12 +211,12 @@
             <dependency>
                 <groupId>org.eclipse.sisu</groupId>
                 <artifactId>org.eclipse.sisu.inject</artifactId>
-                <version>${sisu.version}</version>
+                <version>${org.eclipse.sisu}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.sisu</groupId>
                 <artifactId>org.eclipse.sisu.plexus</artifactId>
-                <version>${sisu.version}</version>
+                <version>${org.eclipse.sisu}</version>
             </dependency>
             <dependency>
                 <groupId>org.mvel</groupId>
@@ -223,13 +234,19 @@
                 <version>${plexus-sec-dispatcher.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.sonatype.sisu.inject</groupId>
+                <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-servlet</artifactId>
                 <version>${sisu-guice.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.inject</groupId>
+                        <artifactId>guice</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.sonatype.sisu</groupId>
+                <groupId>com.google.inject</groupId>
-                <artifactId>sisu-guice</artifactId>
+                <artifactId>guice</artifactId>
                 <classifier>no_aop</classifier>
                 <version>${sisu-guice.version}</version>
             </dependency>
@@ -238,21 +255,6 @@
                 <artifactId>ecj</artifactId>
                 <version>${ecj.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.lowagie</groupId>
-                <artifactId>itext</artifactId>
-                <version>${itext.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>bouncycastle</groupId>
-                        <artifactId>bcmail-jdk14</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>bouncycastle</groupId>
-                        <artifactId>bcprov-jdk14</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

dependencies/server-all/pom.xml

@@ -112,28 +112,92 @@
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-ci</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>org.sonatype.sisu</groupId>
+                    <groupId>*</groupId>
-                    <artifactId>sisu-guice</artifactId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-internal</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-maven-support</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-maven-integration</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-project-datamodel-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-compiler</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.aether</groupId>
@@ -158,6 +222,12 @@
         <dependency>
             <groupId>org.eclipse.aether</groupId>
             <artifactId>aether-transport-http</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.aether</groupId>
@@ -186,10 +256,22 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-aether-provider</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -198,14 +280,32 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model-builder</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -222,6 +322,22 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-settings-builder</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-builder-support</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.mvel</groupId>
@@ -240,15 +356,9 @@
         <dependency>
             <groupId>org.eclipse.sisu</groupId>
             <artifactId>org.eclipse.sisu.plexus</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.sonatype.sisu</groupId>
-                    <artifactId>sisu-guice</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.sonatype.sisu.inject</groupId>
+            <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-servlet</artifactId>
         </dependency>
         <dependency>
@@ -278,10 +388,22 @@
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http-shared</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
@@ -290,10 +412,12 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-        </dependency>
+            <exclusions>
-        <dependency>
+                <exclusion>
-            <groupId>com.google.guava</groupId>
+                    <groupId>*</groupId>
-            <artifactId>guava</artifactId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jdt.core.compiler</groupId>
@@ -302,32 +426,26 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.lowagie</groupId>
-            <artifactId>itext</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>bouncycastle</groupId>
+                    <groupId>*</groupId>
-                    <artifactId>bcmail-jdk14</artifactId>
+                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk14</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.sonatype.sisu</groupId>
-                    <artifactId>sisu-guice</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.sonatype.sisu</groupId>
+            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>sisu-guice</artifactId>
+            <artifactId>httpcore</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
             <classifier>no_aop</classifier>
         </dependency>
     </dependencies>

distribution/feature-packs/server-feature-pack/pom.xml

@@ -222,6 +222,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-builder-support</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven.wagon</groupId>
             <artifactId>wagon-http</artifactId>
@@ -653,6 +663,56 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-maven-support</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-maven-support</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-maven-integration</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.soup</groupId>
+            <artifactId>kie-soup-project-datamodel-commons</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
@@ -694,7 +754,7 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.sonatype.sisu.inject</groupId>
+            <groupId>com.google.inject.extensions</groupId>
             <artifactId>guice-servlet</artifactId>
             <exclusions>
                 <exclusion>
@@ -704,8 +764,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.sonatype.sisu</groupId>
+            <groupId>com.google.inject</groupId>
-            <artifactId>sisu-guice</artifactId>
+            <artifactId>guice</artifactId>
             <classifier>no_aop</classifier>
             <exclusions>
                 <exclusion>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/apache/maven/main/module.xml

@@ -30,6 +30,7 @@
         <artifact name="${org.apache.maven:maven-repository-metadata}"/>
         <artifact name="${org.apache.maven:maven-settings}"/>
         <artifact name="${org.apache.maven:maven-settings-builder}"/>
+        <artifact name="${org.apache.maven:maven-builder-support}"/>
     </resources>
     <dependencies>
         <module name="com.google.guava"/>
@@ -41,5 +42,6 @@
         <module name="org.eclipse.sisu"/>
         <module name="org.sonatype.plexus"/>
         <module name="org.sonatype.sisu"/>
+        <module name="org.apache.commons.lang3"/>
     </dependencies>
 </module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/eclipse/sisu/main/module.xml

@@ -22,7 +22,7 @@
     <resources>
         <artifact name="${org.eclipse.sisu:org.eclipse.sisu.inject}"/>
         <artifact name="${org.eclipse.sisu:org.eclipse.sisu.plexus}"/>
-        <artifact name="${org.sonatype.sisu.inject:guice-servlet}"/>
+        <artifact name="${com.google.inject.extensions:guice-servlet}"/>
     </resources>
     <dependencies>
         <module name="javax.api"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml

@@ -18,6 +18,12 @@
     <deployment>
         <dependencies>
             <module name="org.keycloak.keycloak-server-subsystem.dependencies"/>
+            <!-- Kie requires access to kie.conf files from META-INF -->
+            <module name="org.kie">
+                <imports>
+                    <include path="META-INF"/>
+                </imports>
+            </module>
         </dependencies>
         <exclude-subsystems>
             <subsystem name="webservices"/>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/kie/main/module.xml

@@ -23,6 +23,10 @@
         <artifact name="${org.kie:kie-api}"/>
         <artifact name="${org.kie:kie-ci}"/>
         <artifact name="${org.kie:kie-internal}"/>
+        <artifact name="${org.kie.soup:kie-soup-maven-support}"/>
+        <artifact name="${org.kie.soup:kie-soup-maven-integration}"/>
+        <artifact name="${org.kie.soup:kie-soup-commons}"/>
+        <artifact name="${org.kie.soup:kie-soup-project-datamodel-commons}"/>
     </resources>
     <dependencies>
         <module name="javax.api"/>
@@ -46,10 +50,19 @@
         <module name="org.apache.maven"/>
         <module name="org.apache.maven.wagon"/>
         <module name="org.codehouse.plexus"/>
-        <module name="org.drools"/>
+        <!-- Kie requires access to kie.conf files from META-INF -->
+        <module name="org.drools" export="true">
+            <imports>
+                <include path="META-INF"/>
+            </imports>
+            <exports>
+                <include path="META-INF"/>
+            </exports>
+        </module>
         <module name="org.eclipse.aether" slot="kie"/>
         <module name="org.eclipse.sisu"/>
         <module name="org.sonatype.plexus"/>
         <module name="org.sonatype.sisu"/>
+        <module name="org.mvel"/>
     </dependencies>
 </module>

distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/sonatype/sisu/main/module.xml

@@ -20,7 +20,7 @@
         <property name="jboss.api" value="private"/>
     </properties>
     <resources>
-        <artifact name="${org.sonatype.sisu:sisu-guice::no_aop}"/>
+        <artifact name="${com.google.inject:guice::no_aop}"/>
     </resources>
     <dependencies>
         <module name="aopalliance"/>

pom.xml

@@ -93,7 +93,7 @@
         <wildfly.common.version>1.4.0.Final</wildfly.common.version>
 
         <!-- Authorization Drools Policy Provider -->
-        <version.org.drools>6.5.0.Final</version.org.drools>
+        <version.org.drools>7.11.0.Final</version.org.drools>
 
         <!-- Others -->
         <apacheds.version>2.0.0-M21</apacheds.version>