diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 2c2f4abb7..632947f7a 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -115,30 +115,6 @@
 
     <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>
@@ -161,9 +137,6 @@
                     <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 6fe658d04..d7a1ebce8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -417,7 +417,7 @@
 	            <plugin>
 	                <groupId>org.jvnet.jaxb2.maven2</groupId>
 	                <artifactId>maven-jaxb2-plugin</artifactId>
-	                <version>0.8.3</version>
+	                <version>0.9.0</version>
 	            </plugin>
 	            <plugin>
 	                <groupId>org.codehaus.mojo</groupId>