diff --git a/jaxws-ri/extras/jaxws-maven-plugin/copyright-exclude b/jaxws-ri/extras/jaxws-maven-plugin/copyright-exclude
index 84180bfb2..2965fa03b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/copyright-exclude
+++ b/jaxws-ri/extras/jaxws-maven-plugin/copyright-exclude
@@ -1,6 +1,7 @@
 /MANIFEST.MF
 /META-INF/services/
 /README
+.apt
 .gif
 .jpg
 .jpeg
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/exclude.xml b/jaxws-ri/extras/jaxws-maven-plugin/exclude.xml
index 713f44b5c..323a316c8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/exclude.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/exclude.xml
@@ -2,7 +2,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/client/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/client/pom.xml
index 0d0523322..4285670c0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/client/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/client/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/pom.xml
index f3040f03b..375c1ccfd 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/server/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/server/pom.xml
index 8b6679885..50b53588d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/server/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/jaxws-ri-samples/fromwsdl/server/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/pom.xml
index 637a2cf2d..2e7485557 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/java/org/codehaus/mojo/jaxws/it/HelloWorldImpl.java b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/java/org/codehaus/mojo/jaxws/it/HelloWorldImpl.java
index 4d7335253..6f7b9d5dc 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/java/org/codehaus/mojo/jaxws/it/HelloWorldImpl.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/java/org/codehaus/mojo/jaxws/it/HelloWorldImpl.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/sun-jaxws.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/sun-jaxws.xml
index 97c19f4e9..79932fe41 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/sun-jaxws.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/sun-jaxws.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/web.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/web.xml
index 50702db52..3c2fd0571 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/web.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsgen/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/file/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/file/pom.xml
index 8821d96ba..ba05942d8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/file/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/file/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/url/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/url/pom.xml
index 9e4c81594..c9a484b99 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/url/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/it/wsimport/url/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java
index 22c96f301..7ee36e31d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractJaxwsMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Codehaus
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractWsGenMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractWsGenMojo.java
index a7265dbe6..3671cdf8a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractWsGenMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/AbstractWsGenMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/DependencyResolver.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/DependencyResolver.java
index f9c888756..d3c766467 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/DependencyResolver.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/DependencyResolver.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/EndorsedFilter.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/EndorsedFilter.java
index b588ff003..0a6597a88 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/EndorsedFilter.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/EndorsedFilter.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/ExclusionFilter.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/ExclusionFilter.java
index 6c0393607..1b8a90f89 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/ExclusionFilter.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/ExclusionFilter.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/Invoker.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/Invoker.java
index 9c98dc18b..2eda224d0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/Invoker.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/Invoker.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
index 6dbb5e5d4..3dc12ce54 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsImportMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsImportMojo.java
index 5a8e5ded1..d4bb03c2d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsImportMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsImportMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsGenMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsGenMojo.java
index 842929953..2c9a88c16 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsGenMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsGenMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsImportMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsImportMojo.java
index a0f26ac5d..d91e4c83a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsImportMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/TestWsImportMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java
index 279adb78b..02fa72964 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-21.html b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-21.html
index b091adaf2..b1b3ab626 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-21.html
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-21.html
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-    Copyright 2012 Oracle.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-22.html b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-22.html
index db25c7041..a676a0b3e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-22.html
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-22.html
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
-    Copyright 2012 Oracle.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-221.html b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-221.html
index c66ba73d6..3f2643c3a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-221.html
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-221.html
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
-    Copyright 2013 Oracle.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-23.html b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-23.html
index f4384a627..d6592cdf6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-23.html
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/site/resources/release-notes-23.html
@@ -1,7 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
-    Copyright 2013 Oracle.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/site/site.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/site/site.xml
index bb5b943a5..5bf65e71a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/site/site.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/site/site.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2006, 2020 Oracle and/or its affiliates. All rights reserved.
     Copyright 2006 The Codehaus.
 
     Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/invoker.properties
index 42c7ddb8e..a5e5060f8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,4 +17,5 @@
 #
 invoker.goals = jaxws:help
 invoker.goals = jaxws:help
