From 9868f1749ac413b5b7df287d35983bf24ce517ea Mon Sep 17 00:00:00 2001
From: "Benjamin, Max" <max.benjamin@att.com>
Date: Mon, 18 May 2020 16:37:51 -0400
Subject: Prepare for java 11

final changes for java11 groovy compatibility
removed unnecessary dependencies and cleaned up poms
added missing jaxws-api dependency to pom.xml
java8 profile is now active by default in parent pom
update beans to have RemoteResource annotation
always use the compiler plugin from parent pom
Update external task timeout to longer value to hold lock
update remote resource annotation to match catalog db client
add remote resource annotation to bean for bowman
completely remove bowman from requests db client

Issue-ID: SO-2059
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: If6f0df36e8077ccd703abce9f64290daed63955b
---
 bpmn/MSOCommonBPMN/pom.xml                         | 36 ++++++++++++++--------
 .../so/bpmn/common/scripts/GenericUtils.groovy     |  1 -
 .../onap/so/bpmn/common/scripts/OofUtils.groovy    |  1 -
 .../onap/so/bpmn/common/scripts/VidUtils.groovy    |  1 -
 4 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'bpmn/MSOCommonBPMN')

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index ec8ad3127c..c395b01221 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -11,17 +11,11 @@
   <name>MSOCommonBPMN</name>
   <packaging>jar</packaging>
 
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
         <configuration>
           <compilerId>groovy-eclipse-compiler</compilerId>
         </configuration>
@@ -35,7 +29,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.19-01</version>
+            <version>2.5.8-03</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -129,12 +123,13 @@
                       [1.3,)
                     </versionRange>
                     <goals>
-                      <goal>run</goal>
+                      <goal>execute</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore>
-                    </ignore>
+                    <execute>
+                      <runOnIncremental>true</runOnIncremental>
+                    </execute>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -205,7 +200,24 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
+      <artifactId>groovy</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-xml</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-json</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-jsr223</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.onap.so</groupId>
@@ -318,7 +330,7 @@
     <dependency>
       <groupId>uk.co.blackpepper.bowman</groupId>
       <artifactId>bowman-client</artifactId>
-      <version>0.3.0</version>
+      <version>${bowman.client.version}</version>
     </dependency>
     <dependency>
       <groupId>pl.pragmatists</groupId>
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
index cc261a2750..bd713af006 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/GenericUtils.groovy
@@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils;
 
 class GenericUtils extends StringUtils{
 
-	@Override
 	public static boolean isBlank(final CharSequence cs) {
 		int strLen;
 		if (cs == null || (strLen = cs.length()) == 0 || cs.equals("null"))  {
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
index d307a4e7bc..69dfacd9bc 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofUtils.groovy
@@ -56,7 +56,6 @@ import org.slf4j.LoggerFactory
 import javax.ws.rs.core.MediaType
 import javax.ws.rs.core.Response
 import javax.ws.rs.core.UriBuilder
-import javax.xml.ws.http.HTTPException
 
 import static org.onap.so.bpmn.common.scripts.GenericUtils.*
 
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
index 1960cafb0f..14aefe1601 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/VidUtils.groovy
@@ -31,7 +31,6 @@ import org.onap.so.bpmn.core.xml.XmlTool
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-
 class VidUtils {
     private static final Logger logger = LoggerFactory.getLogger( VidUtils.class);
 
-- 
cgit 1.2.3-korg