diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2018-09-11 14:40:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 14:40:05 +0000 |
| commit | 7bb3c27a4e3c2767c671780df9628aa19257c502 (patch) | |
| tree | a09cfaccfabc7d8b9d13ab45a359903f7ca40859 /policy-core | |
| parent | 64004833c5c71ae75c8fff71d48e4d3d670ac70e (diff) | |
| parent | 0e6b16b44ad288f878f058ce24c8843e7e45791d (diff) | |
Merge "Revert back to Drools 6.5.0.Final"
Diffstat (limited to 'policy-core')
| -rw-r--r-- | policy-core/pom.xml | 8 | ||||
| -rw-r--r-- | policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java | 15 |
2 files changed, 11 insertions, 12 deletions
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; } |