#
#
#
-brms.dependency.version=1.4.0-SNAPSHOT
+brms.dependency.version=1.4.2-SNAPSHOT
ENVIRONMENT = DEVL
"default": [{
"groupId": "org.onap.policy.drools-applications.controlloop.templates",
"artifactId": "template.demo",
- "version": "1.4.0-SNAPSHOT"
+ "version": "1.4.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "rest",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}],
"amsterdam": [{
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "events",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "appclcm",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "vfc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "so",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnr",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdnc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "aai",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "sdc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-impl",
"artifactId": "trafficgenerator",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "eventmanager",
- "version": "1.4.0-SNAPSHOT"
+ "version": "1.4.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.drools-applications.controlloop.common",
"artifactId": "guard",
- "version": "1.4.0-SNAPSHOT"
+ "version": "1.4.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actorServiceProvider",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.appclcm",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.so",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.sdnr",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions.model-actors",
"artifactId": "actor.vfc",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "org.onap.policy.models.policy-models-interactions",
"artifactId": "model-yaml",
- "version": "2.0.0-SNAPSHOT"
+ "version": "2.0.2-SNAPSHOT"
}, {
"groupId": "com.att.research.xacml",
"artifactId": "xacml-pdp",
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>BRMSGateway</artifactId>
<description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
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 DEFAULT_VERSION = "1.4.0-SNAPSHOT";
+ private static final String DEFAULT_VERSION = "1.4.2-SNAPSHOT";
private static final String DEPENDENCY_FILE = "dependency.json";
private static final String PROP_AES_KEY = "org.onap.policy.encryption.aes.key";
public static final String BRMSPERSISTENCE = "brmsEclipselink.persistencexml";
#
#
#
-brms.dependency.version=1.4.0-SNAPSHOT
+brms.dependency.version=1.4.2-SNAPSHOT
ENVIRONMENT = DEVL
committers:
- <<: *onap_releng_ptl
- name: 'Jorge Hernandez'
- email: 'jh1730@att.com'
+ email: 'jorge.hernandez-herrero@att.com'
company: 'ATT'
id: 'jhh'
timezone: 'America/Illinois'
company: 'Ericsson'
id: 'liamfallon'
timezone: 'Europe/Ireland'
+ - name: 'Jim Hahn'
+ email: 'jrh3@att.com'
+ company: 'ATT'
+ id: 'jrh3'
+ timezone: 'America/New_York'
+ - name: 'Ram Krishna Verma'
+ email: 'ram.krishna.verma@est.tech'
+ company: 'Ericsson'
+ id: 'ramverma'
+ timezone: 'Europe/Ireland'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
+ changes:
+ - type: 'Addition'
+ name: 'Jim Hahn'
+ name: 'Ram Krishna Verma'
+ link: https://lists.onap.org/g/onap-tsc/message/4977
+ link: https://lists.onap.org/g/onap-tsc/message/4976
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>LogParser</artifactId>
<dependencies>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<build>
<plugins>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>ONAP-PDP-REST</artifactId>
<description>ONAP PDP REST</description>
protected boolean validatePolicyNameAndScope(List<String> policyNames, List<String> policyTypes,
List<PolicyNameType> policyList) {
- String policyName = null;
- String policyScope = null;
+
String polType = null;
if (policyTypes.size() == 1) {
if (policyTypes.size() > 1) {
polType = policyTypes.get(i).trim();
}
- if (polName.contains(".")) {
+
+ String policyName = null;
+ String policyScope = null;
+ if (polName.endsWith("xml")) {
+ policyName = polName;
+ policyScope = policyName.substring(0, StringUtils.lastOrdinalIndexOf(policyName, ".", 3));
+ } else if (polName.contains(".")) {
policyName = polName.substring(polName.lastIndexOf('.') + 1);
policyScope = polName.substring(0, polName.lastIndexOf('.'));
} else {
message = XACMLErrorConstants.ERROR_DATA_ISSUE + "No Policy Scope given.";
return false;
}
+
if (StringUtils.isBlank(policyName) || StringUtils.isBlank(policyScope)) {
message = XACMLErrorConstants.ERROR_DATA_ISSUE + "Invalid Policy Name.";
return false;
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>ONAP-REST</artifactId>
<description>ONAP REST</description>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>ONAP-SDK-APP</artifactId>
<packaging>war</packaging>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>ONAP-XACML</artifactId>
<packaging>jar</packaging>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>POLICY-SDK-APP</artifactId>
<packaging>war</packaging>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineClient</artifactId>
<dependencies>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineUtils</artifactId>
<dependencies>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>TestSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>Performance</artifactId>
<properties>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>TestSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>Stability</artifactId>
<properties>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>TestSuite</artifactId>
<packaging>pom</packaging>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>base</artifactId>
ping_interval=30000
-brms.dependency.version=1.3.0-SNAPSHOT
+brms.dependency.version=1.4.1-SNAPSHOT
CLIENT_FILE=client.properties
# AES key for password encryption in config files
-#org.onap.policy.encryption.aes.key=12345678901234567890123456789012
\ No newline at end of file
+#org.onap.policy.encryption.aes.key=12345678901234567890123456789012
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>docker</artifactId>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>packages</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>install</artifactId>
CLIENT_KEY=test
ENVIRONMENT=DEVL
-BRMS_DEPENDENCY_VERSION=1.4.0-SNAPSHOT
-BRMS_MODELS_DEPENDENCY_VERSION=2.0.0-SNAPSHOT
+BRMS_DEPENDENCY_VERSION=1.4.1-SNAPSHOT
+BRMS_MODELS_DEPENDENCY_VERSION=2.0.1-SNAPSHOT
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
</parent>
<artifactId>packages</artifactId>
<packaging>pom</packaging>
</parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>policy-engine</name>
<description>The ONAP Policy Engine main pom</description>
major=1
minor=4
-patch=0
+patch=2
base_version=${major}.${minor}.${patch}