diff --git a/api/src/main/java/jakarta/json/EmptyArray.java b/api/src/main/java/jakarta/json/EmptyArray.java
index 1f4d741..9d48dc2 100644
--- a/api/src/main/java/jakarta/json/EmptyArray.java
+++ b/api/src/main/java/jakarta/json/EmptyArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/EmptyObject.java b/api/src/main/java/jakarta/json/EmptyObject.java
index 1e58252..fa3254d 100644
--- a/api/src/main/java/jakarta/json/EmptyObject.java
+++ b/api/src/main/java/jakarta/json/EmptyObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/Json.java b/api/src/main/java/jakarta/json/Json.java
index 1649c2c..cdbc7ee 100644
--- a/api/src/main/java/jakarta/json/Json.java
+++ b/api/src/main/java/jakarta/json/Json.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonArray.java b/api/src/main/java/jakarta/json/JsonArray.java
index 49f3fbd..7c39674 100644
--- a/api/src/main/java/jakarta/json/JsonArray.java
+++ b/api/src/main/java/jakarta/json/JsonArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonArrayBuilder.java b/api/src/main/java/jakarta/json/JsonArrayBuilder.java
index 63bd229..db0c935 100644
--- a/api/src/main/java/jakarta/json/JsonArrayBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonArrayBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonBuilderFactory.java b/api/src/main/java/jakarta/json/JsonBuilderFactory.java
index 264145c..eacfd1e 100644
--- a/api/src/main/java/jakarta/json/JsonBuilderFactory.java
+++ b/api/src/main/java/jakarta/json/JsonBuilderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonException.java b/api/src/main/java/jakarta/json/JsonException.java
index 341f8c0..403cb75 100644
--- a/api/src/main/java/jakarta/json/JsonException.java
+++ b/api/src/main/java/jakarta/json/JsonException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonMergePatch.java b/api/src/main/java/jakarta/json/JsonMergePatch.java
index 98806ae..07b64d8 100644
--- a/api/src/main/java/jakarta/json/JsonMergePatch.java
+++ b/api/src/main/java/jakarta/json/JsonMergePatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonNumber.java b/api/src/main/java/jakarta/json/JsonNumber.java
index bd0e7a2..6064cb1 100644
--- a/api/src/main/java/jakarta/json/JsonNumber.java
+++ b/api/src/main/java/jakarta/json/JsonNumber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonObject.java b/api/src/main/java/jakarta/json/JsonObject.java
index f99fb7e..61f1998 100644
--- a/api/src/main/java/jakarta/json/JsonObject.java
+++ b/api/src/main/java/jakarta/json/JsonObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonObjectBuilder.java b/api/src/main/java/jakarta/json/JsonObjectBuilder.java
index bf43c17..b7fed79 100644
--- a/api/src/main/java/jakarta/json/JsonObjectBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonObjectBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonPatch.java b/api/src/main/java/jakarta/json/JsonPatch.java
index 32c306f..dea4e36 100644
--- a/api/src/main/java/jakarta/json/JsonPatch.java
+++ b/api/src/main/java/jakarta/json/JsonPatch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonPatchBuilder.java b/api/src/main/java/jakarta/json/JsonPatchBuilder.java
index 5454314..0949839 100644
--- a/api/src/main/java/jakarta/json/JsonPatchBuilder.java
+++ b/api/src/main/java/jakarta/json/JsonPatchBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonPointer.java b/api/src/main/java/jakarta/json/JsonPointer.java
index 9e4b378..a42d8d3 100644
--- a/api/src/main/java/jakarta/json/JsonPointer.java
+++ b/api/src/main/java/jakarta/json/JsonPointer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonReader.java b/api/src/main/java/jakarta/json/JsonReader.java
index a4f5fb7..b1192e6 100644
--- a/api/src/main/java/jakarta/json/JsonReader.java
+++ b/api/src/main/java/jakarta/json/JsonReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonReaderFactory.java b/api/src/main/java/jakarta/json/JsonReaderFactory.java
index c481a3f..f0ff269 100644
--- a/api/src/main/java/jakarta/json/JsonReaderFactory.java
+++ b/api/src/main/java/jakarta/json/JsonReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonString.java b/api/src/main/java/jakarta/json/JsonString.java
index d37e1d0..ae833ef 100644
--- a/api/src/main/java/jakarta/json/JsonString.java
+++ b/api/src/main/java/jakarta/json/JsonString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonStructure.java b/api/src/main/java/jakarta/json/JsonStructure.java
index 1df5d99..92c9c8d 100644
--- a/api/src/main/java/jakarta/json/JsonStructure.java
+++ b/api/src/main/java/jakarta/json/JsonStructure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonValue.java b/api/src/main/java/jakarta/json/JsonValue.java
index 76decf5..4dec772 100644
--- a/api/src/main/java/jakarta/json/JsonValue.java
+++ b/api/src/main/java/jakarta/json/JsonValue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonValueImpl.java b/api/src/main/java/jakarta/json/JsonValueImpl.java
index 468386f..16d193b 100644
--- a/api/src/main/java/jakarta/json/JsonValueImpl.java
+++ b/api/src/main/java/jakarta/json/JsonValueImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonWriter.java b/api/src/main/java/jakarta/json/JsonWriter.java
index 59c55c8..b20b607 100644
--- a/api/src/main/java/jakarta/json/JsonWriter.java
+++ b/api/src/main/java/jakarta/json/JsonWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/JsonWriterFactory.java b/api/src/main/java/jakarta/json/JsonWriterFactory.java
index faf0e2c..49fe62f 100644
--- a/api/src/main/java/jakarta/json/JsonWriterFactory.java
+++ b/api/src/main/java/jakarta/json/JsonWriterFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/package-info.java b/api/src/main/java/jakarta/json/package-info.java
index dc9e7c3..a5906ec 100644
--- a/api/src/main/java/jakarta/json/package-info.java
+++ b/api/src/main/java/jakarta/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/spi/JsonProvider.java b/api/src/main/java/jakarta/json/spi/JsonProvider.java
index 96aebc6..ea56275 100644
--- a/api/src/main/java/jakarta/json/spi/JsonProvider.java
+++ b/api/src/main/java/jakarta/json/spi/JsonProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/spi/package-info.java b/api/src/main/java/jakarta/json/spi/package-info.java
index 545b4cf..57c892b 100644
--- a/api/src/main/java/jakarta/json/spi/package-info.java
+++ b/api/src/main/java/jakarta/json/spi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonCollectors.java b/api/src/main/java/jakarta/json/stream/JsonCollectors.java
index 11ee6cd..2a1678d 100644
--- a/api/src/main/java/jakarta/json/stream/JsonCollectors.java
+++ b/api/src/main/java/jakarta/json/stream/JsonCollectors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonGenerationException.java b/api/src/main/java/jakarta/json/stream/JsonGenerationException.java
index f544526..168d673 100644
--- a/api/src/main/java/jakarta/json/stream/JsonGenerationException.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGenerationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonGenerator.java b/api/src/main/java/jakarta/json/stream/JsonGenerator.java
index 0987c15..7ca3d3f 100644
--- a/api/src/main/java/jakarta/json/stream/JsonGenerator.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java b/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
index c91d0a6..2483e7a 100644
--- a/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
+++ b/api/src/main/java/jakarta/json/stream/JsonGeneratorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonLocation.java b/api/src/main/java/jakarta/json/stream/JsonLocation.java
index 98375b6..3bf5567 100644
--- a/api/src/main/java/jakarta/json/stream/JsonLocation.java
+++ b/api/src/main/java/jakarta/json/stream/JsonLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonParser.java b/api/src/main/java/jakarta/json/stream/JsonParser.java
index 934cfaa..e455a6e 100644
--- a/api/src/main/java/jakarta/json/stream/JsonParser.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonParserFactory.java b/api/src/main/java/jakarta/json/stream/JsonParserFactory.java
index df29300..3434411 100644
--- a/api/src/main/java/jakarta/json/stream/JsonParserFactory.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParserFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/JsonParsingException.java b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
index ec6617c..ffca1e0 100644
--- a/api/src/main/java/jakarta/json/stream/JsonParsingException.java
+++ b/api/src/main/java/jakarta/json/stream/JsonParsingException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/api/src/main/java/jakarta/json/stream/package-info.java b/api/src/main/java/jakarta/json/stream/package-info.java
index 0983b46..bd57cdb 100644
--- a/api/src/main/java/jakarta/json/stream/package-info.java
+++ b/api/src/main/java/jakarta/json/stream/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/bundles/ri/pom.xml b/bundles/ri/pom.xml
index 229bab7..a8609d2 100755
--- a/bundles/ri/pom.xml
+++ b/bundles/ri/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/copyright-exclude b/copyright-exclude
deleted file mode 100644
index 3fb6681..0000000
--- a/copyright-exclude
+++ /dev/null
@@ -1,9 +0,0 @@
-.json
-.md
-/copyright-exclude
-/copyright.txt
-/META-INF/services
-speclicense.html
-/bundles/ri/src/main/resources/LICENSE.txt
-/bundles/ri/src/main/resources/README.txt
-/LICENSE.txt
\ No newline at end of file
diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
index 01d6f29..ebe196f 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
index ebabfd3..fe1fb76 100644
--- a/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
+++ b/demos/customprovider-jdk9/src/main/java/org/glassfish/json/customprovider/TestProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/customprovider-jdk9/src/main/jdk9/module-info.java b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
index 3804603..51cc9d8 100644
--- a/demos/customprovider-jdk9/src/main/jdk9/module-info.java
+++ b/demos/customprovider-jdk9/src/main/jdk9/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
index da98a60..55c0a70 100644
--- a/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
+++ b/demos/customprovider-jdk9/src/test/java/customprovider/test/TestProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/facebook/pom.xml b/demos/facebook/pom.xml
index f45c135..fc0fd68 100644
--- a/demos/facebook/pom.xml
+++ b/demos/facebook/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
index 1f7a297..41114d1 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookObjectSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
index 17f555f..be1aa88 100644
--- a/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
+++ b/demos/facebook/src/main/java/org/glassfish/jsondemos/facebook/FacebookStreamSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/facebook/src/main/jdk9/module-info.java b/demos/facebook/src/main/jdk9/module-info.java
index 5c6ca79..433f5cd 100644
--- a/demos/facebook/src/main/jdk9/module-info.java
+++ b/demos/facebook/src/main/jdk9/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/facebook/src/main/resources/facebookconfig.properties b/demos/facebook/src/main/resources/facebookconfig.properties
index 2113545..f801f7d 100644
--- a/demos/facebook/src/main/resources/facebookconfig.properties
+++ b/demos/facebook/src/main/resources/facebookconfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,4 +8,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+
 access_token=
