summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-02-24 13:55:38 +0200
committerIttay Stern <ittay.stern@att.com>2020-02-24 16:42:58 +0200
commit0f8e77d9ae21a0738c7c66b9522b5f7dce785015 (patch)
tree9f93f1e775da322251f6dc194fe6726b6ab7ff91
parent0f9b9e00ca74495e0beef32b0633bebac662ed61 (diff)
Maven import jakarta XML Binding
Fills-up missing libs in JDK-11 Issue-ID: VID-498 Change-Id: Iac2da61527b28675c65b05fcef57c0feff0f090a Signed-off-by: Ittay Stern <ittay.stern@att.com>
-rwxr-xr-xepsdk-app-onap/pom.xml15
-rwxr-xr-xvid-app-common/pom.xml7
-rw-r--r--vid-ext-services-simulator/pom.xml15
3 files changed, 28 insertions, 9 deletions
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index a7ce6b492..489fd309e 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -26,6 +26,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<epsdk.version>2.6.0</epsdk.version>
<epsdk.overlay.version>2.5.0</epsdk.overlay.version>
+ <jaxb.version>2.3.2</jaxb.version>
<jackson.version>2.10.1</jackson.version>
<jackson.databind.version>2.10.1</jackson.databind.version>
<springframework.version>5.2.3.RELEASE</springframework.version>
@@ -467,10 +468,18 @@
<version>${springframework.version}</version>
</dependency>
+ <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+ <!-- API -->
<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>
+ <!-- Runtime -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
</dependencies>
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>
diff --git a/vid-ext-services-simulator/pom.xml b/vid-ext-services-simulator/pom.xml
index b3179cf5e..7c0432e91 100644
--- a/vid-ext-services-simulator/pom.xml
+++ b/vid-ext-services-simulator/pom.xml
@@ -14,6 +14,7 @@
<encoding>UTF-8</encoding>
<springframework.version>5.1.9.RELEASE</springframework.version>
<hibernate.version>5.3.4.Final</hibernate.version>
+ <jaxb.version>2.3.2</jaxb.version>
<jackson.version>2.9.9</jackson.version>
<jackson.databind.version>2.9.9.3</jackson.databind.version>
<!-- Skip assembling the zip by default -->
@@ -145,10 +146,18 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
+ <!-- https://eclipse-ee4j.github.io/jaxb-ri/#maven-artifacts -->
+ <!-- API -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <!-- Runtime -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>${jaxb.version}</version>
</dependency>
<dependency>