From f7222f85e8c472e0d434d96191930dc989452e87 Mon Sep 17 00:00:00 2001 From: jhh Date: Thu, 31 Oct 2019 11:36:17 -0500 Subject: upgrade to 7.28.0.Final drools libraries commons-lang does not seem to be packaged anymore (commons-lang3 still does, which is the desired one). There are some @SupressWarning that seem to have no effect that were removed. Some libraries that were explicitly added are transitively used now in the latest version of drools, hence some rework in the dependency and exclude sections. We will need to generate a clm report to verify. Issue-ID: POLICY-1407 Signed-off-by: jhh Change-Id: I44e09183caca72f5f33bdec0b8fa88b0b4793055 Signed-off-by: jhh --- .../drools/pooling/extractor/ClassExtractors.java | 4 +- .../policy/drools/pooling/state/FilterUtils.java | 6 +- policy-core/pom.xml | 73 ++++++---------------- .../java/org/onap/policy/drools/util/KieUtils.java | 14 +++-- .../policy/drools/system/PolicyEngineManager.java | 2 +- pom.xml | 2 +- 6 files changed, 35 insertions(+), 66 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 ab260c57..91fbad18 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 @@ -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. @@ -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.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.onap.policy.drools.utils.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/FilterUtils.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/FilterUtils.java index 069ca656..1616f03e 100644 --- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/FilterUtils.java +++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/FilterUtils.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. @@ -72,7 +72,7 @@ public class FilterUtils { * @param items items to be checked * @return an "and" filter */ - public static Map makeAnd(@SuppressWarnings("unchecked") Map... items) { + public static Map makeAnd(Map... items) { Map map = new TreeMap<>(); map.put(JSON_CLASS, CLASS_AND); map.put(JSON_FILTERS, items); @@ -86,7 +86,7 @@ public class FilterUtils { * @param items items to be checked * @return an "or" filter */ - public static Map makeOr(@SuppressWarnings("unchecked") Map... items) { + public static Map makeOr(Map... items) { Map map = new TreeMap<>(); map.put(JSON_CLASS, CLASS_OR); map.put(JSON_FILTERS, items); 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 @@ 1.6.0-SNAPSHOT - - 3.6.1 - - - + org.codehaus.plexus plexus-utils - 3.0.24 - - - com.thoughtworks.xstream - xstream - - - com.google.guava - guava - - - - com.google.protobuf - protobuf-java - ${protobuf.version} org.kie kie-api - 6.5.0.Final + org.kie kie-ci - 6.5.0.Final - + org.codehaus.plexus plexus-utils - - com.thoughtworks.xstream - xstream - - - com.google.guava - guava - - - com.google.protobuf - protobuf-java - + org.drools drools-core - 6.5.0.Final + org.drools drools-persistence-jpa - 6.5.0.Final - - - com.google.protobuf - protobuf-java - - + org.onap.policy.common capabilities ${policy.common.version} + org.onap.policy.common utils ${policy.common.version} + org.onap.policy.drools-pdp policy-utils ${project.version} + org.projectlombok lombok provided + junit junit test + org.powermock powermock-api-mockito test + org.assertj assertj-core test + org.onap.policy.common utils-test ${policy.common.version} test + + 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; } diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngineManager.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngineManager.java index 757b67fa..6e529c74 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngineManager.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngineManager.java @@ -40,7 +40,7 @@ import java.util.stream.Stream; import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.onap.policy.common.endpoints.event.comm.Topic; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; import org.onap.policy.common.endpoints.event.comm.TopicEndpoint; diff --git a/pom.xml b/pom.xml index 520abd87..b61cbb8c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ org.onap.policy.parent integration - 3.0.1 + 3.1.0-SNAPSHOT -- cgit 1.2.3-korg