summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/featureaggregator/pom.xml
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-01-29 12:46:06 -0500
committerDan Timoney <dtimoney@att.com>2021-01-29 12:47:35 -0500
commit4e69f3358d31173a222b275e2a82da692846aa1a (patch)
tree7355744a66614a0811113ee6a43a423e68257fe3 /sdnr/wt/featureaggregator/pom.xml
parent123b423cddbe01bdaba0bea50d986ff1b18a25bc (diff)
Revert "update common and data-provider"
This reverts commit a3e70a1a48d13193d9f28a2d91089d5b253d3e91. Change was incomplete - many modules still reference version 2.1.0 (Sodium-based) of CCSDK parent poms, causing version conflicts in odlsli docker. Issue-ID: CCSDK-3076 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I447371239a1bfe102b705e7ecbd964f368780657
Diffstat (limited to 'sdnr/wt/featureaggregator/pom.xml')
-rwxr-xr-xsdnr/wt/featureaggregator/pom.xml42
1 files changed, 25 insertions, 17 deletions
diff --git a/sdnr/wt/featureaggregator/pom.xml b/sdnr/wt/featureaggregator/pom.xml
index 02679fd89..cec22dcdf 100755
--- a/sdnr/wt/featureaggregator/pom.xml
+++ b/sdnr/wt/featureaggregator/pom.xml
@@ -1,19 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ~ ============LICENSE_START=======================================================
- ~ ONAP : ccsdk features ~ ================================================================================
- ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
- ~ All rights reserved. ~ ================================================================================
- ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
- ~ ================================================================================
- ~ 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.
- ~ ============LICENSE_END=======================================================
- ~ -->
+<!--
+ ~ ============LICENSE_START=======================================================
+ ~ ONAP : ccsdk features
+ ~ ================================================================================
+ ~ Copyright (C) 2019 highstreet technologies GmbH Intellectual Property.
+ ~ All rights reserved.
+ ~ ================================================================================
+ ~ Update Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ ~ ================================================================================
+ ~ 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.
+ ~ ============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>
@@ -21,7 +29,7 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.0</version>
<relativePath/>
</parent>
@@ -34,7 +42,7 @@
<modules>
<module>feature</module>
- <!-- <module>feature-devicemanager</module> -->
+ <module>feature-devicemanager</module>
<module>feature-devicemanager-base</module>
<module>installer</module>
</modules>