+invoker.goals = jaxws:help
 invoker.mavenOpts = -Ddetail=true 
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/pom.xml
index 77d7ec3d3..14ea4b774 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/help/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/pom.xml
index b549567fa..a068838bf 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/src/main/java/mojo/it/jaxwscommons103/lib/EchoImpl.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/src/main/java/mojo/it/jaxwscommons103/lib/EchoImpl.java
index a5f691643..81ae93f60 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/src/main/java/mojo/it/jaxwscommons103/lib/EchoImpl.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/lib/src/main/java/mojo/it/jaxwscommons103/lib/EchoImpl.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/pom.xml
index c4620a88f..368b5818b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/pom.xml
index cb7d7001b..7b98fcbc8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/src/main/wsgen/metadata-echo.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/src/main/wsgen/metadata-echo.xml
index 373ef33fe..5790ee276 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/src/main/wsgen/metadata-echo.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-103/ws/src/main/wsgen/metadata-echo.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/pom.xml
index 68c3928a1..c72047f0a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewServlet.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewServlet.java
index 08dddbbae..856015e09 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewServlet.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewServlet.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewWebService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewWebService.java
index 131599634..61b4dc3f1 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewWebService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/java/com/mycompany/mavenproject2/NewWebService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/webapp/index.jsp b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/webapp/index.jsp
index ccbc22289..13816faa2 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/webapp/index.jsp
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-3/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-4/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-4/pom.xml
index 250e012e7..d567bb0b1 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-4/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-4/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/invoker.properties
index 3ef390f61..1ec90e5e8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,6 +17,7 @@
 #
 
 
+
 invoker.goals=clean install
 invoker.buildResult=failure
 invoker.goals.2=clean package -Dmaven.test.skip=true
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/pom.xml
index 4d7900066..72158ca87 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplA.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplA.java
index 6cf3917ca..db7c810d3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplA.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplA.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplB.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplB.java
index faee5e458..bd28ba0f2 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplB.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsImplB.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsIntf.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsIntf.java
index d7b3c1862..08f7bf06e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsIntf.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-43/src/main/java/tests/jaxwscommons43/WsIntf.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/foo/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/foo/AddService.wsdl
index 95b5ea6d6..7051b7854 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/foo/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/foo/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/pom.xml
index 3c1b96852..3fdecf70a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-49/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/pom.xml
index 07b67930d..346b0e2ca 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/a.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/a.wsdl
index 5b59189dd..a787c88fb 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/a.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/a.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/b/b.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/b/b.wsdl
index a0a2f898c..b8bdcbe2f 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/b/b.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/b/b.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/c.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/c.wsdl
index fa731be74..8f49cd396 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/c.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-62/src/mywsdls/c.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/pom.xml
index 7af3eda71..02a590127 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/jaxws/bindings-default.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/jaxws/bindings-default.xjc
index 77a8a709c..251828eea 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/jaxws/bindings-default.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/jaxws/bindings-default.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
index 3a8465aed..5244d231d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
index fb14e2a64..b7ff5f229 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/remote-xjc/bindings.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/remote-xjc/bindings.xjc
index 161732055..dae83f28e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/remote-xjc/bindings.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/remote-xjc/bindings.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/AddService.wsdl
index a03331e9a..81bbb5da3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/a.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/a.xml
index 62f2b3e74..4c0818a20 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/a.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/a.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/b.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/b.xml
index ebcd9a7b7..d74ecbab7 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/b.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/b.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/c.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/c.xml
index a6d141455..3a7032cb3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/c.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test-wsdl/xjc/c.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
index c4fc310a0..e84e2fe34 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs.wsdl
index 2a7b118a6..c68e438a0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs_schema1.xsd b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs_schema1.xsd
index f5483792c..af9e2ffe6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs_schema1.xsd
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-81/src/wsdl/HelloWs_schema1.xsd
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/pom.xml
index 0dc745f17..d86eabdcf 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/bindings/echo-handlers.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/bindings/echo-handlers.xml
index 5724f8b1d..aa0091c78 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/bindings/echo-handlers.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/bindings/echo-handlers.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/WSClientHandler.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/WSClientHandler.java
index 831541998..cd4e577c3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/WSClientHandler.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/WSClientHandler.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/wsdl/echo.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/wsdl/echo.wsdl
index 3558abada..749fdfb77 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/wsdl/echo.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/child/src/main/wsdl/echo.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/pom.xml
index 25a482089..2fbc0a929 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-87/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/pom.xml
index de235ccf8..c48ca5ea9 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/CustomEx.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/CustomEx.java
index cbb718157..cea28d97c 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/CustomEx.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/CustomEx.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/NewWebService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/NewWebService.java
index b53f869ef..0e268dd52 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/NewWebService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-91/src/main/java/com/mycompany/mavenproject2/NewWebService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/invoker.properties
index bcf8c9978..acfa2f0e0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,4 +17,5 @@
 #
 invoker.goals = clean compile
 invoker.goals = clean compile
