diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-02-06 20:38:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-02-06 20:38:28 +0000 |
| commit | 835686f407a2e9e62eff325e8f93768d4fc44516 (patch) | |
| tree | 916b559e7352bcf4e3acfe6c467db130b3830b83 | |
| parent | 1a36afd3037837508cf23e4e476fddcf531dc918 (diff) | |
| parent | 565dc1fe0cc86aa55e4d88113669231de3f5e11e (diff) | |
Merge "Updating module names to resolve conflicts"
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | packages/base/pom.xml | 3 | ||||
| -rw-r--r-- | packages/docker/pom.xml | 2 | ||||
| -rw-r--r-- | packages/install/pom.xml | 3 | ||||
| -rw-r--r-- | packages/pom.xml | 4 |
5 files changed, 8 insertions, 5 deletions
@@ -15,3 +15,4 @@ target/ */sql/ */testingLogs/ **/*.iml +.checkstyle diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 2a58a92f..12f6fe73 100644 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -3,6 +3,7 @@ Policy Packages ================================================================================ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,7 +25,7 @@ <parent> <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>packages</artifactId> + <artifactId>drools-packages</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index d9e2133b..d6028fea 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>packages</artifactId> + <artifactId>drools-packages</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> diff --git a/packages/install/pom.xml b/packages/install/pom.xml index 69eb0b64..058b6148 100644 --- a/packages/install/pom.xml +++ b/packages/install/pom.xml @@ -3,6 +3,7 @@ Policy Packages ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Modifications Copyright (C) 2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ <parent> <groupId>org.onap.policy.drools-pdp</groupId> - <artifactId>packages</artifactId> + <artifactId>drools-packages</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> diff --git a/packages/pom.xml b/packages/pom.xml index 267f02dd..39fa17f8 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -3,7 +3,7 @@ ONAP Policy Engine - Drools PDP ================================================================================ Copyright (C) 2017, 2019-2020 AT&T Intellectual Property. All rights reserved. - Modifications Copyright (C) 2019 Bell Canada. + Modifications Copyright (C) 2019-2020 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,7 +27,7 @@ <artifactId>drools-pdp</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> - <artifactId>packages</artifactId> + <artifactId>drools-packages</artifactId> <packaging>pom</packaging> <name>Policy Packages</name> <description>ONAP Policy Drools PDP Installation Packages</description> |