diff --git a/bin/beaches.scm b/bin/beaches.scm
index 7327325c9..e433d412b 100644
--- a/bin/beaches.scm
+++ b/bin/beaches.scm
@@ -1,5 +1,5 @@
 ;;;
-;;;  Copyright (C) 2002-2019  The FreeCol Team
+;;;  Copyright (C) 2002-2022  The FreeCol Team
 ;;;
 ;;;  This file is part of FreeCol.
 ;;;
diff --git a/bin/borders.scm b/bin/borders.scm
index 8155dcb3e..b79f3f719 100644
--- a/bin/borders.scm
+++ b/bin/borders.scm
@@ -1,5 +1,5 @@
 ;;;
-;;;  Copyright (C) 2002-2019  The FreeCol Team
+;;;  Copyright (C) 2002-2022  The FreeCol Team
 ;;;
 ;;;  This file is part of FreeCol.
 ;;;
diff --git a/bin/forests.scm b/bin/forests.scm
index e423481d2..3aea87f14 100644
--- a/bin/forests.scm
+++ b/bin/forests.scm
@@ -1,5 +1,5 @@
 ;;;
-;;;  Copyright (C) 2002-2019  The FreeCol Team
+;;;  Copyright (C) 2002-2022  The FreeCol Team
 ;;;
 ;;;  This file is part of FreeCol.
 ;;;
diff --git a/bin/rivers.scm b/bin/rivers.scm
index 7db03914a..bb83af3ce 100644
--- a/bin/rivers.scm
+++ b/bin/rivers.scm
@@ -1,5 +1,5 @@
 ;;;
-;;;  Copyright (C) 2002-2019  The FreeCol Team
+;;;  Copyright (C) 2002-2022  The FreeCol Team
 ;;;
 ;;;  This file is part of FreeCol.
 ;;;
diff --git a/data/base/client-options.xml b/data/base/client-options.xml
index b7bf5cdcd..8b075cf73 100644
--- a/data/base/client-options.xml
+++ b/data/base/client-options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/base/roles-compat.xml b/data/base/roles-compat.xml
index a2c599238..688d75be4 100644
--- a/data/base/roles-compat.xml
+++ b/data/base/roles-compat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/base/unit-change-types-compat.xml b/data/base/unit-change-types-compat.xml
index ccdd61593..3e4ac69d4 100644
--- a/data/base/unit-change-types-compat.xml
+++ b/data/base/unit-change-types-compat.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/mods/bryce/specification.xml b/data/mods/bryce/specification.xml
index 3565289fd..6395a1b8c 100644
--- a/data/mods/bryce/specification.xml
+++ b/data/mods/bryce/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/mods/convertUpgrade/specification.xml b/data/mods/convertUpgrade/specification.xml
index 8bf99c753..468238fc8 100644
--- a/data/mods/convertUpgrade/specification.xml
+++ b/data/mods/convertUpgrade/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/mods/example/specification.xml b/data/mods/example/specification.xml
index 2503458f2..8586a6537 100644
--- a/data/mods/example/specification.xml
+++ b/data/mods/example/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/mods/plantForest/specification.xml b/data/mods/plantForest/specification.xml
index 9f100f950..a66838859 100644
--- a/data/mods/plantForest/specification.xml
+++ b/data/mods/plantForest/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/rules/classic/specification.xml b/data/rules/classic/specification.xml
index 58ea21ed2..feda22f39 100644
--- a/data/rules/classic/specification.xml
+++ b/data/rules/classic/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/rules/freecol/specification.xml b/data/rules/freecol/specification.xml
index 7c2fa145e..b2b88b48a 100644
--- a/data/rules/freecol/specification.xml
+++ b/data/rules/freecol/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/data/rules/testing/specification.xml b/data/rules/testing/specification.xml
index d19721c58..fa3359078 100644
--- a/data/rules/testing/specification.xml
+++ b/data/rules/testing/specification.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    *  Copyright (C) 2002-2021  The FreeCol Team
+    *  Copyright (C) 2002-2022  The FreeCol Team
     *
     *  This file is part of FreeCol.
     *