+invoker.goals = clean compile
 invoker.goals.2 = compile
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/pom.xml
index 9e67f6ab0..612bdc35e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/main/java/org/jvnet/jax_ws_commons/jaxws/Client.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/main/java/org/jvnet/jax_ws_commons/jaxws/Client.java
index 48a130389..54e7ffa37 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/main/java/org/jvnet/jax_ws_commons/jaxws/Client.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/main/java/org/jvnet/jax_ws_commons/jaxws/Client.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/wsdl/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/wsdl/AddService.wsdl
index 0bcb36f55..218bf4c40 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/wsdl/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-95/src/wsdl/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/invoker.properties
index 78e1b0904..c6f213e04 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,3 +17,4 @@
 #
 invoker.buildResult=failure
 invoker.buildResult=failure
+invoker.buildResult=failure
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/pom.xml
index 21f91d6d7..593d0a347 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/jaxwscommons-98/pom.xml
@@ -2,7 +2,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/pom.xml
index f3fcb8e19..6e5690a4d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/jaxws/bindings-default.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/jaxws/bindings-default.xjc
index 2ef78c662..b76a8956d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/jaxws/bindings-default.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/jaxws/bindings-default.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
index 6fa0f718b..ca9e50226 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
index 20d73133f..4e34501a7 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/remote-xjc/bindings.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/remote-xjc/bindings.xjc
index d0d81cbd6..de7bab27d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/remote-xjc/bindings.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/remote-xjc/bindings.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/AddService.wsdl
index e519579e9..53667865e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/a.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/a.xml
index 5f7e8fae1..eff6b0fdd 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/a.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/a.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/b.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/b.xml
index 42c28e87a..004cb2a3e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/b.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/b.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/c.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/c.xml
index 3db0f27ac..731d64ee0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/c.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test-wsdl/xjc/c.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
index b00c6c2f5..b52e7abb9 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs.wsdl
index 0ae35f480..f6830e4e6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs_schema1.xsd b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs_schema1.xsd
index dd10dcdf5..b4d4ae888 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs_schema1.xsd
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/metro/src/wsdl/HelloWs_schema1.xsd
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/invoker.properties
index ca9c63978..474003354 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,4 +17,5 @@
 #
 
 
+
 invoker.goals=clean install
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
index 2be8a9338..f85e91c6a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/invoker.properties b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/invoker.properties
index ca9c63978..474003354 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/invoker.properties
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/invoker.properties
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-# Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # Oracle licenses this file to You under the Apache License, Version 2.0
 # (the "License"); you may not use this file except in compliance with
@@ -17,4 +17,5 @@
 #
 
 
