From a9120bc523bc61c1e9dc32e1e9905c3c062f9293 Mon Sep 17 00:00:00 2001
From: Villu Ruusmann <villu.ruusmann@gmail.com>
Date: Sat, 13 Feb 2021 21:11:58 +0200
Subject: [PATCH] Improved build configuration

---
 pmml-evaluator/pom.xml | 17 ++++++-----------
 pom.xml                |  7 +++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pmml-evaluator/pom.xml b/pmml-evaluator/pom.xml
index 6bfa8628..89f1bee7 100644
--- a/pmml-evaluator/pom.xml
+++ b/pmml-evaluator/pom.xml
@@ -29,17 +29,6 @@
 			<artifactId>pmml-model</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.jpmml</groupId>
-			<artifactId>pmml-model-metro</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.jpmml</groupId>
-			<artifactId>pmml-model-moxy</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -56,6 +45,12 @@
 			<optional>true</optional>
 		</dependency>
 
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/pom.xml b/pom.xml
index 5c4f17e0..0bb5787a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,6 +200,13 @@
 				<version>1.19</version>
 			</dependency>
 
+			<!-- Inherited from org.jpmml:pmml-model-metro and org.jpmml:pmml-model-moxy dependencies -->
+			<dependency>
+				<groupId>org.glassfish.jaxb</groupId>
+				<artifactId>jaxb-runtime</artifactId>
+				<version>2.3.3</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>