diff options
| author |   Jim Hahn <jrh3@att.com> | 2019-11-22 14:02:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-11-22 14:02:47 +0000 |
| commit | 16b893174dbe2e8c079d6d7ae49529f5f300049b (patch) | |
| tree | 56202ab434a6de5ceb86f11486fee2e9c0b4c627 | |
| parent | 44129736119d7e1217314d446008274f48385aa5 (diff) | |
| parent | 1f6b95c9717438c44eda23a9a57d976f1616a43f (diff) | |
Merge "Use dependency management for cds proto-definition artifact"
| -rw-r--r-- | controlloop/common/eventmanager/pom.xml | 4 | ||||
| -rw-r--r-- | controlloop/pom.xml | 24 | ||||
| -rw-r--r-- | controlloop/templates/template.demo/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 5 |
4 files changed, 7 insertions, 30 deletions
diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml index a020e5e5d..bebc99286 100644 --- a/controlloop/common/eventmanager/pom.xml +++ b/controlloop/common/eventmanager/pom.xml @@ -145,10 +145,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.components</groupId> - <artifactId>proto-definition</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> diff --git a/controlloop/pom.xml b/controlloop/pom.xml index dff61c171..734d79d7c 100644 --- a/controlloop/pom.xml +++ b/controlloop/pom.xml @@ -21,36 +21,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> - <parent> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>drools-applications</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> - - <groupId>org.onap.policy.drools-applications.controlloop</groupId> - <artifactId>controlloop</artifactId> - - <properties> - <ccsdk.version>0.4.4</ccsdk.version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.cds.components</groupId> - <artifactId>proto-definition</artifactId> - <version>${ccsdk.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - - + <groupId>org.onap.policy.drools-applications.controlloop</groupId> + <artifactId>controlloop</artifactId> <modules> <module>common</module> <module>templates</module> <module>packages</module> </modules> - - </project> diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml index 47d815c7e..56f04bf42 100644 --- a/controlloop/templates/template.demo/pom.xml +++ b/controlloop/templates/template.demo/pom.xml @@ -195,10 +195,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.components</groupId> - <artifactId>proto-definition</artifactId> - </dependency> - <dependency> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>cds</artifactId> <version>${policy.models.version}</version> @@ -259,6 +259,11 @@ <artifactId>logback-classic</artifactId> <scope>provided</scope> </dependency> + <!-- Common Controller SDK --> + <dependency> + <groupId>org.onap.ccsdk.cds.components</groupId> + <artifactId>proto-definition</artifactId> + </dependency> </dependencies> |