From 4d6fc38eb1ba2f09d53cd8ab2b89ccd68dda22b6 Mon Sep 17 00:00:00 2001
From: liamfallon <liam.fallon@ericsson.com>
Date: Wed, 27 Jun 2018 12:50:17 +0100
Subject: Resolve JAXB license issue, use Eclipselink

Replaced Glassfish-based JAXB processing with eclipselink based JAXB
processing to resolve license issues.

Updated version of eclipselink from 2.6.2 to 2.6.5

Supporessed warning about use of Java APIs.

Issue-ID: POLICY-905
Change-Id: I68094230b710e971d096decfffdb53b003c5872f
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
---
 .../plugins-event-carrier-kafka/pom.xml            |  4 ++--
 .../plugins-event-protocol-xml/pom.xml             | 23 ++++------------------
 2 files changed, 6 insertions(+), 21 deletions(-)

(limited to 'plugins/plugins-event')

diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
index f9bc16799..297b3c47d 100644
--- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
+++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-kafka/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>${kafka.version}</version>
+            <version>${version.kafka}</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
index a200faa49..00f2938e5 100644
--- a/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
+++ b/plugins/plugins-event/plugins-event-protocol/plugins-event-protocol-xml/pom.xml
@@ -36,30 +36,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jvnet.jaxb2.maven2</groupId>
-            <artifactId>maven-jaxb2-plugin</artifactId>
-            <version>0.14.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-utils</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.ant</groupId>
-                    <artifactId>ant</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.eclipse.persistence</groupId>
+            <artifactId>eclipselink</artifactId>
+            <version>${version.eclipselink}</version>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>jaxb2-basics-runtime</artifactId>
             <version>1.11.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.10.3</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -116,4 +101,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
-- 
cgit 1.2.3-korg