summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBenjamin, Max <max.benjamin@att.com>2020-05-18 16:37:51 -0400
committerBenjamin, Max (mb388a) <mb388a@att.com>2020-06-18 10:53:59 -0400
commit9868f1749ac413b5b7df287d35983bf24ce517ea (patch)
treed0ccf620547486e4ea032976eccf71646a779023 /common
parentb60a09ddf1e6f42539ca58d0376196b9642d5cff (diff)
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
Diffstat (limited to 'common')
-rw-r--r--common/pom.xml19
-rw-r--r--common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java4
-rw-r--r--common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java5
3 files changed, 24 insertions, 4 deletions
diff --git a/common/pom.xml b/common/pom.xml
index f47200fc63..08dfc4d905 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.modelmapper</groupId>
<artifactId>modelmapper</artifactId>
- <version>1.1.0</version>
+ <version>2.3.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>2.1.9</version>
+ <version>${aaf.cadi.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
@@ -266,6 +266,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.3.0</version>
+ </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>
</dependencies>
<dependencyManagement>
<dependencies>
diff --git a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
index 6e2bc97ee9..84efa65a50 100644
--- a/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
+++ b/common/src/main/java/org/onap/so/openpojo/rules/EqualsAndHashCodeTester.java
@@ -31,6 +31,8 @@ import java.util.List;
import java.util.Set;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
import org.hamcrest.Matcher;
import com.openpojo.business.annotation.BusinessKey;
import com.openpojo.random.RandomFactory;
@@ -42,7 +44,6 @@ import com.openpojo.validation.utils.ValidationHelper;
public class EqualsAndHashCodeTester implements Tester {
-
private final Matcher m;
private boolean onlyDeclaredMethods = false;
@@ -118,7 +119,6 @@ public class EqualsAndHashCodeTester implements Tester {
}
}
-
private Set<PojoField> hasIdOrBusinessKey(PojoClass pojoClass) {
final Set<PojoField> fields = new HashSet<>();
diff --git a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
index 840a978a61..7ae7de2ece 100644
--- a/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
+++ b/common/src/main/java/org/onap/so/utils/ExternalTaskServiceUtils.java
@@ -59,6 +59,11 @@ public class ExternalTaskServiceUtils {
return lockDuration;
}
+ public Long getLongLockDuration() {
+ Long lockDuration = Long.parseLong(env.getProperty("mso.long.lock-time", "600000"));
+ return lockDuration;
+ }
+
@ScheduledLogging
@Scheduled(fixedDelay = 30000)
public void checkAllClientsActive() {