aboutsummaryrefslogtreecommitdiffstats
path: root/policy-core
diff options
context:
space:
mode:
Diffstat (limited to 'policy-core')
-rw-r--r--policy-core/pom.xml73
-rw-r--r--policy-core/src/main/java/org/onap/policy/drools/util/KieUtils.java14
2 files changed, 28 insertions, 59 deletions
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 7497a34c..25b099c0 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -30,129 +30,96 @@
<version>1.6.0-SNAPSHOT</version>
</parent>
- <properties>
- <protobuf.version>3.6.1</protobuf.version>
- </properties>
-
<dependencies>
- <!--
- Issue: 1 of 2
- These 3 dependencies are trying to upgrade security fixes
- identified. If they are removed or manipulated then please
- fix the 2nd change as noted below.
- -->
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
- <version>6.5.0.Final</version>
</dependency>
+
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-ci</artifactId>
- <version>6.5.0.Final</version>
- <!--
- Issue: 2 of 2
- Excluding these 2 dependencies in order to force upgrade security fixes
- identified. As declared above. Any changes here should be reflected above
- and vice versa.
- -->
+ <!--
+ Issue: 2 of 2
+ Excluding these 2 dependencies in order to force upgrade security fixes
+ identified. As declared above. Any changes here should be reflected above
+ and vice versa.
+ -->
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
- <version>6.5.0.Final</version>
</dependency>
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-persistence-jpa</artifactId>
- <version>6.5.0.Final</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>capabilities</artifactId>
<version>${policy.common.version}</version>
</dependency>
+
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>utils</artifactId>
<version>${policy.common.version}</version>
</dependency>
+
<dependency>
<groupId>org.onap.policy.drools-pdp</groupId>
<artifactId>policy-utils</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>utils-test</artifactId>
<version>${policy.common.version}</version>
<scope>test</scope>
</dependency>
+
</dependencies>
+
<build>
<plugins>
<plugin>
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 23f81499..5500d110 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
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ 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;
+import org.kie.scanner.KieMavenRepository;
/**
* Kie related utilities.
@@ -73,10 +73,11 @@ public class KieUtils {
pomFile.deleteOnExit();
ReleaseId releaseId = kieBuilder.getKieModule().getReleaseId();
- MavenRepository.getMavenRepository()
+ KieMavenRepository
+ .getKieMavenRepository()
.installArtifact(releaseId,
- (InternalKieModule) kieBuilder.getKieModule(),
- pomFile);
+ (InternalKieModule) kieBuilder.getKieModule(),
+ pomFile);
return releaseId;
}
@@ -102,7 +103,8 @@ public class KieUtils {
KieBuilder kieBuilder = kieBuild(kieFileSystem);
ReleaseId releaseId = kieBuilder.getKieModule().getReleaseId();
- MavenRepository.getMavenRepository()
+ KieMavenRepository
+ .getKieMavenRepository()
.installArtifact(releaseId, (InternalKieModule) kieBuilder.getKieModule(), pom);
return releaseId;
}