diff options
| -rw-r--r-- | BRMSGateway/dependency.json | 50 | ||||
| -rw-r--r-- | BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java | 29 | ||||
| -rw-r--r-- | ONAP-PAP-REST/pom.xml | 2 | ||||
| -rw-r--r-- | packages/base/src/files/install/servers/brmsgw/dependency.json | 52 |
4 files changed, 67 insertions, 66 deletions
diff --git a/BRMSGateway/dependency.json b/BRMSGateway/dependency.json index a8b331712..22acaf4fc 100644 --- a/BRMSGateway/dependency.json +++ b/BRMSGateway/dependency.json @@ -1,96 +1,96 @@ { "dependencies": { "default": [{ - "groupId": "org.onap.policy.drools-applications", - "artifactId": "demo", + "groupId": "org.onap.policy.drools-applications.controlloop.templates", + "artifactId": "template.demo", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", - "artifactId": "mso", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", + "artifactId": "so", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", "version": "1.2.0-SNAPSHOT" }], "amsterdam": [{ - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.so", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", "version": "1.2.0-SNAPSHOT" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", "version": "1.2.0-SNAPSHOT" }, { diff --git a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java index 601b0a49f..ac1d0ac87 100644 --- a/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java +++ b/BRMSGateway/src/main/java/org/onap/policy/brmsInterface/BRMSPush.java @@ -104,7 +104,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; @SuppressWarnings("deprecation") public class BRMSPush { private static final String GROUP_NAMES = "groupNames"; - private static final String DROOLS_APPS_PACKAGE = "org.onap.policy.drools-applications"; + 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"; 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"; @@ -958,44 +959,44 @@ public class BRMSPush { String version = StringEscapeUtils.escapeJava(brmsdependencyversion); Dependency demoDependency = new Dependency(); - demoDependency.setGroupId(DROOLS_APPS_PACKAGE); - demoDependency.setArtifactId("demo"); + demoDependency.setGroupId(DROOLS_APPS_TEMPLATE_GROUP); + demoDependency.setArtifactId("template.demo"); demoDependency.setVersion(version); dependencyList.add(demoDependency); Dependency controlloopDependency = new Dependency(); - controlloopDependency.setGroupId(DROOLS_APPS_PACKAGE); + controlloopDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); controlloopDependency.setArtifactId("events"); controlloopDependency.setVersion(version); dependencyList.add(controlloopDependency); Dependency restDependency = new Dependency(); - restDependency.setGroupId(DROOLS_APPS_PACKAGE); - restDependency.setArtifactId("rest"); + restDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); + restDependency.setArtifactId("controlloop.common.model-impl.rest"); restDependency.setVersion(version); dependencyList.add(restDependency); Dependency appcDependency = new Dependency(); - appcDependency.setGroupId(DROOLS_APPS_PACKAGE); - appcDependency.setArtifactId("appc"); + appcDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); + appcDependency.setArtifactId("controlloop.common.model-impl.appc"); appcDependency.setVersion(version); dependencyList.add(appcDependency); Dependency aaiDependency = new Dependency(); - aaiDependency.setGroupId(DROOLS_APPS_PACKAGE); - aaiDependency.setArtifactId("aai"); + aaiDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); + aaiDependency.setArtifactId("controlloop.common.model-impl.aai"); aaiDependency.setVersion(version); dependencyList.add(aaiDependency); Dependency msoDependency = new Dependency(); - msoDependency.setGroupId(DROOLS_APPS_PACKAGE); - msoDependency.setArtifactId("mso"); + msoDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); + msoDependency.setArtifactId("controlloop.common.model-impl.so"); msoDependency.setVersion(version); dependencyList.add(msoDependency); Dependency trafficgeneratorDependency = new Dependency(); - trafficgeneratorDependency.setGroupId(DROOLS_APPS_PACKAGE); - trafficgeneratorDependency.setArtifactId("trafficgenerator"); + trafficgeneratorDependency.setGroupId(DROOLS_APPS_MODEL_GROUP); + trafficgeneratorDependency.setArtifactId("controlloop.common.model-impl.trafficgenerator"); trafficgeneratorDependency.setVersion(version); dependencyList.add(trafficgeneratorDependency); return dependencyList; diff --git a/ONAP-PAP-REST/pom.xml b/ONAP-PAP-REST/pom.xml index ca7de6b88..828f466c4 100644 --- a/ONAP-PAP-REST/pom.xml +++ b/ONAP-PAP-REST/pom.xml @@ -218,7 +218,7 @@ <version>2.0.8</version> </dependency> <dependency> - <groupId>org.onap.policy.drools-applications</groupId> + <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>policy-yaml</artifactId> <version>${project.version}</version> </dependency> diff --git a/packages/base/src/files/install/servers/brmsgw/dependency.json b/packages/base/src/files/install/servers/brmsgw/dependency.json index ffd368ecb..c22554293 100644 --- a/packages/base/src/files/install/servers/brmsgw/dependency.json +++ b/packages/base/src/files/install/servers/brmsgw/dependency.json @@ -1,96 +1,96 @@ { "dependencies": { "default": [{ - "groupId": "org.onap.policy.drools-applications", - "artifactId": "demo", + "groupId": "org.onap.policy.drools-applications.controlloop.templates", + "artifactId": "template.demo", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "rest", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", - "artifactId": "mso", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", + "artifactId": "so", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", "version": "${{BRMS_DEPENDENCY_VERSION}}" }], "amsterdam": [{ - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "events", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "appclcm", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "vfc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "so", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "aai", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "sdc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl", "artifactId": "trafficgenerator", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "eventmanager", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "guard", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actorServiceProvider", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.appclcm", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-application.controlloop.common.actorss", "artifactId": "actor.so", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common.actors", "artifactId": "actor.vfc", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { - "groupId": "org.onap.policy.drools-applications", + "groupId": "org.onap.policy.drools-applications.controlloop.common", "artifactId": "policy-yaml", "version": "${{BRMS_DEPENDENCY_VERSION}}" }, { @@ -99,4 +99,4 @@ "version": "1.0.0" }] } -}
\ No newline at end of file +} |