diff --git a/test/src/net/sf/freecol/AllTests.java b/test/src/net/sf/freecol/AllTests.java
index 324491e16..36371a46e 100644
--- a/test/src/net/sf/freecol/AllTests.java
+++ b/test/src/net/sf/freecol/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/AllTests.java b/test/src/net/sf/freecol/client/AllTests.java
index 9623cde83..9d1d10f3e 100644
--- a/test/src/net/sf/freecol/client/AllTests.java
+++ b/test/src/net/sf/freecol/client/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/ClientTestHelper.java b/test/src/net/sf/freecol/client/ClientTestHelper.java
index 7a536c67f..f6ed79b8a 100644
--- a/test/src/net/sf/freecol/client/ClientTestHelper.java
+++ b/test/src/net/sf/freecol/client/ClientTestHelper.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/control/AllTests.java b/test/src/net/sf/freecol/client/control/AllTests.java
index 978c8dc1a..52446b733 100644
--- a/test/src/net/sf/freecol/client/control/AllTests.java
+++ b/test/src/net/sf/freecol/client/control/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/control/MoveTest.java b/test/src/net/sf/freecol/client/control/MoveTest.java
index 108853353..447a83eee 100644
--- a/test/src/net/sf/freecol/client/control/MoveTest.java
+++ b/test/src/net/sf/freecol/client/control/MoveTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/gui/AllTests.java b/test/src/net/sf/freecol/client/gui/AllTests.java
index 07c51279b..cc5b8a045 100644
--- a/test/src/net/sf/freecol/client/gui/AllTests.java
+++ b/test/src/net/sf/freecol/client/gui/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/client/gui/FontTest.java b/test/src/net/sf/freecol/client/gui/FontTest.java
index 5bcdfe351..b06a686fa 100644
--- a/test/src/net/sf/freecol/client/gui/FontTest.java
+++ b/test/src/net/sf/freecol/client/gui/FontTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/AllTests.java b/test/src/net/sf/freecol/common/AllTests.java
index a1ce8eda8..7e6b7b3be 100644
--- a/test/src/net/sf/freecol/common/AllTests.java
+++ b/test/src/net/sf/freecol/common/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/AllTests.java b/test/src/net/sf/freecol/common/i18n/AllTests.java
index cc03fcb46..ccb030cec 100644
--- a/test/src/net/sf/freecol/common/i18n/AllTests.java
+++ b/test/src/net/sf/freecol/common/i18n/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/CLDRTest.java b/test/src/net/sf/freecol/common/i18n/CLDRTest.java
index 2dd3a1490..c2ce6ce69 100644
--- a/test/src/net/sf/freecol/common/i18n/CLDRTest.java
+++ b/test/src/net/sf/freecol/common/i18n/CLDRTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/Merge.java b/test/src/net/sf/freecol/common/i18n/Merge.java
index ad8da996c..526c28cb9 100644
--- a/test/src/net/sf/freecol/common/i18n/Merge.java
+++ b/test/src/net/sf/freecol/common/i18n/Merge.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/MergeTableCellRenderer.java b/test/src/net/sf/freecol/common/i18n/MergeTableCellRenderer.java
index f2ad1825a..bc9e98554 100644
--- a/test/src/net/sf/freecol/common/i18n/MergeTableCellRenderer.java
+++ b/test/src/net/sf/freecol/common/i18n/MergeTableCellRenderer.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/MergeTableModel.java b/test/src/net/sf/freecol/common/i18n/MergeTableModel.java
index 04aa8edaa..064b32fb1 100644
--- a/test/src/net/sf/freecol/common/i18n/MergeTableModel.java
+++ b/test/src/net/sf/freecol/common/i18n/MergeTableModel.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/MessageMerge.java b/test/src/net/sf/freecol/common/i18n/MessageMerge.java
index d0e38779e..58ac1d741 100644
--- a/test/src/net/sf/freecol/common/i18n/MessageMerge.java
+++ b/test/src/net/sf/freecol/common/i18n/MessageMerge.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/i18n/MessagesTest.java b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
index 0a5c08025..5a8e0d366 100644
--- a/test/src/net/sf/freecol/common/i18n/MessagesTest.java
+++ b/test/src/net/sf/freecol/common/i18n/MessagesTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/io/AllTests.java b/test/src/net/sf/freecol/common/io/AllTests.java
index 55c958add..ce8305c20 100644
--- a/test/src/net/sf/freecol/common/io/AllTests.java
+++ b/test/src/net/sf/freecol/common/io/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/io/ModTest.java b/test/src/net/sf/freecol/common/io/ModTest.java
index 3d99ba462..d69271a2b 100644
--- a/test/src/net/sf/freecol/common/io/ModTest.java
+++ b/test/src/net/sf/freecol/common/io/ModTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/AllTests.java b/test/src/net/sf/freecol/common/model/AllTests.java
index c6ea5b28f..aa533afff 100644
--- a/test/src/net/sf/freecol/common/model/AllTests.java
+++ b/test/src/net/sf/freecol/common/model/AllTests.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java b/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
index 593dd72f0..b145bb3c2 100644
--- a/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
+++ b/test/src/net/sf/freecol/common/model/BaseCostDeciderTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ColonyProductionTest.java b/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
index 71416a78f..410888b0e 100644
--- a/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
+++ b/test/src/net/sf/freecol/common/model/ColonyProductionTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ColonyTest.java b/test/src/net/sf/freecol/common/model/ColonyTest.java
index f2ac586df..ea0920ec5 100644
--- a/test/src/net/sf/freecol/common/model/ColonyTest.java
+++ b/test/src/net/sf/freecol/common/model/ColonyTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/CombatTest.java b/test/src/net/sf/freecol/common/model/CombatTest.java
index f46ea06ab..3ccab52c2 100644
--- a/test/src/net/sf/freecol/common/model/CombatTest.java
+++ b/test/src/net/sf/freecol/common/model/CombatTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/DisasterTest.java b/test/src/net/sf/freecol/common/model/DisasterTest.java
index b80d57204..9eeb7ac8b 100644
--- a/test/src/net/sf/freecol/common/model/DisasterTest.java
+++ b/test/src/net/sf/freecol/common/model/DisasterTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/EuropeTest.java b/test/src/net/sf/freecol/common/model/EuropeTest.java
index 6141c085a..a47130da7 100644
--- a/test/src/net/sf/freecol/common/model/EuropeTest.java
+++ b/test/src/net/sf/freecol/common/model/EuropeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/FoundingFatherTest.java b/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
index ec9b67b8d..775bbaefa 100644
--- a/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
+++ b/test/src/net/sf/freecol/common/model/FoundingFatherTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/GameTest.java b/test/src/net/sf/freecol/common/model/GameTest.java
index a999510ff..f53ccf73e 100644
--- a/test/src/net/sf/freecol/common/model/GameTest.java
+++ b/test/src/net/sf/freecol/common/model/GameTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/GoodsContainerTest.java b/test/src/net/sf/freecol/common/model/GoodsContainerTest.java
index 52867f895..3ff66c07f 100644
--- a/test/src/net/sf/freecol/common/model/GoodsContainerTest.java
+++ b/test/src/net/sf/freecol/common/model/GoodsContainerTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/GoodsTest.java b/test/src/net/sf/freecol/common/model/GoodsTest.java
index 61aba2c44..160c81913 100644
--- a/test/src/net/sf/freecol/common/model/GoodsTest.java
+++ b/test/src/net/sf/freecol/common/model/GoodsTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/HighScoreTest.java b/test/src/net/sf/freecol/common/model/HighScoreTest.java
index 24ecbfbaa..6f302e031 100644
--- a/test/src/net/sf/freecol/common/model/HighScoreTest.java
+++ b/test/src/net/sf/freecol/common/model/HighScoreTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/LimitTest.java b/test/src/net/sf/freecol/common/model/LimitTest.java
index dd0ec7831..f30873cbd 100644
--- a/test/src/net/sf/freecol/common/model/LimitTest.java
+++ b/test/src/net/sf/freecol/common/model/LimitTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/MapTest.java b/test/src/net/sf/freecol/common/model/MapTest.java
index 9fd2df5eb..88ea2ecb4 100644
--- a/test/src/net/sf/freecol/common/model/MapTest.java
+++ b/test/src/net/sf/freecol/common/model/MapTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ModelMessageTest.java b/test/src/net/sf/freecol/common/model/ModelMessageTest.java
index ef94aa807..2557c02a4 100644
--- a/test/src/net/sf/freecol/common/model/ModelMessageTest.java
+++ b/test/src/net/sf/freecol/common/model/ModelMessageTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ModifierTest.java b/test/src/net/sf/freecol/common/model/ModifierTest.java
index 2a095375d..348e128dc 100644
--- a/test/src/net/sf/freecol/common/model/ModifierTest.java
+++ b/test/src/net/sf/freecol/common/model/ModifierTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/MonarchTest.java b/test/src/net/sf/freecol/common/model/MonarchTest.java
index 16b3ad2c4..c9551f2d6 100644
--- a/test/src/net/sf/freecol/common/model/MonarchTest.java
+++ b/test/src/net/sf/freecol/common/model/MonarchTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/MovementTest.java b/test/src/net/sf/freecol/common/model/MovementTest.java
index 0bf72cf3f..4bbafc9c2 100644
--- a/test/src/net/sf/freecol/common/model/MovementTest.java
+++ b/test/src/net/sf/freecol/common/model/MovementTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/NationTypeTest.java b/test/src/net/sf/freecol/common/model/NationTypeTest.java
index 72871f1b1..960ed7951 100644
--- a/test/src/net/sf/freecol/common/model/NationTypeTest.java
+++ b/test/src/net/sf/freecol/common/model/NationTypeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/PathfindingTest.java b/test/src/net/sf/freecol/common/model/PathfindingTest.java
index 4a098f9ca..413203ac3 100644
--- a/test/src/net/sf/freecol/common/model/PathfindingTest.java
+++ b/test/src/net/sf/freecol/common/model/PathfindingTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/PlayerTest.java b/test/src/net/sf/freecol/common/model/PlayerTest.java
index d4ebc9146..6d9eb6d43 100644
--- a/test/src/net/sf/freecol/common/model/PlayerTest.java
+++ b/test/src/net/sf/freecol/common/model/PlayerTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ProductionTypeTest.java b/test/src/net/sf/freecol/common/model/ProductionTypeTest.java
index 5c2e09be4..ff808b051 100644
--- a/test/src/net/sf/freecol/common/model/ProductionTypeTest.java
+++ b/test/src/net/sf/freecol/common/model/ProductionTypeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/RandomRangeTest.java b/test/src/net/sf/freecol/common/model/RandomRangeTest.java
index 88c80e5f4..645673417 100644
--- a/test/src/net/sf/freecol/common/model/RandomRangeTest.java
+++ b/test/src/net/sf/freecol/common/model/RandomRangeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/RoleTest.java b/test/src/net/sf/freecol/common/model/RoleTest.java
index 8439f50c2..6b0e851c1 100644
--- a/test/src/net/sf/freecol/common/model/RoleTest.java
+++ b/test/src/net/sf/freecol/common/model/RoleTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/SchoolTest.java b/test/src/net/sf/freecol/common/model/SchoolTest.java
index df5b22036..cfae9718d 100644
--- a/test/src/net/sf/freecol/common/model/SchoolTest.java
+++ b/test/src/net/sf/freecol/common/model/SchoolTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/ScopeTest.java b/test/src/net/sf/freecol/common/model/ScopeTest.java
index 9cac40282..ad55c49be 100644
--- a/test/src/net/sf/freecol/common/model/ScopeTest.java
+++ b/test/src/net/sf/freecol/common/model/ScopeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/SerializationTest.java b/test/src/net/sf/freecol/common/model/SerializationTest.java
index 512402eb3..778b4da9a 100644
--- a/test/src/net/sf/freecol/common/model/SerializationTest.java
+++ b/test/src/net/sf/freecol/common/model/SerializationTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/SettlementTest.java b/test/src/net/sf/freecol/common/model/SettlementTest.java
index db5a2efa1..a39b943b0 100644
--- a/test/src/net/sf/freecol/common/model/SettlementTest.java
+++ b/test/src/net/sf/freecol/common/model/SettlementTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/SoLTest.java b/test/src/net/sf/freecol/common/model/SoLTest.java
index 868ed6a79..3f8b21e60 100644
--- a/test/src/net/sf/freecol/common/model/SoLTest.java
+++ b/test/src/net/sf/freecol/common/model/SoLTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/SpecificationTest.java b/test/src/net/sf/freecol/common/model/SpecificationTest.java
index 76a06d828..6b17e2b2f 100644
--- a/test/src/net/sf/freecol/common/model/SpecificationTest.java
+++ b/test/src/net/sf/freecol/common/model/SpecificationTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/TileImprovementTest.java b/test/src/net/sf/freecol/common/model/TileImprovementTest.java
index 9a7ca4d9e..cbf111e75 100644
--- a/test/src/net/sf/freecol/common/model/TileImprovementTest.java
+++ b/test/src/net/sf/freecol/common/model/TileImprovementTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/TileItemContainerTest.java b/test/src/net/sf/freecol/common/model/TileItemContainerTest.java
index 4b24d5a82..f4af7e85a 100644
--- a/test/src/net/sf/freecol/common/model/TileItemContainerTest.java
+++ b/test/src/net/sf/freecol/common/model/TileItemContainerTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/TileTest.java b/test/src/net/sf/freecol/common/model/TileTest.java
index 2959ab707..d72f9b775 100644
--- a/test/src/net/sf/freecol/common/model/TileTest.java
+++ b/test/src/net/sf/freecol/common/model/TileTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/TradeRouteTest.java b/test/src/net/sf/freecol/common/model/TradeRouteTest.java
index 281bd65b8..1d0317f6d 100644
--- a/test/src/net/sf/freecol/common/model/TradeRouteTest.java
+++ b/test/src/net/sf/freecol/common/model/TradeRouteTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/UnitChangeTypeTest.java b/test/src/net/sf/freecol/common/model/UnitChangeTypeTest.java
index 4b314003e..b20619f62 100644
--- a/test/src/net/sf/freecol/common/model/UnitChangeTypeTest.java
+++ b/test/src/net/sf/freecol/common/model/UnitChangeTypeTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/model/UnitTest.java b/test/src/net/sf/freecol/common/model/UnitTest.java
index 52e8438fe..833bcc8d5 100644
--- a/test/src/net/sf/freecol/common/model/UnitTest.java
+++ b/test/src/net/sf/freecol/common/model/UnitTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/sound/SoundTest.java b/test/src/net/sf/freecol/common/sound/SoundTest.java
index 1353789c6..64eaadd30 100644
--- a/test/src/net/sf/freecol/common/sound/SoundTest.java
+++ b/test/src/net/sf/freecol/common/sound/SoundTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/common/utils/UtilsTest.java b/test/src/net/sf/freecol/common/utils/UtilsTest.java
index 2511702f4..88ad0543c 100644
--- a/test/src/net/sf/freecol/common/utils/UtilsTest.java
+++ b/test/src/net/sf/freecol/common/utils/UtilsTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/server/SaveLoadTest.java b/test/src/net/sf/freecol/server/SaveLoadTest.java
index 5a8b2fa3b..c573b07d9 100644
--- a/test/src/net/sf/freecol/server/SaveLoadTest.java
+++ b/test/src/net/sf/freecol/server/SaveLoadTest.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/test/src/net/sf/freecol/util/test/FreeColTestCase.java b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
index 35c9c286d..cccccf30e 100644
--- a/test/src/net/sf/freecol/util/test/FreeColTestCase.java
+++ b/test/src/net/sf/freecol/util/test/FreeColTestCase.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2002-2021  The FreeCol Team
+ *  Copyright (C) 2002-2022  The FreeCol Team
  *
  *  This file is part of FreeCol.
  *