+
 invoker.goals=clean install
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/pom.xml
index 309d4bc01..a0d1e90d2 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/META-INF/wsdl/po2.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/META-INF/wsdl/po2.wsdl
index 9d5c3fe40..00a63e94c 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/META-INF/wsdl/po2.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/META-INF/wsdl/po2.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.wsdl
index 699f863af..587e2531a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.xsd b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.xsd
index 52330d4a9..5c68bc556 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.xsd
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/ProcessOrder.xsd
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/custom/custom.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/custom/custom.wsdl
index 373c3ed5a..e69c42420 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/custom/custom.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsdl-lib/src/main/resources/custom/custom.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/pom.xml
index 3d967d694..e60488c3b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
index 3a8465aed..5244d231d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
index fb14e2a64..b7ff5f229 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
index c4fc310a0..e84e2fe34 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen217/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/pom.xml
index 8ee4c1291..0ed66968a 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
index 3a8465aed..5244d231d 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/AddService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
index fb14e2a64..b7ff5f229 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/main/java/org/jvnet/jax_ws_commons/jaxws/test/EchoService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
index c4fc310a0..e84e2fe34 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsgen22/src/test/java/org/jvnet/jax_ws_commons/jaxws/test/TService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/pom.xml
index 339cb8c65..7051b21d8 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/jaxws/bindings-default.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/jaxws/bindings-default.xjc
index 77a8a709c..251828eea 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/jaxws/bindings-default.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/jaxws/bindings-default.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/remote-xjc/bindings.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/remote-xjc/bindings.xjc
index 161732055..dae83f28e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/remote-xjc/bindings.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/remote-xjc/bindings.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/AddService.wsdl
index a03331e9a..81bbb5da3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/a.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/a.xml
index 62f2b3e74..4c0818a20 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/a.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/a.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/b.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/b.xml
index ebcd9a7b7..d74ecbab7 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/b.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/b.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/c.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/c.xml
index a6d141455..3a7032cb3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/c.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/test-wsdl/xjc/c.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs.wsdl
index 2a7b118a6..c68e438a0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs_schema1.xsd b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs_schema1.xsd
index f5483792c..af9e2ffe6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs_schema1.xsd
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport217/src/wsdl/HelloWs_schema1.xsd
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/pom.xml
index 65df35859..b27a7a89b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/pom.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/jaxws/bindings-default.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/jaxws/bindings-default.xjc
index 77a8a709c..251828eea 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/jaxws/bindings-default.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/jaxws/bindings-default.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/remote-xjc/bindings.xjc b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/remote-xjc/bindings.xjc
index 161732055..dae83f28e 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/remote-xjc/bindings.xjc
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/remote-xjc/bindings.xjc
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/AddService.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/AddService.wsdl
index a03331e9a..81bbb5da3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/AddService.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/AddService.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/a.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/a.xml
index 62f2b3e74..4c0818a20 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/a.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/a.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/b.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/b.xml
index ebcd9a7b7..d74ecbab7 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/b.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/b.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/c.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/c.xml
index a6d141455..3a7032cb3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/c.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/test-wsdl/xjc/c.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs.wsdl b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs.wsdl
index 2a7b118a6..c68e438a0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs.wsdl
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs.wsdl
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs_schema1.xsd b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs_schema1.xsd
index f5483792c..af9e2ffe6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs_schema1.xsd
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/wsimport22/src/wsdl/HelloWs_schema1.xsd
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/Assertions.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/Assertions.java
index 7f7ebffe1..9d4659bcd 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/Assertions.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/Assertions.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/HelpMojoITCase.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/HelpMojoITCase.java
index 7401ee5af..e398071a5 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/HelpMojoITCase.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/HelpMojoITCase.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/MixedITCase.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/MixedITCase.java
index 80f32843f..05a1e36e2 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/MixedITCase.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/MixedITCase.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/RepositoryITCase.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/RepositoryITCase.java
index e384ac0ac..1cd460cd6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/RepositoryITCase.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/RepositoryITCase.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsGenMojoITCase.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsGenMojoITCase.java
index bedacad8b..482d02c98 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsGenMojoITCase.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsGenMojoITCase.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoITCase.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoITCase.java
index 2334f0dee..3907c14b0 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoITCase.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoITCase.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
index b717b4c17..01494db8b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/it-settings.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/it-settings.xml
index 3dbf95524..09d3380f1 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/it-settings.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/it-settings.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy1.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy1.xml
index 36c224b2a..85946d4d5 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy1.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy1.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy2.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy2.xml
index c7ffa8331..cf3c80b06 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy2.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy2.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy3.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy3.xml
index ff049344c..af6bf07c6 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy3.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy3.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy4.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy4.xml
index 2298d6b43..50974ca3b 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy4.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/resources/org/jvnet/jax_ws_commons/jaxws/proxy4.xml
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
 
     Oracle licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/script/setproxy.groovy b/jaxws-ri/extras/jaxws-maven-plugin/src/test/script/setproxy.groovy
index 6687608ae..8dbf79bed 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/script/setproxy.groovy
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/script/setproxy.groovy
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/src/main/resources/copyright-exclude b/jaxws-ri/src/main/resources/copyright-exclude
index 9a51d8e61..b520c910b 100644
--- a/jaxws-ri/src/main/resources/copyright-exclude
+++ b/jaxws-ri/src/main/resources/copyright-exclude
@@ -1,6 +1,7 @@
 /MANIFEST.MF
 /META-INF/services/
 /README
+.apt
 .gif
 .jpg
 .jpeg