From 2c0c6197a6a00ad8b48da2f50700cef8e3da2232 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 24 Jan 2021 22:23:35 +0100
Subject: WIP: Optaplanner.

Excluding kie-api and kie-internal. Doing with without importing
Kogito would probably have solved everything directly.
---
 module/acme/classpath.txt      | 93 +++++++++++++++++++-----------------------
 module/ri-engine/classpath.txt | 70 +++++++++++++++----------------
 module/ri-engine/pom.xml       | 38 ++++++-----------
 pom.xml                        | 16 ++++----
 4 files changed, 96 insertions(+), 121 deletions(-)

diff --git a/module/acme/classpath.txt b/module/acme/classpath.txt
index 8777318..bb58a59 100644
--- a/module/acme/classpath.txt
+++ b/module/acme/classpath.txt
@@ -1,5 +1,5 @@
 io.trygvis.rules-sandbox:acme:1.0-SNAPSHOT:jar
-ch.obermuhlner:big-math:2.0.1:jar
+ch.obermuhlner:big-math:2.0.0:jar
 ch.qos.logback:logback-classic:1.2.3:jar
 ch.qos.logback:logback-core:1.2.3:jar
 com.fasterxml.jackson.core:jackson-annotations:2.12.0:jar
@@ -7,7 +7,6 @@ com.fasterxml.jackson.core:jackson-core:2.12.0:jar
 com.fasterxml.jackson.core:jackson-databind:2.12.0:jar
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.0:jar
 com.github.javaparser:javaparser-core:3.13.10:jar
-com.github.virtuald:curvesapi:1.06:jar
 com.google.code.findbugs:annotations:3.0.1:jar
 com.google.errorprone:error_prone_annotations:2.1.3:jar
 com.google.guava:guava:25.0-jre:jar
@@ -15,48 +14,37 @@ com.google.j2objc:j2objc-annotations:1.1:jar
 com.google.re2j:re2j:1.2:jar
 com.googlecode.java-ipv6:java-ipv6:0.17:jar
 com.hubspot.jinjava:jinjava:2.5.6:jar
+com.sun.activation:jakarta.activation:1.2.2:jar
 com.sun.istack:istack-commons-runtime:3.0.8:jar
-com.sun.xml.fastinfoset:FastInfoset:1.2.16:jar
 com.thoughtworks.xstream:xstream:1.4.14:jar
-com.zaxxer:SparseBitSet:1.2:jar
-commons-codec:commons-codec:1.11:jar
+commons-codec:commons-codec:1.14:jar
 commons-io:commons-io:2.8.0:jar
-commons-net:commons-net:2.2:jar
+commons-net:commons-net:3.3:jar
 io.trygvis.rules-sandbox:ri-engine:1.0-SNAPSHOT:jar
 io.trygvis.rules-sandbox:ri-wireguard:1.0-SNAPSHOT:jar
-jakarta.activation:jakarta.activation-api:1.2.1:jar
-jakarta.xml.bind:jakarta.xml.bind-api:2.3.2:jar
+jakarta.activation:jakarta.activation-api:1.2.2:jar
+jakarta.xml.bind:jakarta.xml.bind-api:2.3.3:jar
 org.antlr:antlr-runtime:3.5.2:jar
-org.apache.commons:commons-collections4:4.4:jar
-org.apache.commons:commons-compress:1.19:jar
-org.apache.commons:commons-lang3:3.9:jar
+org.apache.commons:commons-lang3:3.10:jar
 org.apache.commons:commons-math3:3.4.1:jar
-org.apache.poi:poi:4.1.2:jar
-org.apache.poi:poi-ooxml:4.1.2:jar
-org.apache.poi:poi-ooxml-schemas:4.1.2:jar
-org.apache.xmlbeans:xmlbeans:3.1.0:jar
 org.checkerframework:checker-compat-qual:2.0.0:jar
 org.codehaus.mojo:animal-sniffer-annotations:1.14:jar
