diff options
29 files changed, 83 insertions, 61 deletions
diff --git a/BRMSGateway/config.properties b/BRMSGateway/config.properties index 2ef1a28be..aaa3215bb 100644 --- a/BRMSGateway/config.properties +++ b/BRMSGateway/config.properties @@ -77,7 +77,7 @@ ping_interval=30000 # # # -brms.dependency.version=1.4.0-SNAPSHOT +brms.dependency.version=1.4.2-SNAPSHOT ENVIRONMENT = DEVL diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index 240872384..c741d46c0 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -3,120 +3,120 @@ "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", diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml index 1922e90b3..3ef25d79f 100644 --- a/BRMSGateway/pom.xml +++ b/BRMSGateway/pom.xml @@ -23,7 +23,7 @@ <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> 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 548275c9d..38ca8665f 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 @@ -117,7 +117,7 @@ public class BrmsPush { 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"; diff --git a/BRMSGateway/src/test/resources/config.properties b/BRMSGateway/src/test/resources/config.properties index 08fd8be40..b8fc09dea 100644 --- a/BRMSGateway/src/test/resources/config.properties +++ b/BRMSGateway/src/test/resources/config.properties @@ -81,6 +81,6 @@ ping_interval=30000 # # # -brms.dependency.version=1.4.0-SNAPSHOT +brms.dependency.version=1.4.2-SNAPSHOT ENVIRONMENT = DEVL @@ -47,7 +47,7 @@ repositories: committers: - <<: *onap_releng_ptl - name: 'Jorge Hernandez' - email: 'jh1730@att.com' + email: 'jorge.hernandez-herrero@att.com' company: 'ATT' id: 'jhh' timezone: 'America/Illinois' @@ -56,5 +56,21 @@ committers: 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 diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 035181db9..d455df38e 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index 9714e4dc7..043d1ac74 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -28,7 +28,7 @@ <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> diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml index bffc06b38..61c0381d0 100644 --- a/ONAP-PDP-REST/pom.xml +++ b/ONAP-PDP-REST/pom.xml @@ -23,7 +23,7 @@ <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> diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PdpApiService.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PdpApiService.java index 8a7a8e0a0..7ecfb2dbe 100644 --- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PdpApiService.java +++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PdpApiService.java @@ -103,8 +103,7 @@ public abstract class PdpApiService { 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) { @@ -117,13 +116,20 @@ public abstract class PdpApiService { 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; diff --git a/ONAP-PDP/pom.xml b/ONAP-PDP/pom.xml index 2bd454861..5c69d93cf 100644 --- a/ONAP-PDP/pom.xml +++ b/ONAP-PDP/pom.xml @@ -27,7 +27,7 @@ <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> diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml index 5d899fcbe..2ba4ebcb2 100644 --- a/ONAP-REST/pom.xml +++ b/ONAP-REST/pom.xml @@ -25,7 +25,7 @@ <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> diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 28cbf87d3..13b4418c5 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -22,7 +22,7 @@ <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> diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml index 05770808f..80b50ac86 100644 --- a/ONAP-XACML/pom.xml +++ b/ONAP-XACML/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index c5da9dd95..133e93067 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -22,7 +22,7 @@ <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> diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml index 159d83151..60179ca0f 100644 --- a/PolicyEngineAPI/pom.xml +++ b/PolicyEngineAPI/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/PolicyEngineClient/pom.xml b/PolicyEngineClient/pom.xml index feb9e51ea..03d68793f 100644 --- a/PolicyEngineClient/pom.xml +++ b/PolicyEngineClient/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/PolicyEngineUtils/pom.xml b/PolicyEngineUtils/pom.xml index 5a30f5163..29c037378 100644 --- a/PolicyEngineUtils/pom.xml +++ b/PolicyEngineUtils/pom.xml @@ -24,7 +24,7 @@ <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> diff --git a/TestSuite/Performance/pom.xml b/TestSuite/Performance/pom.xml index 7a5b6a16e..578294529 100644 --- a/TestSuite/Performance/pom.xml +++ b/TestSuite/Performance/pom.xml @@ -23,7 +23,7 @@ <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> diff --git a/TestSuite/Stability/pom.xml b/TestSuite/Stability/pom.xml index d52038491..81e100b05 100644 --- a/TestSuite/Stability/pom.xml +++ b/TestSuite/Stability/pom.xml @@ -23,7 +23,7 @@ <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> diff --git a/TestSuite/pom.xml b/TestSuite/pom.xml index 8c96319d3..fd68f82f0 100644 --- a/TestSuite/pom.xml +++ b/TestSuite/pom.xml @@ -23,7 +23,7 @@ <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> diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 18dc891a1..fefcc28aa 100755 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -25,7 +25,7 @@ <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> diff --git a/packages/base/src/files/install/servers/brmsgw/config.properties b/packages/base/src/files/install/servers/brmsgw/config.properties index c16df02b5..1080f4636 100644 --- a/packages/base/src/files/install/servers/brmsgw/config.properties +++ b/packages/base/src/files/install/servers/brmsgw/config.properties @@ -84,9 +84,9 @@ test_via_jmx=${{test_via_jmx}} 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 diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index 04a65adcb..93f815082 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ <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> diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 72a978de9..26d5c438d 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -25,7 +25,7 @@ <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> diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf index bfd82a135..6d0f7d1af 100644 --- a/packages/install/src/files/brmsgw.conf +++ b/packages/install/src/files/brmsgw.conf @@ -59,5 +59,5 @@ CLIENT_ID=PDPServer 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 diff --git a/packages/pom.xml b/packages/pom.xml index a1dc9854f..55a6cbe11 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -23,7 +23,7 @@ <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> @@ -28,7 +28,7 @@ </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> diff --git a/version.properties b/version.properties index c0fb9b16f..739b15f12 100644 --- a/version.properties +++ b/version.properties @@ -24,7 +24,7 @@ major=1 minor=4 -patch=0 +patch=2 base_version=${major}.${minor}.${patch} |