From 1618d5c24a05253bcddb13a510eb18f1742d6d8c Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Fri, 5 Feb 2021 12:44:55 -0500
Subject: Update for ODL Aluminum

Update sdnc docker containers for ODL Aluminum release version

Change-Id: Ibef207c7e7a5730543f4ab3c601395159bfbcb1a
Issue-ID: SDNC-1476
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: 8b0557634763a74cc4c4ab1e8402abf939b2068b
---
 data-migrator/pom.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'data-migrator')

diff --git a/data-migrator/pom.xml b/data-migrator/pom.xml
index d018725e..5c1922ef 100644
--- a/data-migrator/pom.xml
+++ b/data-migrator/pom.xml
@@ -17,34 +17,26 @@
     <description>MDSAL Data Migrator</description>
 
     <properties>
-        <fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
-        <velocity.version>2.0</velocity.version>
         <skip.SWM>true</skip.SWM>
+        <java.version>11</java.version>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
         <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.21</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
-            <version>1.6.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -55,12 +47,10 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.5</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -82,10 +72,20 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <release>${java.version}</release>
+                    <!--explicitly remove source and target-->
+                    <source combine.self="override"/>
+                    <target combine.self="override"/>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -97,7 +97,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>create-zip</id>
-- 
cgit 1.2.3-korg