From ed35a5e8e6edb213be2f56fe9d0c156bd175cdaf Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 24 Jan 2018 10:42:29 +0100
Subject: updates to use java compiler from Java 9 package

---
 pom.xml | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 54 insertions(+), 9 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index ebf62ce1..05a290f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,9 @@
   <url>http://joinup.ec.europa.eu/site/mocca/</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    
+    <jaxb.version>2.3.0</jaxb.version>
+    <activation.version>1.1.1</activation.version>
   </properties>
   <modules>
     <module>utils</module>
@@ -127,11 +130,14 @@
           <version>1.0</version>
         </plugin>
         <plugin>
-          <artifactId>webstart-maven-plugin</artifactId>
+          <!-- <artifactId>webstart-maven-plugin</artifactId>
           <groupId>org.codehaus.mojo.webstart</groupId>
-          <!-- for pkcs11-sign, use patched webstart-maven-plugin
-          <version>1.0-beta-1-SNAPSHOT</version-->
-          <version>1.0-alpha-2</version>
+          for pkcs11-sign, use patched webstart-maven-plugin
+          <version>1.0-beta-1-SNAPSHOT</version
+          <version>1.0-alpha-2</version> -->
+          <groupId>org.codehaus.mojo</groupId>
+    	  <artifactId>webstart-maven-plugin</artifactId>
+    	  <version>1.0-beta-7</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
@@ -399,12 +405,17 @@
       <dependency>
     	<groupId>org.glassfish.jaxb</groupId>
     	<artifactId>jaxb-runtime</artifactId>
-    	<version>2.3.0</version>
+    	<version>${jaxb.version}</version>
 	  </dependency>
-      <dependency>
-    	<groupId>org.glassfish.metro</groupId>
-    	<artifactId>webservices-rt</artifactId>
-    	<version>2.3.1</version>
+	  <dependency>
+    	<groupId>javax.xml.bind</groupId>
+    	<artifactId>jaxb-api</artifactId>
+    	<version>${jaxb.version}</version>
+	  </dependency>
+	  <dependency>
+    	<groupId>javax.activation</groupId>
+    	<artifactId>activation</artifactId>
+    	<version>${activation.version}</version>
 	  </dependency>
       <!-- version not defined in BKUOnline pom "include-webstart" profile,
        |   it wouldn't be adjusted by release:prepare -->
@@ -463,6 +474,40 @@
         <type>jar</type>
         <scope>compile</scope>
       </dependency>
+     
+     <!-- For testing -->
+	<dependency>
+    	<groupId>org.glassfish.metro</groupId>
+    	<artifactId>webservices-rt</artifactId>
+    	<version>2.3.1</version>
+    	<scope>test</scope>
+	</dependency>
+    <dependency>
+    	<groupId>javax.activation</groupId>
+    	<artifactId>activation</artifactId>
+    	<version>${activation.version}</version>
+    	<scope>test</scope>
+	</dependency> 
+     <dependency>
+    	<groupId>com.sun.xml.bind</groupId>
+    	<artifactId>jaxb-impl</artifactId>
+    	<version>${jaxb.version}</version>
+    	<scope>test</scope>    	
+	</dependency>
+	<dependency>
+    	<groupId>com.sun.xml.bind</groupId>
+    	<artifactId>jaxb-core</artifactId>
+    	<version>${jaxb.version}</version>
+    	<scope>test</scope>
+	</dependency>
+	<dependency>
+    	<groupId>javax.xml.bind</groupId>
+    	<artifactId>jaxb-api</artifactId>
+    	<version>${jaxb.version}</version>
+    	<scope>test</scope>
+	</dependency>
+      
+      
     </dependencies>
   </dependencyManagement>
   <distributionManagement>
-- 
cgit v1.2.3