diff --git a/demos/jaxrs/pom.xml b/demos/jaxrs/pom.xml
index 16ff052..2b00f58 100644
--- a/demos/jaxrs/pom.xml
+++ b/demos/jaxrs/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
index 58de870..126c93d 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/GeneratorResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
index 731501a..726fbc3 100644
--- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
+++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ParserResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/jsonpointer/pom.xml b/demos/jsonpointer/pom.xml
index d5abd6f..d3647c5 100644
--- a/demos/jsonpointer/pom.xml
+++ b/demos/jsonpointer/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
index 5a8c067..241e237 100644
--- a/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
+++ b/demos/jsonpointer/src/main/java/org/glassfish/jsondemos/jsonpointer/JsonpointerDemo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/jsonpointer/src/main/jdk9/module-info.java b/demos/jsonpointer/src/main/jdk9/module-info.java
index ad5d0fe..24218f7 100644
--- a/demos/jsonpointer/src/main/jdk9/module-info.java
+++ b/demos/jsonpointer/src/main/jdk9/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/pom.xml b/demos/pom.xml
index 364d8fc..2ab7865 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/servlet/pom.xml b/demos/servlet/pom.xml
index 095ae3d..bf841e3 100644
--- a/demos/servlet/pom.xml
+++ b/demos/servlet/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
index 0dc077d..7bbbe5f 100644
--- a/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
+++ b/demos/servlet/src/main/java/org/glassfish/jsondemos/servlet/ArrayServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
index 5b61e9a..89f5300 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterObjectSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
index c71ef46..1271655 100644
--- a/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
+++ b/demos/twitter/src/main/java/org/glassfish/jsondemos/twitter/TwitterStreamSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/twitter/src/main/jdk9/module-info.java b/demos/twitter/src/main/jdk9/module-info.java
index cc1cd56..0eaadbd 100644
--- a/demos/twitter/src/main/jdk9/module-info.java
+++ b/demos/twitter/src/main/jdk9/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
diff --git a/demos/twitter/src/main/resources/twitterconfig.properties b/demos/twitter/src/main/resources/twitterconfig.properties
index 45a4255..87b5d72 100644
--- a/demos/twitter/src/main/resources/twitterconfig.properties
+++ b/demos/twitter/src/main/resources/twitterconfig.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -8,6 +8,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
+
 consumer-key=
 consumer-secret=
 access-token=
