From def0f11148b1fb0d97d4bfa16fc2224de0af7115 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 13 Feb 2018 11:29:56 +0000 Subject: Rename maven modules to mirror directory structure The naming of Maven modules in drools-applications was not aligned with the directory structure in the git repository of drools-applications. Therefore it was difficult to see the strucutre of the repository in Eclipse and other IDEs. This change amends the Maven module IDs to reflect the repository directory structure. This patch reset fixes the previos patch set, where many references to maven modules internally in drools-applciations were missed. See also changes in engine and docker repos. Updated to reflect repo directory structure in maven artifact groups. Issue-ID: POLICY-238 Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109 Signed-off-by: liamfallon --- .../templates/archetype-cl-amsterdam/pom.xml | 56 ++-- .../src/main/resources/archetype-resources/pom.xml | 232 ++++++------- controlloop/templates/pom.xml | 30 +- controlloop/templates/template.demo/pom.xml | 363 +++++++++++---------- 4 files changed, 342 insertions(+), 339 deletions(-) (limited to 'controlloop/templates') diff --git a/controlloop/templates/archetype-cl-amsterdam/pom.xml b/controlloop/templates/archetype-cl-amsterdam/pom.xml index ef553e0d2..c2f3a19ac 100644 --- a/controlloop/templates/archetype-cl-amsterdam/pom.xml +++ b/controlloop/templates/archetype-cl-amsterdam/pom.xml @@ -20,37 +20,37 @@ --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + maven-archetype - - org.onap.policy.drools-applications - templates - 1.2.0-SNAPSHOT - + + org.onap.policy.drools-applications.controlloop.templates + templates + 1.2.0-SNAPSHOT + - archetype-cl-amsterdam - maven-archetype + archetype-cl-amsterdam - archetype-cl-amsterdam - Archetype to generate a yaml based control loop for ONAP Amsterdam release + ${artifactId} + Archetype to generate a yaml based control loop for ONAP Amsterdam release - - - - org.apache.maven.archetype - archetype-packaging - 3.0.1 - - + + + + org.apache.maven.archetype + archetype-packaging + 3.0.1 + + - - - - maven-archetype-plugin - 3.0.1 - - - - + + + + maven-archetype-plugin + 3.0.1 + + + + diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml index 4b83f8985..1cb159ad8 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml @@ -20,125 +20,125 @@ --> - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - ${groupId} - ${artifactId} - ${version} - kjar + ${groupId} + ${artifactId} + ${version} + kjar - ${artifactId} - Control Loop Amsterdam Release Rules + ${artifactId} + Control Loop Amsterdam Release Rules - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - org.kie - kie-maven-plugin - 6.5.0.Final - true - - - + + + + org.kie + kie-maven-plugin + 6.5.0.Final + true + + + - - - org.onap.policy.drools-applications - events - ${dependenciesVersion} - - - org.onap.policy.drools-applications - appc - ${dependenciesVersion} - - - org.onap.policy.drools-applications - appclcm - ${dependenciesVersion} - - - org.onap.policy.drools-applications - vfc - ${dependenciesVersion} - - - org.onap.policy.drools-applications - so - ${dependenciesVersion} - - - org.onap.policy.drools-applications - aai - ${dependenciesVersion} - - - org.onap.policy.drools-applications - sdc - ${dependenciesVersion} - - - org.onap.policy.drools-applications - trafficgenerator - ${dependenciesVersion} - - - org.onap.policy.drools-applications - eventmanager - ${dependenciesVersion} - - - org.onap.policy.drools-applications - guard - ${dependenciesVersion} - - - org.onap.policy.drools-applications - actorServiceProvider - ${dependenciesVersion} - - - org.onap.policy.drools-applications - actor.appc - ${dependenciesVersion} - - - org.onap.policy.drools-applications - actor.appclcm - ${dependenciesVersion} - - - org.onap.policy.drools-applications - actor.so - ${dependenciesVersion} - - - org.onap.policy.drools-applications - actor.vfc - ${dependenciesVersion} - - - org.onap.policy.drools-applications - policy-yaml - ${dependenciesVersion} - - - com.att.research.xacml - xacml-pdp - 1.0.1 - - - org.onap.policy.drools-pdp - policy-management - ${dependenciesVersion} - provided - true - - + + + org.onap.policy.drools-applications.controlloop.common.model-impl + events + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appc + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appclcm + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + vfc + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + so + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + aai + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + sdc + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.model-impl + trafficgenerator + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common + eventmanager + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common + guard + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.actors + actorServiceProvider + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appc + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appclcm + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.so + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.vfc + ${dependenciesVersion} + + + org.onap.policy.drools-applications.controlloop.common + policy-yaml + ${dependenciesVersion} + + + com.att.research.xacml + xacml-pdp + 1.0.1 + + + org.onap.policy.drools-pdp + policy-management + ${dependenciesVersion} + provided + true + + diff --git a/controlloop/templates/pom.xml b/controlloop/templates/pom.xml index b33553e6a..71541ab80 100644 --- a/controlloop/templates/pom.xml +++ b/controlloop/templates/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + pom - 4.0.0 - - templates - pom + + org.onap.policy.drools-applications.controlloop + controlloop + 1.2.0-SNAPSHOT + - - org.onap.policy.drools-applications - controlloop - 1.2.0-SNAPSHOT - + org.onap.policy.drools-applications.controlloop.templates + templates - - template.demo - archetype-cl-amsterdam - + + template.demo + archetype-cl-amsterdam + diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml index c501bfd94..f2700e7d5 100644 --- a/controlloop/templates/template.demo/pom.xml +++ b/controlloop/templates/template.demo/pom.xml @@ -1,6 +1,6 @@ - - 4.0.0 - - org.onap.policy.drools-applications - templates - 1.2.0-SNAPSHOT - - template.demo - - - org.eclipse.persistence - org.eclipse.persistence.jpa - 2.7.0 - provided - - - commons-io - commons-io - 2.5 - provided - - - org.drools - drools-core - 6.5.0.Final - test - - - org.drools - drools-compiler - 6.5.0.Final - test - - - com.google.code.gson - gson - 2.5 - test - - - org.onap.policy.drools-applications - appc - ${project.version} - provided - - - org.onap.policy.drools-applications - appclcm - ${project.version} - provided - - - org.onap.policy.drools-applications - so - ${project.version} - provided - - - org.onap.policy.drools-applications - trafficgenerator - ${project.version} - provided - - - org.onap.policy.drools-applications - vfc - ${project.version} - provided - - - org.onap.policy.drools-applications - events - ${project.version} - provided - - - org.onap.policy.drools-applications - guard - ${project.version} - provided - - - org.onap.policy.drools-applications - aai - ${project.version} - provided - - - org.onap.policy.drools-applications - sdc - ${project.version} - provided - - - org.onap.policy.drools-applications - policy-yaml - ${project.version} - provided - - - org.onap.policy.drools-applications - eventmanager - ${project.version} - provided - - - com.att.research.xacml - xacml - 1.0.1 - test - - - com.att.research.xacml - xacml-pdp - 1.0.1 - test - - - javax.persistence - persistence-api - 1.0.2 - provided - - - org.onap.policy.drools-applications - actorServiceProvider - ${project.version} - provided - - - org.onap.policy.drools-applications - actor.appc - ${project.version} - provided - - - org.onap.policy.drools-applications - actor.appclcm - ${project.version} - provided - - - org.onap.policy.drools-applications - actor.so - ${project.version} - provided - - - org.onap.policy.drools-applications - actor.vfc - ${project.version} - provided - - - junit - junit - 4.12 - test - - - com.h2database - h2 - [1.4.186,) - test - - - org.onap.policy.drools-applications - simulators - ${project.version} - test - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.onap.policy.drools-applications.controlloop.templates + templates + 1.2.0-SNAPSHOT + + + template.demo + + + + org.eclipse.persistence + org.eclipse.persistence.jpa + 2.7.0 + provided + + + commons-io + commons-io + 2.5 + provided + + + org.drools + drools-core + 6.5.0.Final + test + + + org.drools + drools-compiler + 6.5.0.Final + test + + + com.google.code.gson + gson + 2.5 + test + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appc + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + appclcm + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + so + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + trafficgenerator + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + vfc + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + events + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common + guard + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + aai + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.model-impl + sdc + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common + policy-yaml + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common + eventmanager + ${project.version} + provided + + + com.att.research.xacml + xacml + 1.0.1 + test + + + com.att.research.xacml + xacml-pdp + 1.0.1 + test + + + javax.persistence + persistence-api + 1.0.2 + provided + + + org.onap.policy.drools-applications.controlloop.common.actors + actorServiceProvider + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appc + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.appclcm + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.so + ${project.version} + provided + + + org.onap.policy.drools-applications.controlloop.common.actors + actor.vfc + ${project.version} + provided + + + junit + junit + 4.12 + test + + + com.h2database + h2 + [1.4.186,) + test + + + org.onap.policy.drools-applications.controlloop.common + simulators + ${project.version} + test + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + -- cgit 1.2.3-korg