From 8c23129be8bef8f2113be25eca424f87eb05c889 Mon Sep 17 00:00:00 2001
From: Oleg Mitsura <oleg.mitsura@amdocs.com>
Date: Thu, 20 Aug 2020 09:47:26 -0400
Subject: JDK11 upgrade

Issue-ID: CCSDK-1870

commit2: update surefire plugin to 3.0.0-M5. Need at least M3 for JDK11. S
  Still TODO: what to do about the spring-boot-parent. it may need a bump as well.
commit3: update parent with surefire 3.0.0-M5
commit4: another surefire version update + failsafe version update.
commit5: uncomment surefire def'n in parent pom. It may need to be redefined...
commit6: update to parent 2.0.1-SNAPSHOT
commits... rebasing/minorfixes
commit14: disabling HealthCheckApplicationTests test
commit19: Kapil bugfixes: Jsonfiles "isForce" replaces (incorrect) "force"; bumps kafka scala version to 2_13
commit20: fixe back kafka scala version to 2_11
commit25: reverted + applied patches for 2_13 (due to springboot parent update) + 'application' pom to use forCount=1 and reuseForks=false and reverted scanUatEmpoweredBlueprints modification in BluepritnsAcceptanceTest
commit30: rebase
commit31: SDCListener tests fixes. JMockit updated from 1.19 to 1.49. Since 1.42, need to do these changes https://jmockit.github.io/tutorial/Introduction.html#runningTests
commit32: Dockerfiles cleanup. adduser/group params are different from Alpine.
commit33: Dockerfile for SDClistener typo
commit34: Addressed Dan's comments.
commit35: Image was changed to 1.0.1 (which will be built soon), and the updated base image will already have 'onap' user and group, hence the adduser/group wouldn't be needed.
commit36: rebase
commit37: bumped up BP proc maven-surefire-plugin Xmx
Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: I3d864d500150e7d81bb2ce73333f2db67c004e93
---
 ms/blueprintsprocessor/parent/pom.xml | 51 +++++++++++++++++------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

(limited to 'ms/blueprintsprocessor/parent')

diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml
index 1fdd58224..f5f663051 100755
--- a/ms/blueprintsprocessor/parent/pom.xml
+++ b/ms/blueprintsprocessor/parent/pom.xml
@@ -223,17 +223,6 @@
                 <artifactId>kotlin-reflect</artifactId>
                 <version>${kotlin.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-jdk8</artifactId>
-                <version>${kotlin.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jetbrains.kotlin</groupId>
-                <artifactId>kotlin-stdlib-jdk7</artifactId>
-                <version>${kotlin.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.github.marcoferrer.krotoplus</groupId>
                 <artifactId>kroto-plus-coroutines</artifactId>
@@ -654,10 +643,6 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-script-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-jdk8</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-coroutines-core</artifactId>
@@ -719,11 +704,35 @@
             <groupId>io.netty</groupId>
             <artifactId>netty-tcnative-boringssl-static</artifactId>
         </dependency>
-
+        <!-- javax.annotations Needed for Java 11 migration-->
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${javax-annotation.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.cds.error.catalog</groupId>
             <artifactId>error-catalog-core</artifactId>
         </dependency>
+        <!-- required for java 11 -->
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -756,7 +765,6 @@
             <plugin>
                 <groupId>org.jetbrains.kotlin</groupId>
                 <artifactId>kotlin-maven-plugin</artifactId>
-                <version>${kotlin.maven.version}</version>
                 <executions>
                     <execution>
                         <id>compile</id>
@@ -784,15 +792,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
-- 
cgit 1.2.3-korg