diff --git a/etc/config/copyright-exclude b/etc/config/copyright-exclude
new file mode 100644
index 0000000..e7f6f88
--- /dev/null
+++ b/etc/config/copyright-exclude
@@ -0,0 +1,8 @@
+.json
+.md
+speclicense.html
+MANIFEST.MF
+/META-INF/services/
+/etc/config/copyright-exclude
+/etc/config/copyright.txt
+/bundles/ri/src/main/resources/README.txt
diff --git a/etc/config/copyright.txt b/etc/config/copyright.txt
new file mode 100644
index 0000000..9c347b6
--- /dev/null
+++ b/etc/config/copyright.txt
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) YYYY Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
diff --git a/etc/config/exclude.xml b/etc/config/exclude.xml
new file mode 100644
index 0000000..7380f9d
--- /dev/null
+++ b/etc/config/exclude.xml
@@ -0,0 +1,14 @@
+<!--
+
+    Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Distribution License v. 1.0, which is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<FindBugsFilter>
+</FindBugsFilter>
diff --git a/gf/customprovider/pom.xml b/gf/customprovider/pom.xml
index 593ee61..a032b11 100644
--- a/gf/customprovider/pom.xml
+++ b/gf/customprovider/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
index cbccf00..c11f013 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestGenerator.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
index 3015d1b..ee1ffcb 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
index 92aa0f3..9a3c1c0 100644
--- a/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
+++ b/gf/customprovider/src/main/java/org/glassfish/json/customprovider/TestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/defaultprovider/pom.xml b/gf/defaultprovider/pom.xml
index 412f2cd..de7d2cd 100644
--- a/gf/defaultprovider/pom.xml
+++ b/gf/defaultprovider/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
index 782521c..0075497 100644
--- a/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
+++ b/gf/defaultprovider/src/main/java/org/glassfish/json/defaultprovider/TestServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/gf/pom.xml b/gf/pom.xml
index 7891870..2e091bc 100644
--- a/gf/pom.xml
+++ b/gf/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/BufferPoolImpl.java b/impl/src/main/java/org/glassfish/json/BufferPoolImpl.java
index 36d8635..460c6f7 100644
--- a/impl/src/main/java/org/glassfish/json/BufferPoolImpl.java
+++ b/impl/src/main/java/org/glassfish/json/BufferPoolImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
index 482c8e0..3498e9a 100644
--- a/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonBuilderFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
index fdff105..e347641 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
index a06a65e..f3dcc08 100644
--- a/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonGeneratorImpl.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
index e488a49..f5ff424 100644
--- a/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonLocationImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
index 9d9df6e..75e0157 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMergePatchImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonMessages.java b/impl/src/main/java/org/glassfish/json/JsonMessages.java
index 482198d..fd954ac 100644
--- a/impl/src/main/java/org/glassfish/json/JsonMessages.java
+++ b/impl/src/main/java/org/glassfish/json/JsonMessages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
index 9cc896d..fb6203c 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java b/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
index 8710ee7..23e86e7 100644
--- a/impl/src/main/java/org/glassfish/json/JsonParserImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonParserImpl.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
index 82ddc3b..32e7565 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPatchBuilderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
index f6eba73..b91a576 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPointerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
index da845b4..ec6865f 100644
--- a/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonPrettyGeneratorImpl.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
index bbb435b..ce3627b 100644
--- a/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
index 15a02bf..464fc8e 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
index f22749d..81b1e0a 100644
--- a/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonReaderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
index d597069..ca9fb4f 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStringImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
index 242eca0..e57dafa 100644
--- a/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
+++ b/impl/src/main/java/org/glassfish/json/JsonStructureParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
index 8ace1f4..be2b952 100644
--- a/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
+++ b/impl/src/main/java/org/glassfish/json/JsonTokenizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonUtil.java b/impl/src/main/java/org/glassfish/json/JsonUtil.java
index cce2aeb..9220d52 100644
--- a/impl/src/main/java/org/glassfish/json/JsonUtil.java
+++ b/impl/src/main/java/org/glassfish/json/JsonUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
index d81bc1e..b1482f8 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
index 2f9d68c..d7cf86d 100644
--- a/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
+++ b/impl/src/main/java/org/glassfish/json/JsonWriterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/MapUtil.java b/impl/src/main/java/org/glassfish/json/MapUtil.java
index 1975973..da505bb 100644
--- a/impl/src/main/java/org/glassfish/json/MapUtil.java
+++ b/impl/src/main/java/org/glassfish/json/MapUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/NodeReference.java b/impl/src/main/java/org/glassfish/json/NodeReference.java
index d5184e4..744655e 100644
--- a/impl/src/main/java/org/glassfish/json/NodeReference.java
+++ b/impl/src/main/java/org/glassfish/json/NodeReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
index 282991b..d40d45e 100644
--- a/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
+++ b/impl/src/main/java/org/glassfish/json/UnicodeDetectingInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/java/org/glassfish/json/api/BufferPool.java b/impl/src/main/java/org/glassfish/json/api/BufferPool.java
index 7253615..1141ff0 100644
--- a/impl/src/main/java/org/glassfish/json/api/BufferPool.java
+++ b/impl/src/main/java/org/glassfish/json/api/BufferPool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/jdk9/module-info.java b/impl/src/main/jdk9/module-info.java
index e0e20eb..532a37b 100644
--- a/impl/src/main/jdk9/module-info.java
+++ b/impl/src/main/jdk9/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/impl/src/main/resources/org/glassfish/json/messages.properties b/impl/src/main/resources/org/glassfish/json/messages.properties
index 959df2e..aa3ad16 100644
--- a/impl/src/main/resources/org/glassfish/json/messages.properties
+++ b/impl/src/main/resources/org/glassfish/json/messages.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,6 +14,7 @@
 # SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 #
 