-org.drools:drools-canonical-model:7.47.0.Final:jar
-org.drools:drools-compiler:7.47.0.Final:jar
-org.drools:drools-core:7.47.0.Final:jar
-org.drools:drools-core-dynamic:7.47.0.Final:jar
-org.drools:drools-core-reflective:7.47.0.Final:jar
-org.drools:drools-decisiontables:7.47.0.Final:jar
-org.drools:drools-ecj:7.47.0.Final:jar
-org.drools:drools-model-compiler:7.47.0.Final:jar
-org.drools:drools-mvel:7.47.0.Final:jar
-org.drools:drools-mvel-compiler:7.47.0.Final:jar
-org.drools:drools-mvel-parser:7.47.0.Final:jar
-org.drools:drools-templates:7.47.0.Final:jar
-org.glassfish.jaxb:jaxb-runtime:2.3.2:jar
-org.glassfish.jaxb:txw2:2.3.2:jar
-org.javassist:javassist:3.26.0-GA:jar
-org.jsoup:jsoup:1.8.3:jar
-org.jvnet.staxex:stax-ex:1.8.1:jar
-org.kie:kie-api:7.47.0.Final:jar
-org.kie:kie-internal:7.47.0.Final:jar
-org.kie:kie-memory-compiler:7.47.0.Final:jar
+org.drools:drools-canonical-model:7.48.0.Final:jar
+org.drools:drools-compiler:7.48.0.Final:jar
+org.drools:drools-core:7.48.0.Final:jar
+org.drools:drools-core-reflective:7.48.0.Final:jar
+org.drools:drools-ecj:7.48.0.Final:jar
+org.drools:drools-model-compiler:7.48.0.Final:jar
+org.drools:drools-mvel:7.48.0.Final:jar
+org.drools:drools-mvel-compiler:7.48.0.Final:jar
+org.drools:drools-mvel-parser:7.48.0.Final:jar
+org.glassfish.jaxb:jaxb-runtime:2.3.3:jar
+org.glassfish.jaxb:txw2:2.3.3:jar
+org.javassist:javassist:3.24.1-GA:jar
+org.jsoup:jsoup:1.10.3:jar
+org.kie:kie-api:7.48.0.Final:jar
+org.kie:kie-internal:7.48.0.Final:jar
+org.kie:kie-memory-compiler:7.48.0.Final:jar
 org.kie.kogito:drools-compiler:1.1.0.Final:jar
 org.kie.kogito:drools-core:1.1.0.Final:jar
 org.kie.kogito:drools-core-dynamic:1.1.0.Final:jar
@@ -65,26 +53,27 @@ org.kie.kogito:kogito-api:1.1.0.Final:jar
 org.kie.kogito:kogito-drools-model:1.1.0.Final:jar
 org.kie.kogito:kogito-internal:1.1.0.Final:jar
 org.kie.kogito:kogito-services:1.1.0.Final:jar
-org.kie.soup:kie-soup-commons:7.47.0.Final:jar
-org.kie.soup:kie-soup-maven-support:7.47.0.Final:jar
-org.kie.soup:kie-soup-project-datamodel-api:7.47.0.Final:jar
-org.kie.soup:kie-soup-project-datamodel-commons:7.47.0.Final:jar
-org.kie.soup:kie-soup-xstream:7.47.0.Final:jar
-org.mvel:mvel2:2.4.10.Final:jar
+org.kie.kogito:kogito-timer:1.1.0.Final:jar
+org.kie.soup:kie-soup-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-maven-support:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-api:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-xstream:7.48.0.Final:jar
+org.mvel:mvel2:2.4.11.Final:jar
 org.optaplanner:optaplanner-core:8.1.0.Final:jar
 org.optaplanner:optaplanner-persistence-common:8.1.0.Final:jar
 org.optaplanner:optaplanner-persistence-jackson:8.1.0.Final:jar
 org.optaplanner:optaplanner-spring-boot-autoconfigure:8.1.0.Final:jar
 org.optaplanner:optaplanner-spring-boot-starter:8.1.0.Final:jar
-org.slf4j:slf4j-api:1.7.26:jar
-org.springframework:spring-aop:5.2.5.RELEASE:jar
-org.springframework:spring-beans:5.2.5.RELEASE:jar
-org.springframework:spring-context:5.2.5.RELEASE:jar
-org.springframework:spring-core:5.2.5.RELEASE:jar
-org.springframework:spring-expression:5.2.5.RELEASE:jar
-org.springframework:spring-jcl:5.2.5.RELEASE:jar
-org.springframework.boot:spring-boot:2.2.6.RELEASE:jar
-org.springframework.boot:spring-boot-autoconfigure:2.2.6.RELEASE:jar
+org.slf4j:slf4j-api:1.7.30:jar
+org.springframework:spring-aop:5.2.7.RELEASE:jar
+org.springframework:spring-beans:5.2.7.RELEASE:jar
+org.springframework:spring-context:5.2.7.RELEASE:jar
+org.springframework:spring-core:5.2.7.RELEASE:jar
+org.springframework:spring-expression:5.2.7.RELEASE:jar
+org.springframework:spring-jcl:5.2.7.RELEASE:jar
+org.springframework.boot:spring-boot:2.3.1.RELEASE:jar
+org.springframework.boot:spring-boot-autoconfigure:2.3.1.RELEASE:jar
 org.yaml:snakeyaml:1.26:jar
