Update to latest common/models released versions

[policy/engine.git] / BRMSGateway / src / main / java / org / onap / policy / brms / api / BrmsPush.java

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 a48aac0..2aa2873 100644 (file)
--- 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,8 +116,8 @@ 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 DEFAULT_VERSION = "1.4.0-SNAPSHOT";
+    private static final String[] GOALS = {"clean", "deploy"};
+    private static final String DEFAULT_VERSION = "1.5.1";
     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";
@@ -1048,12 +1049,6 @@ public class BrmsPush {
         msoDependency.setArtifactId("controlloop.common.model-impl.so");
         msoDependency.setVersion(version);
         dependencyList.add(msoDependency);
-
-        final Dependency trafficgeneratorDependency = new Dependency();
-        trafficgeneratorDependency.setGroupId(DROOLS_APPS_MODEL_GROUP);
-        trafficgeneratorDependency.setArtifactId("controlloop.common.model-impl.trafficgenerator");
-        trafficgeneratorDependency.setVersion(version);
-        dependencyList.add(trafficgeneratorDependency);
         return dependencyList;
     }
 
@@ -1089,7 +1084,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);