+
 internal.error=Internal Error
 
 parser.getString.err=JsonParser#getString() is valid only for KEY_NAME, VALUE_STRING, VALUE_NUMBER parser states. \
diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
index f6797b7..8daed9d 100644
--- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
+++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
index 6e7208d..cd96be1 100644
--- a/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
+++ b/jaxrs-1x/src/main/java/org/glassfish/json/jaxrs1x/JsonStructureBodyWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/pom.xml b/pom.xml
index 867b978..e60758a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,24 +88,63 @@
         <non.final>false</non.final>
         <legal.doc.source>${maven.multiModuleProjectDirectory}</legal.doc.source>
         <javadoc.link.jdk>http://docs.oracle.com/javase/8/docs/api</javadoc.link.jdk>
+        <config.dir>${project.root.location}/etc/config</config.dir>
+        <copyright.exclude>${config.dir}/copyright-exclude</copyright.exclude>
+        <copyright.templatefile>${config.dir}/copyright.txt</copyright.templatefile>
+        <copyright.ignoreyear>false</copyright.ignoreyear>
+        <copyright.scmonly>true</copyright.scmonly>
+        <copyright.update>false</copyright.update>
+        <spotbugs.exclude>${config.dir}/exclude.xml</spotbugs.exclude>
+        <spotbugs.skip>false</spotbugs.skip>
+        <spotbugs.threshold>Low</spotbugs.threshold>
+        <spotbugs.version>3.1.12.2</spotbugs.version>
     </properties>
 
     <build>
         <plugins>
             <plugin>
