summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-09-11 14:40:05 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-11 14:40:05 +0000
commit7bb3c27a4e3c2767c671780df9628aa19257c502 (patch)
treea09cfaccfabc7d8b9d13ab45a359903f7ca40859
parent64004833c5c71ae75c8fff71d48e4d3d670ac70e (diff)
parent0e6b16b44ad288f878f058ce24c8843e7e45791d (diff)
Merge "Revert back to Drools 6.5.0.Final"
-rw-r--r--feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/extractor/ClassExtractors.java2
-rw-r--r--policy-core/pom.xml8
-rw-r--r--policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java15
-rw-r--r--pom.xml2
4 files changed, 13 insertions, 14 deletions
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 95321793..97e96337 100644
--- 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 7ef9608e..8cbef405 100644
--- 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 7d24ef5e..a3efe433 100644
--- 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 71003690..c3c4aae1 100644
--- 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>