diff options
author | liamfallon <liam.fallon@est.tech> | 2021-05-20 15:43:35 +0100 |
---|---|---|
committer | liamfallon <liam.fallon@est.tech> | 2021-05-20 16:40:13 +0100 |
commit | fa94a96fed5fd7af230a90373a04da47370e2eea (patch) | |
tree | 403698f7b95a884248c1414304e42d23e406d05e /common/pom.xml | |
parent | 65262f8dd9a6b9cbc284daa02ae332380e374483 (diff) |
Merge master into tosca-poc branch
This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master
With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical
Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'common/pom.xml')
-rw-r--r-- | common/pom.xml | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 000000000..d962fc74a --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2021 Nordix Foundation. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> + +<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> + + <parent> + <groupId>org.onap.policy.clamp</groupId> + <artifactId>policy-clamp</artifactId> + <version>6.1.2-SNAPSHOT</version> + </parent> + + <artifactId>policy-clamp-common</artifactId> + <name>${project.artifactId}</name> + <description>Common utilities and code for the TOSCA Control Loop system</description> +</project> |