+                <groupId>org.commonjava.maven.plugins</groupId>
+                <artifactId>directory-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>find-project-root</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>highest-basedir</goal>
+                        </goals>
+                        <configuration>
+                            <property>project.root.location</property>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
+            <!-- Requires validate target to initialize copyright.config.dir properly -->
+            <!-- e.g. mvn validate glassfish-copyright:repair -->
             <plugin>
                 <groupId>org.glassfish.copyright</groupId>
                 <artifactId>glassfish-copyright-maven-plugin</artifactId>
                 <configuration>
-                    <templateFile>copyright.txt</templateFile>
-                    <excludeFile>copyright-exclude</excludeFile>
-                    <scm>git</scm>
-                    <scmOnly>true</scmOnly>
-                    <warn>false</warn>
+                    <templateFile>${copyright.templatefile}</templateFile>
+                    <excludeFile>${copyright.exclude}</excludeFile>
+                    <!-- skip files not under SCM-->
+                    <scmOnly>${copyright.scmonly}</scmOnly>
+                    <!-- for use with repair -->
+                    <update>${copyright.update}</update>
+                    <!-- check that year is correct -->
+                    <ignoreYear>${copyright.ignoreyear}</ignoreYear>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>verify</phase>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -159,6 +198,16 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.commonjava.maven.plugins</groupId>
+                    <artifactId>directory-maven-plugin</artifactId>
+                    <version>0.3.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.github.spotbugs</groupId>
+                    <artifactId>spotbugs-maven-plugin</artifactId>
+                    <version>${spotbugs.version}</version>
+                </plugin>
+                <plugin>
                     <groupId>org.glassfish.build</groupId>
                     <artifactId>spec-version-maven-plugin</artifactId>
                     <version>1.5</version>