-xmlpull:xmlpull:1.2.0:jar
-xpp3:xpp3_min:1.2.0:jar
+xmlpull:xmlpull:1.1.3.1:jar
+xpp3:xpp3_min:1.1.4c:jar
diff --git a/module/ri-engine/classpath.txt b/module/ri-engine/classpath.txt
index a1d5666..de2cfff 100644
--- a/module/ri-engine/classpath.txt
+++ b/module/ri-engine/classpath.txt
@@ -1,12 +1,11 @@
 io.trygvis.rules-sandbox:ri-engine:1.0-SNAPSHOT:jar
-ch.obermuhlner:big-math:2.0.1:jar
+ch.obermuhlner:big-math:2.0.0:jar
 ch.qos.logback:logback-classic:1.2.3:jar
 ch.qos.logback:logback-core:1.2.3:jar
 com.fasterxml.jackson.core:jackson-annotations:2.12.0:jar
 com.fasterxml.jackson.core:jackson-core:2.12.0:jar
 com.fasterxml.jackson.core:jackson-databind:2.12.0:jar
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.0:jar
-com.github.virtuald:curvesapi:1.06:jar
 com.google.code.findbugs:annotations:3.0.1:jar
 com.google.errorprone:error_prone_annotations:2.1.3:jar
 com.google.guava:guava:25.0-jre:jar
@@ -15,42 +14,43 @@ com.google.re2j:re2j:1.2:jar
 com.googlecode.java-ipv6:java-ipv6:0.17:jar
 com.hubspot.jinjava:jinjava:2.5.6:jar
 com.thoughtworks.xstream:xstream:1.4.14:jar
-com.zaxxer:SparseBitSet:1.2:jar
-commons-codec:commons-codec:1.11:jar
+commons-codec:commons-codec:1.14:jar
 commons-io:commons-io:2.8.0:jar
-commons-net:commons-net:2.2:jar
+commons-net:commons-net:3.3:jar
 io.trygvis.rules-sandbox:ri-wireguard:1.0-SNAPSHOT:jar
 org.antlr:antlr-runtime:3.5.2:jar
-org.apache.commons:commons-collections4:4.4:jar
-org.apache.commons:commons-compress:1.19:jar
-org.apache.commons:commons-lang3:3.9:jar
-org.apache.commons:commons-math3:3.4.1:jar
-org.apache.poi:poi:4.1.2:jar
-org.apache.poi:poi-ooxml:4.1.2:jar
-org.apache.poi:poi-ooxml-schemas:4.1.2:jar
-org.apache.xmlbeans:xmlbeans:3.1.0:jar
+org.apache.commons:commons-lang3:3.10:jar
 org.checkerframework:checker-compat-qual:2.0.0:jar
 org.codehaus.mojo:animal-sniffer-annotations:1.14:jar