diff --git a/www.freecol.org/docs/FreeCol.html b/www.freecol.org/docs/FreeCol.html
index 5506fde13..22226defc 100644
--- a/www.freecol.org/docs/FreeCol.html
+++ b/www.freecol.org/docs/FreeCol.html
@@ -9,29 +9,15 @@ User Guide for Version v0.11.6</title>
 <!-- html --> 
 <meta name="src" content="FreeCol.tex"> 
 <link rel="stylesheet" type="text/css" href="FreeCol.css"> 
-</head><body 
->
+</head>
+
+<body>
    <div class="maketitle">
-                                                                          
-
-                                                                          
-                                                                          
-
-                                                                          
-                                                                          
-
-                                                                          
-
-<h2 class="titleHead">FreeCol Documentation<br />
-User Guide for Version v0.11.6</h2>
-<div class="author" ><a 
-href="http://freecol.sourceforge.net/index.php?section=8" ><span 
-class="ecrm-1440">The FreeCol Team</span></a></div><br />
-<div class="date" ><span 
-class="ecrm-1440">December 30, 2019</span></div>
-                                                                          
-
-                                                                          
+      <h2 class="titleHead">FreeCol Documentation<br />
+      User Guide for Version v0.11.6</h2>
+      <div class="author" ><a href="http://freecol.sourceforge.net/index.php?section=8" >
+            <span class="ecrm-1440">The FreeCol Team</span></a></div><br />
+      <div class="date" ><span class="ecrm-1440">December 30, 2019</span></div>
    </div>
                                                                           
 
@@ -5073,7 +5059,7 @@ to cheat, but much work needs to be done to get there.
  id="x1-8100011"></a>Copyright Notice</h2>
 <!--l. 3278--><p class="noindent" ></a>
 <!--l. 3280--><p class="indent" >   Copyright <span 
-class="cmsy-10x-x-120">©</span>2002&#8211;2015 <a 
+class="cmsy-10x-x-120">©</span>2002&#8211;2022 <a
 href="http://freecol.sourceforge.net/index.php?section=8" >The FreeCol Team</a>.
 <!--l. 3284--><p class="indent" >   This manual is free software; you may redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the