From 4e69f3358d31173a222b275e2a82da692846aa1a Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 29 Jan 2021 12:46:06 -0500
Subject: 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
---
 sdnr/wt/common/pom.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'sdnr/wt/common/pom.xml')

diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index 83b07536f..54ffc01c3 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -29,14 +29,14 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
     <artifactId>sdnr-wt-common</artifactId>
     <version>1.1.1-SNAPSHOT</version>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
 
     <name>ccsdk-features :: ${project.artifactId}</name>
     <licenses>
@@ -47,6 +47,7 @@
     </licenses>
 
     <properties>
+        <checkstyle.skip>true</checkstyle.skip> <!-- POM configuration -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
         <buildtime>${maven.build.timestamp} UTC</buildtime>
@@ -62,7 +63,7 @@
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -76,6 +77,7 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-client</artifactId>
+            <version>${elasticsearch-rest-client.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -90,8 +92,8 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-              <groupId>com.google.code.findbugs</groupId>
-              <artifactId>annotations</artifactId>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>annotations</artifactId>
         </dependency>
     </dependencies>
 
@@ -112,6 +114,7 @@
             <plugin>
                 <groupId>com.github.alexcojocaru</groupId>
                 <artifactId>elasticsearch-maven-plugin</artifactId>
+                <version>6.16</version>
                 <configuration>
                     <skip>${skipTests}</skip>
                     <clusterName>testCluster</clusterName>
-- 
cgit 1.2.3-korg