From 51fb6ad20b0944b7b507ea82d39e209160a28709 Mon Sep 17 00:00:00 2001
From: Andreas Gudian <agudian@apache.org>
Date: Wed, 19 Mar 2014 20:37:10 +0100
Subject: [PATCH] JDK8 compatibility: update surefire, update jacoco, add
 workaround for security error in xjc execution

---
 integrationtest/pom.xml | 27 +++++++++++++++++++++++++++
 parent/pom.xml          | 34 ++++++++++++++++++++++++++--------
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 3f38e0c4b..f0b76ba03 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -114,6 +114,30 @@
 
     <build>
         <plugins>
+			<plugin>
+			    <!--
+			         As a workaround to a bug in JDK8, where a security error is thrown for "xjc.xsd"
+			         being loaded with protocol 'file', even though we specified '-disableXmlSecurity',
+			         we set a system property to suppress the error
+			    -->
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>set-system-properties</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<properties>
+						<property>
+							<name>javax.xml.accessExternalSchema</name>
+							<value>file</value>
+						</property>
+					</properties>
+				</configuration>
+			</plugin>
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
                 <artifactId>maven-jaxb2-plugin</artifactId>
@@ -136,6 +160,9 @@
                     <extension>true</extension>
                     <verbose>true</verbose>
                     <specVersion>2.1</specVersion>
+                    <args>
+                        <arg>-disableXmlSecurity</arg>
+                     </args>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 53b6bd319..7e0e7118c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -298,7 +298,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.16</version>
+                    <version>2.17</version>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila.maven-license-plugin</groupId>
@@ -344,7 +344,7 @@
                                     <pluginExecutionFilter>
                                         <groupId>org.jacoco</groupId>
                                         <artifactId>jacoco-maven-plugin</artifactId>
-                                        <versionRange>[0.6,)</versionRange>
+                                        <versionRange>[0.7,)</versionRange>
                                         <goals>
                                             <goal>prepare-agent</goal>
                                         </goals>
@@ -353,6 +353,19 @@
                                         <ignore />
                                     </action>
                                 </pluginExecution>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.codehaus.mojo</groupId>
+                                        <artifactId>properties-maven-plugin</artifactId>
+                                        <versionRange>[1.0-alpha-2,)</versionRange>
+                                        <goals>
+                                            <goal>set-system-properties</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
                             </pluginExecutions>
                         </lifecycleMappingMetadata>
                     </configuration>
@@ -360,13 +373,18 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.6.3.201306030806</version>
+                    <version>0.7.0.201403182114</version>
                 </plugin>
-            <plugin>
-                <groupId>org.jvnet.jaxb2.maven2</groupId>
-                <artifactId>maven-jaxb2-plugin</artifactId>
-                <version>0.8.3</version>
-            </plugin>
+	            <plugin>
+	                <groupId>org.jvnet.jaxb2.maven2</groupId>
+	                <artifactId>maven-jaxb2-plugin</artifactId>
+	                <version>0.8.3</version>
+	            </plugin>
+	            <plugin>
+	                <groupId>org.codehaus.mojo</groupId>
+	                <artifactId>properties-maven-plugin</artifactId>
+	                <version>1.0-alpha-2</version>
+	            </plugin>
             </plugins>
         </pluginManagement>