-org.drools:drools-compiler:7.47.0.Final:jar
-org.drools:drools-core:7.47.0.Final:jar
-org.drools:drools-core-dynamic:7.47.0.Final:jar
-org.drools:drools-core-reflective:7.47.0.Final:jar
-org.drools:drools-decisiontables:7.47.0.Final:jar
-org.drools:drools-ecj:7.47.0.Final:jar
-org.drools:drools-mvel:7.47.0.Final:jar
-org.drools:drools-templates:7.47.0.Final:jar
-org.javassist:javassist:3.26.0-GA:jar
-org.jsoup:jsoup:1.8.3:jar
-org.kie:kie-api:7.47.0.Final:jar
-org.kie:kie-internal:7.47.0.Final:jar
-org.kie:kie-memory-compiler:7.47.0.Final:jar
-org.kie.soup:kie-soup-commons:7.47.0.Final:jar
-org.kie.soup:kie-soup-maven-support:7.47.0.Final:jar
-org.kie.soup:kie-soup-project-datamodel-api:7.47.0.Final:jar
-org.kie.soup:kie-soup-project-datamodel-commons:7.47.0.Final:jar
-org.kie.soup:kie-soup-xstream:7.47.0.Final:jar
-org.mvel:mvel2:2.4.10.Final:jar
-org.slf4j:slf4j-api:1.7.26:jar
+org.drools:drools-compiler:7.48.0.Final:jar
+org.drools:drools-core:7.48.0.Final:jar
+org.drools:drools-core-reflective:7.48.0.Final:jar
+org.drools:drools-ecj:7.48.0.Final:jar
+org.drools:drools-mvel:7.48.0.Final:jar
+org.javassist:javassist:3.24.1-GA:jar
+org.jsoup:jsoup:1.10.3:jar
+org.kie:kie-api:7.48.0.Final:jar
+org.kie:kie-dmn-api:7.48.0.Final:jar
+org.kie:kie-dmn-model:7.48.0.Final:jar
+org.kie:kie-internal:7.48.0.Final:jar
+org.kie:kie-memory-compiler:7.48.0.Final:jar
+org.kie:kie-pmml-api:7.48.0.Final:jar
+org.kie:kie-pmml-commons:7.48.0.Final:jar
+org.kie:kie-pmml-evaluator-api:7.48.0.Final:jar
+org.kie.kogito:drools-core:1.1.0.Final:jar
+org.kie.kogito:drools-core-static:1.1.0.Final:jar
+org.kie.kogito:kogito-api:1.1.0.Final:jar
+org.kie.kogito:kogito-internal:1.1.0.Final:jar
+org.kie.kogito:kogito-pmml-api-dependencies:1.1.0.Final:pom
+org.kie.kogito:kogito-services:1.1.0.Final:jar
+org.kie.kogito:kogito-timer:1.1.0.Final:jar
+org.kie.soup:kie-soup-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-maven-support:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-api:7.48.0.Final:jar
+org.kie.soup:kie-soup-project-datamodel-commons:7.48.0.Final:jar
+org.kie.soup:kie-soup-xstream:7.48.0.Final:jar
+org.mvel:mvel2:2.4.11.Final:jar
+org.slf4j:slf4j-api:1.7.30:jar
 org.yaml:snakeyaml:1.26:jar
-xmlpull:xmlpull:1.2.0:jar
-xpp3:xpp3_min:1.2.0:jar
+xmlpull:xmlpull:1.1.3.1:jar
+xpp3:xpp3_min:1.1.4c:jar
diff --git a/module/ri-engine/pom.xml b/module/ri-engine/pom.xml
index 80ef901..694c88b 100644
--- a/module/ri-engine/pom.xml
+++ b/module/ri-engine/pom.xml
@@ -18,39 +18,25 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>ri-wireguard</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.kie</groupId>
-            <artifactId>kie-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
+            <groupId>org.kie.kogito</groupId>
             <artifactId>drools-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
-            <artifactId>drools-compiler</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-decisiontables</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.drools</groupId>
-            <artifactId>drools-templates</artifactId>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.kie</groupId>
-            <artifactId>kie-internal</artifactId>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>org.mvel</groupId>
-            <artifactId>mvel2</artifactId>
+            <artifactId>drools-mvel</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.kie</groupId>
+                    <artifactId>kie-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.kie</groupId>
+                    <artifactId>kie-internal</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 04c6cf0..03b371e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,11 @@
 
   <properties>
     <java.module.name>io.trygvis.rules.sandbox</java.module.name>
-    <drools.version>7.47.0.Final</drools.version>
     <version.jackson>2.12.0</version.jackson>
-
+    <version.kogito>1.1.0.Final</version.kogito>
+    <!-- This should match the version in kogito -->
+    <version.drools>7.48.0.Final</version.drools>
+    <version.springboot>2.3.1.RELEASE</version.springboot>
     <java.version>15</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -27,26 +29,24 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <!--
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>${springboot.version}</version>
+        <version>${version.springboot}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.kie.kogito</groupId>
         <artifactId>kogito-bom</artifactId>
-        <version>${project.version}</version>
+        <version>${version.kogito}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      -->
       <dependency>
         <groupId>org.drools</groupId>
-        <artifactId>drools</artifactId>
-        <version>${drools.version}</version>
+        <artifactId>drools-bom</artifactId>
+        <version>${version.drools}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
cgit v1.2.3