Revert back to Drools 6.5.0.Final

Decided to abandon the conversion to Drools 7.9.0.Final.  This undoes the
associated changes.

Change-Id: I457266d09f7e481da5c0415290241a348786f8ea
Issue-ID: POLICY-1093
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/ClassExtractors.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/ClassExtractors.java
index 9532179..97e9633 100644 (file)
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/ClassExtractors.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/ClassExtractors.java
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.policy.drools.utils.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 7ef9608..8cbef40 100644 (file)
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -60,12 +60,12 @@
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-api</artifactId>
-            <version>7.9.0.Final</version>
+            <version>6.5.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-ci</artifactId>
-            <version>7.9.0.Final</version>
+            <version>6.5.0.Final</version>
       <!--
       Issue: 2 of 2
       Excluding these 2 dependencies in order to force upgrade security fixes
@@ -90,12 +90,12 @@
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
-            <version>7.9.0.Final</version>
+            <version>6.5.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-persistence-jpa</artifactId>
-            <version>7.9.0.Final</version>
+            <version>6.5.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.onap.policy.common</groupId>

diff --git a/policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java b/policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java
index 7d24ef5..a3efe43 100644 (file)
--- a/policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java
+++ b/policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java
@@ -26,16 +26,15 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-import org.appformer.maven.integration.MavenRepository;
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
 import org.drools.compiler.kproject.models.KieModuleModelImpl;
-import org.drools.core.util.IoUtils;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
 import org.kie.api.builder.Message;
 import org.kie.api.builder.ReleaseId;
 import org.kie.api.builder.model.KieModuleModel;
+import org.kie.scanner.MavenRepository;
 
 /**
  * Kie related utilities.
@@ -74,10 +73,10 @@ public class KieUtils {
         pomFile.deleteOnExit();
 
         ReleaseId releaseId = kieBuilder.getKieModule().getReleaseId();
-        MavenRepository.getMavenRepository().
-            installArtifact(releaseId,
-                            ((InternalKieModule) kieBuilder.getKieModule()).getBytes(),
-                            IoUtils.readBytes(pomFile));
+        MavenRepository.getMavenRepository()
+            .installArtifact(releaseId,
+                            (InternalKieModule) kieBuilder.getKieModule(),
+                            pomFile);
         return releaseId;
     }
 
@@ -103,8 +102,8 @@ public class KieUtils {
         KieBuilder kieBuilder = kieBuild(kieFileSystem);
 
         ReleaseId releaseId = kieBuilder.getKieModule().getReleaseId();
-        MavenRepository.getMavenRepository().installArtifact(releaseId,
-                        ((InternalKieModule) kieBuilder.getKieModule()).getBytes(), IoUtils.readBytes(pom));
+        MavenRepository.getMavenRepository()
+            .installArtifact(releaseId, (InternalKieModule) kieBuilder.getKieModule(), pom);
         return releaseId;
     }
 

diff --git a/pom.xml b/pom.xml
index 7100369..c3c4aae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <junit.version>4.12</junit.version>
         <eclipselink.version>2.7.0</eclipselink.version>
         <mariadb.jdbc.version>2.1.0</mariadb.jdbc.version>
-        <hibernate.core.version>5.3.6.Final</hibernate.core.version>
+        <hibernate.core.version>5.2.10.Final</hibernate.core.version>
         <hibernate.commons.annotations.version>5.0.1.Final</hibernate.commons.annotations.version>
         <commons.io.version>2.5</commons.io.version>
         <xml.apis.version>1.4.01</xml.apis.version>