diff --git a/.gitignore b/.gitignore
index c54117203f..fe56746dfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,5 +85,6 @@ transaction.log
 *-shell.log
 
 apache-cxf/cxf-aegis/baeldung.xml
+testing-modules/report-*.json
 
 libraries-2/*.db
\ No newline at end of file
diff --git a/spring-soap/.gitignore b/spring-soap/.gitignore
index b83d22266a..cce17abdb9 100644
--- a/spring-soap/.gitignore
+++ b/spring-soap/.gitignore
@@ -1 +1,2 @@
 /target/
+sun-jaxb.episode
diff --git a/spring-soap/pom.xml b/spring-soap/pom.xml
index 137ff03c31..bea3d033e6 100644
--- a/spring-soap/pom.xml
+++ b/spring-soap/pom.xml
@@ -75,6 +75,7 @@
                     <generateDirectory>${project.basedir}/src/main/java</generateDirectory>
                     <generatePackage>com.baeldung.springsoap.client.gen</generatePackage>
                     <schemaDirectory>${project.basedir}/src/main/resources</schemaDirectory>
+                    <noFileHeader>true</noFileHeader>
                     <schemaIncludes>
                         <include>countries.wsdl</include>
                     </schemaIncludes>
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Country.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Country.java
index e17dce55f9..bb196d625d 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Country.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Country.java
@@ -1,10 +1,3 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 
 package com.baeldung.springsoap.client.gen;
 
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Currency.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Currency.java
index 12fdef58c2..023a8103e5 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Currency.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/Currency.java
@@ -1,10 +1,3 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 
 package com.baeldung.springsoap.client.gen;
 
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryRequest.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryRequest.java
index 5739ee3b96..dcd5b1f08b 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryRequest.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryRequest.java
@@ -1,10 +1,3 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 
 package com.baeldung.springsoap.client.gen;
 
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryResponse.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryResponse.java
index ba1ab56cf8..11135c32e1 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryResponse.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/GetCountryResponse.java
@@ -1,10 +1,3 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 
 package com.baeldung.springsoap.client.gen;
 
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/ObjectFactory.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/ObjectFactory.java
index 88b27245be..e6d56d5aba 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/ObjectFactory.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/ObjectFactory.java
@@ -1,10 +1,3 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 
 package com.baeldung.springsoap.client.gen;
 
diff --git a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/package-info.java b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/package-info.java
index eefed169a8..9432e0c328 100644
--- a/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/package-info.java
+++ b/spring-soap/src/main/java/com/baeldung/springsoap/client/gen/package-info.java
@@ -1,9 +1,2 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.3.0 
-// See <a href="https://javaee.github.io/jaxb-v2/">https://javaee.github.io/jaxb-v2/</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2020.04.25 at 03:18:49 PM IST 
-//
-
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.baeldung.com/springsoap/gen", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package com.baeldung.springsoap.client.gen;