summaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
authorAmichai Hemli <amichai.hemli@intl.att.com>2020-02-24 17:34:23 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-24 17:34:23 +0000
commit7d10f76469786a5fb3a5f439a689bed688b09658 (patch)
treec4f9659c35ee2782f5193683b7d4c2d6ca5c1694 /vid-app-common
parentd9d76be660584b7eca9d8b916b3974a0ea163905 (diff)
parent8f70f2a3586588c6be369756330633d24e4cfe6d (diff)
Merge changes Ia95e99f4,Iac2da615
* changes: Move to jdk11-openjdk-slim (was jre8-alpine) Maven import jakarta XML Binding
Diffstat (limited to 'vid-app-common')
-rwxr-xr-xvid-app-common/pom.xml7
1 files changed, 4 insertions, 3 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 94d07dbeb..88c07d7e2 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -33,6 +33,7 @@
org.springframework.orm.hibernate4.HibernateTransactionManager
so following orm.version lets epsdk-core find it -->
<hibernate.version>4.3.11.Final</hibernate.version>
+ <jaxb.version>2.3.2</jaxb.version>
<jackson.version>2.10.1</jackson.version>
<jackson.databind.version>2.10.1</jackson.databind.version>
<onap.logging.version>1.6.1</onap.logging.version>
@@ -896,9 +897,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
<dependency>