summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHengye <yehui.wang@est.tech>2019-04-04 06:09:26 +0000
committerPamela Dragosh <pdragosh@research.att.com>2019-04-05 12:57:17 -0400
commit6a4266db5ce20717f787dff410839281e92bb081 (patch)
treee1ef36157b50df0edd07f82269d3092fb0e60785
parentd5f95d08ffd3f2e16b67aadae7007c7a51dfae19 (diff)
update dependencies from policy/models
Now pointing to policy/models for yaml and other dependencies. Issue-ID: POLICY-1264 Change-Id: I440d18425e46ec91e6d4e7f2cf1571c4d2bbdb6f Signed-off-by: Hengye <yehui.wang@est.tech> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--BRMSGateway/dependency.json100
-rw-r--r--BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java11
-rw-r--r--ONAP-PAP-REST/pom.xml9
-rw-r--r--packages/base/src/files/install/servers/brmsgw/dependency.json50
-rw-r--r--pom.xml5
5 files changed, 89 insertions, 86 deletions
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json
index aa7ac81f2..a6a1fd85e 100644
--- a/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@ -5,78 +5,78 @@
"artifactId": "template.demo",
"version": "1.4.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "rest",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}],
"amsterdam": [{
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appclcm",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "vfc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "eventmanager",
@@ -86,33 +86,33 @@
"artifactId": "guard",
"version": "1.4.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actorServiceProvider",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appclcm",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.so",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnr",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.vfc",
- "version": "1.4.0-SNAPSHOT"
+ "version": "2.0.0-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "policy-yaml",
diff --git a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
index a48aac04e..548275c9d 100644
--- a/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
+++ b/BRMSGateway/src/main/java/org/onap/policy/brms/api/BrmsPush.java
@@ -4,6 +4,7 @@
* ================================================================================
* Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
* Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -95,8 +96,8 @@ import org.onap.policy.utils.PolicyUtils;
import org.onap.policy.xacml.api.XACMLErrorConstants;
/**
- * BRMSPush: Application responsible to push policies to the BRMS PDP Policy Repository (PR). Mavenize and push policy
- * to PR
+ * BRMSPush: Application responsible to push policies to the BRMS PDP Policy Repository (PR).
+ * Mavenize and push policy to PR
*
* @version 1.0
*/
@@ -106,7 +107,7 @@ public class BrmsPush {
private static final String DROOLS_APPS_TEMPLATE_GROUP =
"org.onap.policy.drools-applications.controlloop.templates";
private static final String DROOLS_APPS_MODEL_GROUP =
- "org.onap.policy.drools-applications.controlloop.common.model-impl";
+ "org.onap.policy.models.policy-models-interactions.model-impl";
private static final String META_INF = "META-INF";
private static final String KMODULE_XML_FILE = "kmodule.xml";
private static final String POM_XML_FILE = "pom.xml";
@@ -115,7 +116,7 @@ public class BrmsPush {
private static final String RESOURCES = "resources";
private static final Logger LOGGER = FlexLogger.getLogger(BrmsPush.class.getName());
private static final String PROJECTSLOCATION = "RuleProjects";
- private static final String[] GOALS = { "clean", "deploy" };
+ private static final String[] GOALS = {"clean", "deploy"};
private static final String DEFAULT_VERSION = "1.4.0-SNAPSHOT";
private static final String DEPENDENCY_FILE = "dependency.json";
private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key";
@@ -1089,7 +1090,7 @@ public class BrmsPush {
if (config.getProperty(GROUP_NAMES).contains(",")) {
groupNames = config.getProperty(GROUP_NAMES).replaceAll(" ", "").split(",");
} else {
- groupNames = new String[] { config.getProperty(GROUP_NAMES).replaceAll(" ", "") };
+ groupNames = new String[] {config.getProperty(GROUP_NAMES).replaceAll(" ", "")};
}
if (groupNames == null || groupNames.length == 0) {
LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + groupNamesError);
diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml
index 3322acdc1..9714e4dc7 100644
--- a/ONAP-PAP-REST/pom.xml
+++ b/ONAP-PAP-REST/pom.xml
@@ -3,7 +3,8 @@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Modifications Copyright (C) 2019 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -182,9 +183,9 @@
<artifactId>mariadb-java-client</artifactId>
</dependency>
<dependency>
- <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
- <artifactId>policy-yaml</artifactId>
- <version>${version.policy.drools-application}</version>
+ <groupId>org.onap.policy.models.policy-models-interactions</groupId>
+ <artifactId>model-yaml</artifactId>
+ <version>${version.policy.models}</version>
</dependency>
<!-- Spring -->
<dependency>
diff --git a/packages/base/src/files/install/servers/brmsgw/dependency.json b/packages/base/src/files/install/servers/brmsgw/dependency.json
index e766f497a..117dc0126 100644
--- a/packages/base/src/files/install/servers/brmsgw/dependency.json
+++ b/packages/base/src/files/install/servers/brmsgw/dependency.json
@@ -5,68 +5,68 @@
"artifactId": "template.demo",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "rest",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}],
"amsterdam": [{
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appclcm",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "vfc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
@@ -78,41 +78,41 @@
"artifactId": "guard",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actorServiceProvider",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appclcm",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.so",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnr",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
+ "groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.vfc",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
- "groupId": "org.onap.policy.drools-applications.controlloop.common",
+ "groupId": "org.onap.policy.models.policy-models-interactions",
"artifactId": "policy-yaml",
"version": "${{BRMS_DEPENDENCY_VERSION}}"
}, {
"groupId": "com.att.research.xacml",
"artifactId": "xacml-pdp",
- "version": "1.0.0"
+ "version": "1.0.2"
}]
}
}
diff --git a/pom.xml b/pom.xml
index b993dbd5e..bfad59342 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,8 @@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ Modifications Copyright (C) 2019 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -59,7 +60,7 @@
<commons.compress.version>1.18</commons.compress.version>
<elasticsearch.version>6.4.3</elasticsearch.version>
<version.policy.common>1.4.0-SNAPSHOT</version.policy.common>
- <version.policy.drools-application>1.4.0-SNAPSHOT</version.policy.drools-application>
+ <version.policy.models>2.0.0-SNAPSHOT</version.policy.models>
</properties>
<modules>
<module>PolicyEngineUtils</module>