@@ -166,7 +215,7 @@
                 <plugin>
                     <groupId>org.glassfish.copyright</groupId>
                     <artifactId>glassfish-copyright-maven-plugin</artifactId>
-                    <version>1.49</version>
+                    <version>2.3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
@@ -351,6 +400,7 @@
     </dependencyManagement>
 
     <profiles>
+
         <profile>
             <id>release</id>
             <modules>
@@ -434,6 +484,7 @@
                 </plugins>
             </build>
         </profile>
+
         <profile>
             <id>jdk9-all</id>
             <activation>
@@ -477,15 +528,25 @@
                 <module>bundles</module>
             </modules>
         </profile>
+
     </profiles>
 
     <reporting>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.5</version>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <configuration>
+                    <skip>${spotbugs.skip}</skip>
+                    <threshold>${spotbugs.threshold}</threshold>
+                    <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+                    <excludeFilterFile>
+                        ${spotbugs.exclude}
+                    </excludeFilterFile>
+                    <fork>true</fork>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>
+
 </project>
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
index e04a9a6..c41881b 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
index 8809574..20057e7 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
index df255ab..c71ac3d 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
index f047750..4241573 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
index bba031a..183725c 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
index 227608d..5f87e07 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
index 4fed520..24f8f8b 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
index 4d76300..d839140 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
index 450faa8..c222cdb 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
index 9627f77..72a17fd 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
index e7cb155..ed5d6c9 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.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.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
index 3e17de5..425ca52 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
index 089dab9..afe1e87 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
index 1607faa..ded202f 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
index a1e3909..0742cbb 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
index dfda6e3..08f3004 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
index 5330320..5fe2fe6 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
index de77a1a..904d405 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
index 2fce02d..1211261 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
index 5ef5b20..a4661d9 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
index 9b79c18..6615e2f 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
index dcfaa48..4da85b6 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
index 0e26778..a7fca4d 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
index 68b50ef..dd2702c 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
index 4dcff40..af63746 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
index 375d9f8..c097d4e 100644
--- a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
index e809060..b4b7da8 100644
--- a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
+++ b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
index cf5d561..94893a2 100644
--- a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
diff --git a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
index b1ce9e4..342d626 100644
--- a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
+++ b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at