diff --git a/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/Main.java b/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/Main.java
index f9d58047b5..35baf4d0d1 100644
--- a/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/Main.java
+++ b/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/Main.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.igniterealtime.openfire.updaterunner;
 
 import org.jivesoftware.database.*;
diff --git a/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/PropertiesReader.java b/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/PropertiesReader.java
index d35555b857..1e02cd3f0c 100644
--- a/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/PropertiesReader.java
+++ b/build/ci/updater/src/main/java/com/igniterealtime/openfire/updaterunner/PropertiesReader.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.igniterealtime.openfire.updaterunner;
 
 import java.io.File;
diff --git a/checkCopyrightHeader b/checkCopyrightHeader
new file mode 100755
index 0000000000..61f1ebc6e5
--- /dev/null
+++ b/checkCopyrightHeader
@@ -0,0 +1,301 @@
+#!/bin/bash
+
+# This script checks for the presence of the current year in the license header of all java files in the repo.
+# Inspired by (and somewhat copied from) https://github.com/palaniraja/whatchanged/blob/master/whatchanged.sh
+
+THIS_YEAR=$(date +%Y)
+IGNITE_FOUNDED="2016-10-21"
+JIVE_ENDED="2010-01-31"
+REPO_STARTED="2004-10-17"
+
+FIXES_ENABLED=true
+
+read -r -d '' JAVA_LICENSE << EOM
+/*
+ * Copyright (C) ###TOKEN###. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+EOM
+
+read -r -d '' JSP_LICENSE << EOM
+<%--
+  -
+  - Copyright (C) ###TOKEN###. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
+
+EOM
+
+getDateFormattedGitLog() {
+    local FILE=$1
+    git log --format="%cd" --date="format:%Y-%m-%d" --invert-grep --grep="Update to Apache 2.0" --grep="OF-2716" --follow "$FILE"
+}
+
+getDateFormattedGitLogBetweenTwoDates() {
+    local FILE=$1
+    local FROM_DATE=$2
+    local TO_DATE=$3
+
+    getDateFormattedGitLog "$FILE" | awk -v fromdate="$FROM_DATE" -v todate="$TO_DATE" '$1 >= fromdate && $1 <= todate'
+}
+
+getCopyrightAttribution() {
+    FROM_DATE=$1
+    TO_DATE=$2
+    ATTRIBUTE_TO=$3
+
+    FIRST_COMMIT_YEAR=$(getDateFormattedGitLogBetweenTwoDates "$line" "$FROM_DATE" "$TO_DATE" | tail -n 1 | awk -F'-' '{print $1}')
+    LAST_COMMIT_YEAR=$(getDateFormattedGitLogBetweenTwoDates "$line" "$FROM_DATE" "$TO_DATE" | head -n 1 | awk -F'-' '{print $1}')
+
+    if [ "$FIRST_COMMIT_YEAR" -ne "$LAST_COMMIT_YEAR" ]; then
+        COPYRIGHT_YEARS="$FIRST_COMMIT_YEAR-$LAST_COMMIT_YEAR"
+    else
+        COPYRIGHT_YEARS="$FIRST_COMMIT_YEAR"
+    fi
+
+    ATTRIBUTION="$COPYRIGHT_YEARS $ATTRIBUTE_TO"
+
+    echo $ATTRIBUTION
+}
+
+getCopyrightAttributionForIgnite(){
+    local START=$IGNITE_FOUNDED
+    local END="$THIS_YEAR-12-31"
+    local WHO="Ignite Realtime Foundation"
+    getCopyrightAttribution "$START" "$END" "$WHO"
+}
+
+getCopyrightAttributionForJive(){
+    local START=$REPO_STARTED
+    local END=$JIVE_ENDED
+    local WHO="Jive Software"
+    getCopyrightAttribution "$START" "$END" "$WHO"
+}
+
+existedInTheJiveSoftwareEra() {
+    # We can't use 'git log --before' because git history will cut off trees and return blank results - we need to follow all the way, then filter
+    LOGCOUNT=$(getDateFormattedGitLog "$line" | awk -v jiveended="$JIVE_ENDED" '$1 < jiveended' | wc -l)
+    if [ $LOGCOUNT -gt 0 ]; then
+        return 1
+    else
+        return 0
+    fi
+}
+
+# Adds an attribution to the end of an existing copyright line in an existing license header
+fixMissingCopyrightAttribution() {
+    local FILE=$1
+    local INTENDED_MENTION=$2
+    COPYRIGHT_NEEDLE=". All rights reserved"
+    FIXED=0
+    head -5 "$FILE" | grep "$COPYRIGHT_NEEDLE" > /dev/null
+    if [ $? -eq 0 ]; then
+        sed -i "1,5 s/$COPYRIGHT_NEEDLE/, $INTENDED_MENTION$COPYRIGHT_NEEDLE/" "$FILE"
+        echo "=> Fixed missing attribution!"
+        FIXED=1
+    else
+        echo "=> FAILED: $COPYRIGHT_NEEDLE not found in $FILE"
+    fi
+    return $FIXED
+}
+
+# Fixes the years for an existing copyright attribution in an existing license header
+fixIncorrectCopyrightLine(){
+    local FILE=$1
+    local CORRECT_ATTRIBUTION=$2
+    local ATTRIBUTE_TO=$3
+    DATE_REGEX="[0-9]{4}(-[0-9]{4})?"
+    COPYRIGHT_NEEDLE="$DATE_REGEX $ATTRIBUTE_TO"
+    FIXED=0
+    head -5 "$FILE" | grep -E "$COPYRIGHT_NEEDLE" > /dev/null
+    if [ $? -eq 0 ]; then
+        sed -i -E "1,5 s/$COPYRIGHT_NEEDLE/$CORRECT_ATTRIBUTION/" "$FILE"
+        echo "=> Fixed incorrect attribution!"
+        FIXED=1
+    else
+        echo "=> FAILED: $COPYRIGHT_NEEDLE not found in $FILE"
+    fi
+    return $FIXED
+}
+
+fixMissingLicenseHeader() {
+    local FILE=$1
+    local INTENDED_ATTRIBUTIONS=$2
+    local FILE_EXTENSION=$(echo "$FILE" | awk -F'.' '{print $NF}')
+
+    if [ "$FILE_EXTENSION" == "java" ]; then
+        THIS_LICENSE=$JAVA_LICENSE
+    elif [ "$FILE_EXTENSION" == "jsp" ]; then
+        THIS_LICENSE=$JSP_LICENSE
+    else
+        echo "Unknown file extension: $FILE_EXTENSION"
+        return 0
+    fi
+
+    THIS_LICENSE=${THIS_LICENSE//###TOKEN###/$INTENDED_ATTRIBUTIONS}
+
+    TMPFILE=$(mktemp)
+    echo "$THIS_LICENSE" > "$TMPFILE"
+    cat "$FILE" >> "$TMPFILE"
+    mv "$TMPFILE" "$FILE"
+    echo "=> Fixed missing license header in $FILE"
+}
+
+fixMissingC() {
+    local FILE=$1
+    sed -i -E "1,5 s/Copyright/Copyright (C)/" "$FILE"
+    echo "=> Fixed missing (C) in $FILE"
+}
+
+fixMissingAllRightsReserved() {
+    local FILE=$1
+    #/192.168.1.2/s/$/ myalias/
+    sed -i -E "/Copyright/s/$/. All rights reserved/" "$FILE"
+    echo "=> Fixed missing 'All rights reserved' in $FILE"
+}
+
+processFiles(){
+    # Only git tracked files
+    git ls-tree -r main --name-only | grep '\.java$\|\.jsp$' | sort -u | while read line
+    do
+        #echo Processing "$line"
+        if ! [ -n "${line}" ] || ! [ -e "${line}" ] ||
+            [[ ${line} == *"/package-info.java" ]] || # No functional code
+            [[ ${line} == "xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java" ]] || # Special license via DOM4J
+            [[ ${line} == "xmppserver/src/main/java/org/jivesoftware/util/FastDateFormat.java" ]]; # Special license via Disney //TODO: https://igniterealtime.atlassian.net/browse/OF-2754
+                then
+            continue
+        fi
+
+        MISSING_LICENSE_HEADER=0
+        MISSING_IGNITE_MENTION=0
+        INCORRECT_IGNITE_MENTION=0
+        MISSING_C=0
+        MISSING_RIGHTS_RESERVED=0
+
+        head -5 "$line" | grep -E "Copyright [0-9]{4}" > /dev/null
+        if [ $? -eq 0 ]; then
+            MISSING_C=1
+            echo "Missing (C) in Copyright line: $line"
+        fi
+
+        # Check for license
+        grep "Licensed under the Apache License" "$line" > /dev/null
+        if [ $? -eq 1 ]; then
+            MISSING_LICENSE_HEADER=1
+            FILE_CREATION_DATE=$(git log --diff-filter=A --follow --format=%ad --date="format:%Y-%m-%d" -1 -- "$line")
+            echo "Missing license header in: $line (created $FILE_CREATION_DATE)"
+        fi
+
+
+        grep -E "Copyright.*[0-9]{4}" "$line" > /dev/null
+        if [ $? -eq 0 ]; then
+            grep -E "Copyright.*[0-9]{4}.*All rights reserved" "$line" > /dev/null
+            if [ $? -eq 1 ]; then
+                MISSING_RIGHTS_RESERVED=1
+                echo "Missing 'All rights reserved' in: $line"
+            fi
+        fi
+
+        # Calculate what the Jive attribution should be
+        existedInTheJiveSoftwareEra
+        EXISTED_IN_THE_JIVE_SOFTWARE_ERA=$?
+
+        if [ $EXISTED_IN_THE_JIVE_SOFTWARE_ERA -eq 1 ]; then
+            JIVE_ATTRIBUTION=$(getCopyrightAttributionForJive)
+
+        # I'm not sure I'm happy fixing copyright headers for other folk.
+        # Jive already did this themselves in https://github.com/igniterealtime/Openfire/commit/ff0fa13dc3f67ca269da7bceef161e4a49663259
+        # So I'm going to leave this commented out for now.
+        #    grep "Copyright .* Jive Software" "$line" > /dev/null
+        #    if [ $? -eq 1 ]; then
+        #        MISSING_JIVE_MENTION=1
+        #        echo "Copyright header not found in: $line - needs to read: $JIVE_ATTRIBUTION"
+        #    fi
+        fi
+
+        # Calculate what the Ignite attribution should be
+        IGNITE_ATTRIBUTION=$(getCopyrightAttributionForIgnite)
+
+        grep "Copyright .* Ignite Realtime Foundation" "$line" > /dev/null
+        if [ $? -eq 1 ]; then
+            MISSING_IGNITE_MENTION=1
+            echo "Copyright header not found in: $line - needs to read: $IGNITE_ATTRIBUTION"
+        else
+            grep "Copyright .* $IGNITE_ATTRIBUTION" "$line" > /dev/null
+            if [ $? -eq 1 ]; then
+                INCORRECT_IGNITE_MENTION=1
+                echo "Copyright header incorrect in: $line - needs to read: $IGNITE_ATTRIBUTION"
+            fi
+        fi
+
+        ## Fixes
+        if [ "$FIXES_ENABLED" == "false" ]; then
+            continue
+        fi
+
+        # Fix missing (C)
+        if [ $MISSING_C -eq 1 ]; then
+            fixMissingC "$line"
+        fi
+
+        # Fix missing 'All rights reserved'
+        if [ $MISSING_RIGHTS_RESERVED -eq 1 ]; then
+            fixMissingAllRightsReserved "$line"
+        fi
+
+        # Fix missing license header
+        if [ $MISSING_LICENSE_HEADER -eq 1 ]; then
+            SET_OF_ATTRIBUTIONS=""
+            if [ $EXISTED_IN_THE_JIVE_SOFTWARE_ERA -eq 1 ]; then
+                SET_OF_ATTRIBUTIONS="$JIVE_ATTRIBUTION"
+            fi
+            if [ $MISSING_IGNITE_MENTION -eq 1 ]; then
+                if [ -n "$SET_OF_ATTRIBUTIONS" ]; then
+                    SET_OF_ATTRIBUTIONS="$SET_OF_ATTRIBUTIONS, $IGNITE_ATTRIBUTION"
+                else
+                    SET_OF_ATTRIBUTIONS="$IGNITE_ATTRIBUTION"
+                fi
+            fi
+            fixMissingLicenseHeader "$line" "$SET_OF_ATTRIBUTIONS"
+        else
+            # Fix missing Ignite attribution
+            if [ $MISSING_IGNITE_MENTION -eq 1 ]; then
+                fixMissingCopyrightAttribution "$line" "$IGNITE_ATTRIBUTION"
+            fi
+
+            # Fix incorrect Ignite attribution
+            if [ $INCORRECT_IGNITE_MENTION -eq 1 ]; then
+                fixIncorrectCopyrightLine "$line" "$IGNITE_ATTRIBUTION" \
+                    "Ignite Realtime Foundation"
+            fi
+        fi
+    done
+
+    echo "Done."
+}
+
+processFiles
diff --git a/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableFrame.java b/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableFrame.java
index aedd155f82..5e9524b7c2 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableFrame.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableTextPane.java b/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableTextPane.java
index 103eee57c7..69d0611963 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableTextPane.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/launcher/DroppableTextPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/launcher/GraphicUtils.java b/starter/src/main/java/org/jivesoftware/openfire/launcher/GraphicUtils.java
index ff2fd931f4..28fce85882 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/launcher/GraphicUtils.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/launcher/GraphicUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java b/starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java
index 6f67ffddf9..5ab538fefe 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/launcher/Uninstaller.java b/starter/src/main/java/org/jivesoftware/openfire/launcher/Uninstaller.java
index ba937d470e..b28a599391 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/launcher/Uninstaller.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/launcher/Uninstaller.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java b/starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java
index b49be6fd69..01bdb138f5 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java b/starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java
index 72e86cfbdb..387e2cbe92 100644
--- a/starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java
+++ b/starter/src/main/java/org/jivesoftware/openfire/starter/ServerStarter.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java b/xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java
index c0ea7457af..25d1e85173 100644
--- a/xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java
+++ b/xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java
@@ -581,6 +581,4 @@ private Reader createReader(InputStream in, String charSet) throws UnsupportedEn
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Copyright 2001-2004 (C) MetaStuff, Ltd. All Rights Reserved.
- *
  */
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/ASN1DERTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/ASN1DERTag.java
index ed36aef2c2..423c90faa1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/ASN1DERTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/ASN1DERTag.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import org.bouncycastle.asn1.*;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java b/xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java
index 0db5fc4cee..0c0a3b95d5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/AdminConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/AdminContentSecurityPolicyFilter.java b/xmppserver/src/main/java/org/jivesoftware/admin/AdminContentSecurityPolicyFilter.java
index 3fb66b56c4..e1d3d1fbf8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/AdminContentSecurityPolicyFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/AdminContentSecurityPolicyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Ignite Realtime Foundation 2022-2023. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/AdminPageBean.java b/xmppserver/src/main/java/org/jivesoftware/admin/AdminPageBean.java
index bb39e5b2cb..63362329ac 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/AdminPageBean.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/AdminPageBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java b/xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java
index 16f22cee90..4613f457e2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/AuthCheckFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/ContentSecurityPolicyFilter.java b/xmppserver/src/main/java/org/jivesoftware/admin/ContentSecurityPolicyFilter.java
index fa833c2c93..958c995d20 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/ContentSecurityPolicyFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/ContentSecurityPolicyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Ignite Realtime Foundation 2022-2023. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/FlashMessageTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/FlashMessageTag.java
index 50a5eaf2fa..3f7e37fb4a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/FlashMessageTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/FlashMessageTag.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import java.io.IOException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/JSTLFunctions.java b/xmppserver/src/main/java/org/jivesoftware/admin/JSTLFunctions.java
index 9b5d84b1aa..17d00dc509 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/JSTLFunctions.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/JSTLFunctions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import org.jivesoftware.util.ByteFormat;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/LdapGroupTester.java b/xmppserver/src/main/java/org/jivesoftware/admin/LdapGroupTester.java
index 966668df3d..2131a0f413 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/LdapGroupTester.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/LdapGroupTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java b/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java
index 165d504ffb..1ce9486504 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java b/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java
index c91742cc2c..a0952c6066 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/LoginLimitManager.java b/xmppserver/src/main/java/org/jivesoftware/admin/LoginLimitManager.java
index 1936f45c52..e9d6b6d34a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/LoginLimitManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/LoginLimitManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/PluginFilter.java b/xmppserver/src/main/java/org/jivesoftware/admin/PluginFilter.java
index d3168b8186..4503241b1a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/PluginFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/PluginFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/ServletRequestAuthenticator.java b/xmppserver/src/main/java/org/jivesoftware/admin/ServletRequestAuthenticator.java
index 72db9762d8..137b55e805 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/ServletRequestAuthenticator.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/ServletRequestAuthenticator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/SessionListener.java b/xmppserver/src/main/java/org/jivesoftware/admin/SessionListener.java
index 670ea6a026..9500955cb0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/SessionListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/SessionListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import org.jivesoftware.util.JiveGlobals;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/SidebarTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/SidebarTag.java
index d783002132..26105d2038 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/SidebarTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/SidebarTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticator.java b/xmppserver/src/main/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticator.java
index 5aa5465c96..c51e27fc3d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticator.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/SubSidebarTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/SubSidebarTag.java
index 54eb083c19..48e7f9d804 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/SubSidebarTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/SubSidebarTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/SubnavTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/SubnavTag.java
index dd8c6be5d9..b3715e263e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/SubnavTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/SubnavTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/TabsTag.java b/xmppserver/src/main/java/org/jivesoftware/admin/TabsTag.java
index db3ea3e0c6..3ea8d71504 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/TabsTag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/TabsTag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java
index 8f46ee5acd..d8486ec9b9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SecurityAuditViewerServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin.servlet;
 
 import java.io.IOException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java
index a35d6b03d5..8a72c4a90a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemCacheDetailsServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin.servlet;
 
 import java.io.IOException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java
index 86018cb9eb..6420179c66 100644
--- a/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/admin/servlet/SystemPropertiesServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.admin.servlet;
 
 import java.io.IOException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/AbstractConnection.java b/xmppserver/src/main/java/org/jivesoftware/database/AbstractConnection.java
index f8a5289f7d..a09fd22a96 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/AbstractConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/AbstractConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/CachedPreparedStatement.java b/xmppserver/src/main/java/org/jivesoftware/database/CachedPreparedStatement.java
index 3a4727abb0..0bed89d010 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/CachedPreparedStatement.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/CachedPreparedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/CallableStatementWrapper.java b/xmppserver/src/main/java/org/jivesoftware/database/CallableStatementWrapper.java
index d715779ada..f907886bab 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/CallableStatementWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/CallableStatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/ConnectionProvider.java b/xmppserver/src/main/java/org/jivesoftware/database/ConnectionProvider.java
index 50339fbc6d..bbf77a7254 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/ConnectionProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/ConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * TLicensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java b/xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java
index 3d86bda606..e4cf81be3a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/DbConnectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProvider.java b/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProvider.java
index 6c2a6c4604..27d13a9585 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProviderBeanInfo.java b/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProviderBeanInfo.java
index 31d5a8ccca..60aadd2db3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProviderBeanInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/DefaultConnectionProviderBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/EmbeddedConnectionProvider.java b/xmppserver/src/main/java/org/jivesoftware/database/EmbeddedConnectionProvider.java
index f6c5ba1e4e..a48a300d9c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/EmbeddedConnectionProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/EmbeddedConnectionProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java b/xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java
index 3da8d7f3e9..936445e5e7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/JiveID.java b/xmppserver/src/main/java/org/jivesoftware/database/JiveID.java
index adc6c0abfc..516127e23f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/JiveID.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/JiveID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/PreparedStatementWrapper.java b/xmppserver/src/main/java/org/jivesoftware/database/PreparedStatementWrapper.java
index 4850740fd7..b1f1e9656b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/PreparedStatementWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/PreparedStatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnection.java b/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnection.java
index 954fe542a2..bd4890b2b2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software, Ignite Realtime Foundation 2023. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnectionEntry.java b/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnectionEntry.java
index 97a9d3e91d..9988d828b7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnectionEntry.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/ProfiledConnectionEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java b/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
index 8945fe50fe..af5a999903 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/SchemaManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/SequenceManager.java b/xmppserver/src/main/java/org/jivesoftware/database/SequenceManager.java
index 42a3c13c3c..1e56b66015 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/SequenceManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/SequenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/StatementWrapper.java b/xmppserver/src/main/java/org/jivesoftware/database/StatementWrapper.java
index 7975b3266f..d4d89fede3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/StatementWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/StatementWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004 Jive Software. All rights reserved.
+ * Copyright (C) 2004 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF1515.java b/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF1515.java
index accc3f130f..7d6177e892 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF1515.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF1515.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF33.java b/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF33.java
index dcc54c892a..3fc6fe1979 100644
--- a/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF33.java
+++ b/xmppserver/src/main/java/org/jivesoftware/database/bugfix/OF33.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/Channel.java b/xmppserver/src/main/java/org/jivesoftware/openfire/Channel.java
index 8ba2590208..567527f303 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/Channel.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/Channel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelHandler.java
index f4a0e7a986..c08af27781 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelNotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelNotFoundException.java
index 2b7d4f2cd9..c1b9aa2442 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelNotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ChannelNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java
index aeed1807b7..692e535797 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/Connection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionCloseListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionCloseListener.java
index f1fb2b2e2f..caae755e11 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionCloseListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionCloseListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionManager.java
index 8b5c4848e3..3e686bf364 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ConnectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/IQHandlerInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/IQHandlerInfo.java
index 69d6fe685e..0b3a31d55f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/IQHandlerInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/IQHandlerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java
index 053283c851..9169e2271a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/IQRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java
index dd6119849c..a8ef381dc9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Ignite Realtime Foundation 2022. All rights reserved.
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/LocalSessionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/LocalSessionManager.java
index c60ff19c78..c4fc05bb4d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/LocalSessionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/LocalSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java
index 67de65ec25..f099baef6b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/MulticastRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/MulticastRouter.java
index 5fa1988cd6..c3584562ba 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/MulticastRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/MulticastRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessage.java b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessage.java
index 27a5242de0..c3d2406d6b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessage.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageListener.java
index 00746577d8..d2b438785f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java
index 6d676d0ab0..7b55e58799 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java
index 95f4345484..df580e680c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketDeliverer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketDeliverer.java
index caeaa019f6..6558c9eea4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketDeliverer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketException.java
index f59b35b2ec..aaa3cc1023 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketRouter.java
index 3e47d0e88d..e6fd596fe9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PacketRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PacketRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceManager.java
index 607128395a..c020863a42 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java
index cb1d04d2de..04f162d889 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PresenceRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/PrivateStorage.java b/xmppserver/src/main/java/org/jivesoftware/openfire/PrivateStorage.java
index fe8447639c..cccc7b7864 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/PrivateStorage.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/PrivateStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/RemoteConnectionFailedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/RemoteConnectionFailedException.java
index 7ef9af048f..0a85d3f08b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/RemoteConnectionFailedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/RemoteConnectionFailedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/RemotePacketRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/RemotePacketRouter.java
index 151c3e3732..0d3a2616b2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/RemotePacketRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/RemotePacketRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/RoutableChannelHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/RoutableChannelHandler.java
index 22d9c46c74..8e5e32a9a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/RoutableChannelHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/RoutableChannelHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java b/xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java
index d3e24f129e..2b2a8e74d6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/RoutingTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java
index 68611094ed..f9203ea0e3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionNotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionNotFoundException.java
index 8318300137..d1a7f0bfff 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionNotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionPacketRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionPacketRouter.java
index 92a8747847..2ad505cc58 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionPacketRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionPacketRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionResultFilter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionResultFilter.java
index 4de05d5afc..f1a02d5ea8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/SessionResultFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/SessionResultFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/SharedGroupException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/SharedGroupException.java
index 86dbcfc1b5..6929ea6133 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/SharedGroupException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/SharedGroupException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/StreamID.java b/xmppserver/src/main/java/org/jivesoftware/openfire/StreamID.java
index fc97515add..055bd89d72 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/StreamID.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/StreamID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/StreamIDFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/StreamIDFactory.java
index a4779596c6..5d26464e27 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/StreamIDFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/StreamIDFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPContextListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPContextListener.java
index 1bf034c1dc..0fbb947ab3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPContextListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPContextListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
index d2c1bab65f..5205de6f60 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerInfo.java
index 23ff82d269..c9cdcf4e95 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerListener.java
index 5f0bbfb5b3..bd1eeb168f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminManager.java
index 7e5eea9423..6782b6db00 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminProvider.java
index d1370af939..b67f4c07a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/AdminProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java
index 2d7760f452..d542d9a58f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/GroupBasedAdminProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/GroupBasedAdminProvider.java
index 7f246883f6..0abf4e1264 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/GroupBasedAdminProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/GroupBasedAdminProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.admin;
 
 import org.jivesoftware.openfire.group.GroupManager;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/JDBCAdminProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/JDBCAdminProvider.java
index 4cb8f0f475..010b9e1f4f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/admin/JDBCAdminProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/admin/JDBCAdminProvider.java
@@ -1,6 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
- * Copyright 2008-2016 Robert Marcano
+ * Copyright (C) 2008-2016 Robert Marcano, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveCandidate.java b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveCandidate.java
index 0da250fa0b..80dc437334 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveCandidate.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveCandidate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveManager.java
index b419c8f9cc..3c9d774862 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/ArchiveManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java
index 9541d2fa33..eca83036e1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/Archiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/GetArchiveWriteETATask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/GetArchiveWriteETATask.java
index ac1bf04704..b9c05e856c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/archive/GetArchiveWriteETATask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/archive/GetArchiveWriteETATask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditEvent.java
index 7f4081200a..2d55c79824 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditManager.java
index e2ab1d433c..b163dcab8b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditStreamIDFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditStreamIDFactory.java
index 933a83ea4b..04ec62be8d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditStreamIDFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/AuditStreamIDFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/Auditor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/Auditor.java
index 92d4b2414d..5a39063a7b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/Auditor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/Auditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/SessionEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/SessionEvent.java
index d0f2c39a79..96b03e0993 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/SessionEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/SessionEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java
index 017079d5a9..619e68459a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditorImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditorImpl.java
index 873707b55a..e7897a82ec 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditorImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthFactory.java
index 1bcc1d192c..d05e54b89f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProvider.java
index b471bd8d1e..dfaff4d0a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProviderMapper.java
index 55af73ffce..fda6bc3a4e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2017-2018 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthToken.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthToken.java
index 99394fc203..8fb478313d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthToken.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationBasedAuthProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationBasedAuthProviderMapper.java
index 3920a02095..3fbeffe9ab 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationBasedAuthProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationBasedAuthProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationManager.java
index bd8bf9fabc..ef32bc099f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationMapping.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationMapping.java
index 1f7a22f5e7..0ba11cb2e0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationPolicy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationPolicy.java
index 68a4593a38..dfb8347c5c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationPolicy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/AuthorizationPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ConnectionException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ConnectionException.java
index fddb7a41e0..4ffc1df419 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ConnectionException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java
index 1988033db9..161f8d31e1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationMapping.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationMapping.java
index 74ca5356ba..7cc25d2b6a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationPolicy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationPolicy.java
index 5edbaa8f5d..3441c1cecd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationPolicy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
index 33f4fdb5db..eb78b6068b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/InternalUnauthenticatedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/InternalUnauthenticatedException.java
index 4b5b16372c..78b7579b8d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/InternalUnauthenticatedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/InternalUnauthenticatedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java
index 6d1740b54b..eb56bd2347 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/JDBCAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/MappedAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/MappedAuthProvider.java
index d9236ecfd4..d84f5c2024 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/MappedAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/MappedAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2016-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/NativeAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/NativeAuthProvider.java
index b24dbecb76..c1440a79c1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/NativeAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/NativeAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java
index 50e773c34a..b55495925a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/PropertyBasedAuthProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/PropertyBasedAuthProviderMapper.java
index d1eb57161e..63d30c7f46 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/PropertyBasedAuthProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/PropertyBasedAuthProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ignite Realtime Foundation
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ScramUtils.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ScramUtils.java
index b376173f8c..14cdc1d245 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ScramUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/ScramUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Surevine Ltd
+ * Copyright (C) 2015 Surevine Ltd, 2016-2018 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthenticatedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthenticatedException.java
index 91a4a03b0e..8528795fa5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthenticatedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthenticatedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthorizedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthorizedException.java
index d8c5c81b0c..59c51c2a11 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthorizedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/auth/UnauthorizedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Received.java b/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Received.java
index 0f2279ebe5..1c60898485 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Received.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Received.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.carbons;
 
 import org.jivesoftware.openfire.forward.Forwarded;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Sent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Sent.java
index 932ea66ba4..178a2f85c2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Sent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/carbons/Sent.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.carbons;
 
 import org.jivesoftware.openfire.forward.Forwarded;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/BroadcastMessage.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/BroadcastMessage.java
index 449908a324..cccf6aab21 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/BroadcastMessage.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/BroadcastMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2009 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterEventListener.java
index 04b4846cd5..e4b68109ec 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterManager.java
index 52ffbe5559..286488e029 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterMonitor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterMonitor.java
index e63083e6db..53895ebba5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterMonitor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterMonitor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.cluster;
 
 import java.util.Map;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterNodeInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterNodeInfo.java
index d17388b7a0..91ec0ece23 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterNodeInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterNodeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterPacketRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterPacketRouter.java
index b79a560503..aab099d979 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterPacketRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterPacketRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java
index 9bedfac26f..e920f707f0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusteredCacheEntryListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetBasicStatistics.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetBasicStatistics.java
index 56b7333781..c080621077 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetBasicStatistics.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetBasicStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetClusteredVersions.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetClusteredVersions.java
index 7212f78f87..48c3c73fdf 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetClusteredVersions.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/GetClusteredVersions.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.cluster;
 
 import java.io.IOException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/NodeID.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/NodeID.java
index 8ef9717d8f..55eb6373d9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/NodeID.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/NodeID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/RemotePacketExecution.java b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/RemotePacketExecution.java
index 86369d5212..3802659bd5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/RemotePacketExecution.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/cluster/RemotePacketExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2009 Jive Software, 2023 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 1999-2009 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommand.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommand.java
index e80b410712..d623e821bd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommand.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java
index fd0bf7d7e1..22ac57883e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandManager.java
index d444e4d620..40dc7fff2d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/AdHocCommandManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/SessionData.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/SessionData.java
index 75ddcc3860..61f17442ab 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/SessionData.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/SessionData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java
index f0434ef1a4..f8a3f0bfda 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetAdminConsoleInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java
index 8a809617ec..981e697f16 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetListActiveUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java
index a9b3064091..7ec975b45b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberActiveUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java
index 050587d4d0..f70adfd14f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberOnlineUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java
index c4554c5ddc..0a584eb9ca 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetNumberUserSessions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java
index 16af84a58b..dfea28dcc8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetServerStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java
index bdbc60239c..dc2022c072 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/GetUsersPresence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java
index 8715a12a9b..e7e2742472 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/HttpBindStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java
index 62bca5b384..dbe2eaec1f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/PacketsNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java
index 6d153d0df8..c1f8b0951a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java
index 82fbcec6ed..604f1235bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/AddGroupUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java
index 385d4e6feb..8b9385afd0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java
index 848ea399d9..1495dd032f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/DeleteGroupUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java
index 7ba6272a71..4cb815b6a3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroupUsers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java
index b4c495b6a5..60c658b759 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/GetListGroups.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java
index bfd21c0d9c..8b4e5dcf63 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/group/UpdateGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java
index f4855276a8..8d7dd8e543 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/muc/CreateMUCRoom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java
index 7289ecf3a6..9d5926419f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AddUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java
index 616837db21..56e9633611 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java
index 9790f85219..fe27a62145 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/ChangeUserPassword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java
index 0c1ffa9008..6951e8ab8a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/DeleteUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java
index 80e12fc8cf..351c8f1104 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/admin/user/UserProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java
index 76b98f8a69..1906ba7fa1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminAdded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java
index 46e1d96e7d..fb1a1d1b0d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupAdminRemoved.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupCreated.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupCreated.java
index d5f3d999a2..293ead45a8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupCreated.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupCreated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java
index 715c9c930e..28cf7253bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupDeleting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java
index 14d423a7b1..65c1a5d737 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberAdded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java
index e714e51c03..950d8464ec 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupMemberRemoved.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupModified.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupModified.java
index 0cc1829d0e..2cf3a02155 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupModified.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/GroupModified.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserCreated.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserCreated.java
index 88fab804ec..46c34a11f2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserCreated.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserCreated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserDeleting.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserDeleting.java
index 5891b763e8..f69d08652e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserDeleting.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserDeleting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserModified.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserModified.java
index 6035e3356d..6e646b026b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserModified.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/UserModified.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardCreated.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardCreated.java
index 54776ded90..01ae4c016d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardCreated.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardCreated.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java
index 325fde458c..08743a8640 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardDeleting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardModified.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardModified.java
index 8e10829bba..6db34289ef 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardModified.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/event/VCardModified.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java
index 6d4659b659..b99d257fc9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/commands/generic/Ping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ComponentEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ComponentEventListener.java
index 9439fe3729..1410e6403b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ComponentEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ComponentEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentConfiguration.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentConfiguration.java
index 62bfefd84e..8a8552bb8c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentConfiguration.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManager.java
index 58f8dc79ec..8ffa552848 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManagerListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManagerListener.java
index 6ff37af3d3..9c8f04cb8e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManagerListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/ExternalComponentManagerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java
index 56b219af1d..37ea07a21e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentInfo.java
index ae770d31d0..aab5dcc11a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentRegistered.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentRegistered.java
index f9f810f2af..6c83068315 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentRegistered.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentRegistered.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentUnregistered.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentUnregistered.java
index aa02a4a5fc..1a4a740e80 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentUnregistered.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/NotifyComponentUnregistered.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/component/RequestComponentInfoNotification.java b/xmppserver/src/main/java/org/jivesoftware/openfire/component/RequestComponentInfoNotification.java
index e6d616b76c..9032cedddc 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/component/RequestComponentInfoNotification.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/component/RequestComponentInfoNotification.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.component;
 
 import org.jivesoftware.openfire.cluster.NodeID;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
index a35581a652..30a516a372 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/BasicModule.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/BasicModule.java
index 93a2102fa2..a4738cca78 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/BasicModule.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/BasicModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/CacheInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/CacheInfo.java
index a307a72dc7..7b593cb831 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/CacheInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/CacheInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/GetAdminConsoleInfoTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/GetAdminConsoleInfoTask.java
index 90259fa6ee..f283948c8b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/GetAdminConsoleInfoTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/GetAdminConsoleInfoTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/IsPluginInstalledTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/IsPluginInstalledTask.java
index f13ceea3f5..039f55b548 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/IsPluginInstalledTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/IsPluginInstalledTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/Module.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/Module.java
index 08abf62e61..ec708558a8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/Module.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/Module.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/Plugin.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/Plugin.java
index e90f1e8e12..e04161482f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/Plugin.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/Plugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java
index 929c90e299..e00b2ea658 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheRegistry.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheRegistry.java
index bb2b70e920..04a2259a8f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheRegistry.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginCacheRegistry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginClassLoader.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginClassLoader.java
index a1fd48c89d..d136c6ea8d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginClassLoader.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginIconServlet.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginIconServlet.java
index a99dc14c32..cd15bf0d26 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginIconServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginIconServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginListener.java
index 207db42c03..937e64fbac 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java
index 8b098ae06f..51d617484d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManagerListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManagerListener.java
index 47874e5723..2ddf9d16bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManagerListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManagerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadata.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadata.java
index a6ecfaa27b..1c8685b8da 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadata.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java
index 659c082171..3e69269f8b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMetadataHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2017-2021 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java
index db74c1d048..a219c009f2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java
index 10af88f3c8..d887f81a71 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServletContext.java b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServletContext.java
index 5b0d59fd67..643232ae90 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServletContext.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginServletContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016-2023 Ignite Realtime Foundation.. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAdminProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAdminProvider.java
index ed51fcb240..6c6109c794 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAdminProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAdminProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAuthProvider.java
index 4bc3d38278..28fa078840 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2016-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java
index df963aad73..dec77995be 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdManager.java
index b91a47460e..7251a0596f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdProperties.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdProperties.java
index 70e2f08ca8..2d38f7dc00 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdProperties.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdUserProvider.java
index e7bcb06a67..1385e3860a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java
index 07dfa26102..4d9442ab85 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdVCardProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/AuthenticatePost.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/AuthenticatePost.java
index 668742761f..d1b3333343 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/AuthenticatePost.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/AuthenticatePost.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Group.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Group.java
index 8b0984bc83..d73f8f24af 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Group.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Group.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Groups.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Groups.java
index 738b9b9f77..1c2a5e9980 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Groups.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Groups.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/User.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/User.java
index bac8272d3b..63ed205765 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/User.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Users.java b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Users.java
index 1c764c2b7b..b00acbdc8f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Users.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/crowd/jaxb/Users.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>. All rights reserved.
+ * Copyright (C) 2012 Issa Gorissen <issa-gorissen@usa.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java
index 635f024af0..72dca7109e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoInfoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItem.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItem.java
index 3d4307cbd4..9ceda7bd46 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItem.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItemsProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItemsProvider.java
index f2e90fc159..e3a412a493 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItemsProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoItemsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoServerItem.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoServerItem.java
index b6c1550f52..d7c845e2b1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoServerItem.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/DiscoServerItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java
index af50a695d9..e7c6457cf9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java
index b55a1ccd7d..21b2b67dce 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerFeaturesProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerFeaturesProvider.java
index 5070e8c7e4..a61156fe14 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerFeaturesProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerFeaturesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerIdentitiesProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerIdentitiesProvider.java
index d1aceedd30..f4afa2e5ca 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerIdentitiesProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerIdentitiesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerItemsProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerItemsProvider.java
index f68a668992..ac6566a83b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerItemsProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/ServerItemsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserFeaturesProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserFeaturesProvider.java
index 1bbb35f208..47ca11f705 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserFeaturesProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserFeaturesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserIdentitiesProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserIdentitiesProvider.java
index c24ba9046c..d3726281ef 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserIdentitiesProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserIdentitiesProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserItemsProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserItemsProvider.java
index 15617917d1..d8aaab2aa7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserItemsProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/disco/UserItemsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilities.java b/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilities.java
index f7b89a6478..049a0be86e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilities.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java
index c0c67f00a5..813022a290 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/entitycaps/EntityCapabilitiesManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventAdapter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventAdapter.java
index a05080edc1..02652b237c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventAdapter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventAdapter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.event;
 
 import java.util.Map;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventDispatcher.java
index b47d09e0c5..d5ec8aebb3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventListener.java
index 475042b860..caf0382ba9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/GroupEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventDispatcher.java
index d10b6faf68..22bc2491bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventListener.java
index b5bc392fd7..ed5751b2bf 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/ServerSessionEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventDispatcher.java
index ba298f07f4..225caea686 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventListener.java
index adc17e8aaa..7811d71dd2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/SessionEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventAdapter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventAdapter.java
index 0dc0c2dedf..81ec6d9d28 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventAdapter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventDispatcher.java
index e62c27c321..6911c4e00f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventListener.java
index af56031332..0d541ae545 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/event/UserEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java
index 456e0aa4d5..2c1baa394d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/DefaultFileTransferManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransfer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransfer.java
index 9725a3df8d..03baab03e1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransfer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransfer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferEventListener.java
index 42b71df931..f5c0ae1c3b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferEventListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.filetransfer;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferManager.java
index fdffdc628b..33e3e357f5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferProgress.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferProgress.java
index c5f3915374..d0d08b7aef 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferProgress.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferProgress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferRejectedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferRejectedException.java
index 233a4b4ed0..0d8b5a4db8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferRejectedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/FileTransferRejectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/DefaultProxyTransfer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/DefaultProxyTransfer.java
index f36b7e26cf..642ae8aff1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/DefaultProxyTransfer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/DefaultProxyTransfer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java
index cf073cb804..0f2bb979be 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/FileTransferProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyConnectionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyConnectionManager.java
index 3c94270f06..42a8d1db0e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyConnectionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyConnectionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyOutputStream.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyOutputStream.java
index a54832964e..96265cbe5c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyOutputStream.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyTransfer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyTransfer.java
index 2e6c075abc..e2d27c6289 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyTransfer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyTransfer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/forward/Forwarded.java b/xmppserver/src/main/java/org/jivesoftware/openfire/forward/Forwarded.java
index 09a5b185a3..e46608bc12 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/forward/Forwarded.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/forward/Forwarded.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java
index 642b195291..3271f7a284 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/AbstractGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupList.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupList.java
index ccb5201a6e..fffe8088ec 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupList.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java
index ede85940d6..6eabb2de6d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/ConcurrentGroupMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java
index f517d10336..8ad5a75eff 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupPropertyMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java
index ea2a1c5d8f..96d7e7f19e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/DefaultGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java
index ccb9dbcc6c..26eef1419c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/Group.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAlreadyExistsException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAlreadyExistsException.java
index 090e19288f..039d8aab06 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAlreadyExistsException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareList.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareList.java
index 83f66f37ce..a0b993e160 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareList.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareList.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.group;
 
 import java.util.List;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareMap.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareMap.java
index f1db9c0b34..011f88f1cd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareMap.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupAwareMap.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.group;
 
 import java.util.Map;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupCollection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupCollection.java
index 742d9a995d..2ecda2a359 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupCollection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupJID.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupJID.java
index a1444aa7fd..acfa549ee8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupJID.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupJID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java
index 1589e34a10..4e35e41dae 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software. 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNameInvalidException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNameInvalidException.java
index fdaf87c825..9666eeef56 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNameInvalidException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNameInvalidException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNotFoundException.java
index a78ba72bbb..64c0a38b72 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java
index f7d110e923..bcccecf1ce 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/GroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java
index ba862b5880..db02c501a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/JDBCGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/group/SharedGroupVisibility.java b/xmppserver/src/main/java/org/jivesoftware/openfire/group/SharedGroupVisibility.java
index e86e1b8fad..0a2aa45667 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/group/SharedGroupVisibility.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/group/SharedGroupVisibility.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/DirectedPresence.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/DirectedPresence.java
index d11006c7ea..4076aa539c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/DirectedPresence.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/DirectedPresence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java
index 0ac35db7e4..6d4c9ac8e7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
index 0050b4030d..f4c053cbc6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBlockingHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQEntityTimeHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQEntityTimeHandler.java
index 642e052d6b..f50c646dd1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQEntityTimeHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQEntityTimeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2014 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java
index 600c8d0933..6b2b33d0e3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java
index 15518d9c57..60d60b3338 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQMessageCarbonsHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQMessageCarbonsHandler.java
index f1e81170b9..5831e0e184 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQMessageCarbonsHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQMessageCarbonsHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java
index 649e687892..acc2bc2cf1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQOfflineMessagesHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPingHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPingHandler.java
index 27ea5d13fc..881604a99a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPingHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPingHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivacyHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivacyHandler.java
index b64de28eb8..034b5ef333 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivacyHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivacyHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, Ignite Realtime Foundation 2023. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java
index b3f4600955..24e878c743 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQPrivateHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java
index 0136b15721..fc27c79c2e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterInfo.java
index 0cbf07231c..9aed75c1e6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRosterHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRosterHandler.java
index 268fedcc39..e942466571 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRosterHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRosterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java
index d35a776c98..0054a2cd39 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSessionEstablishmentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java
index 67efe4ebf0..9e51075d52 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQSharedGroupHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQVersionHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQVersionHandler.java
index 1cf7509152..439002337e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQVersionHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQVersionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQvCardHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQvCardHandler.java
index 2264292b62..f9b25dad6d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQvCardHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQvCardHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java
index 20713827ec..93081646d5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceSubscribeHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java
index c137fd0e70..a3cb222429 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/handler/PresenceUpdateHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/BoshBindingError.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/BoshBindingError.java
index e5c419029b..ca2f8ef9b6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/BoshBindingError.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/BoshBindingError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindBody.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindBody.java
index cfee7525d6..2ed5621b50 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindBody.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindContentSecurityPolicyFilter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindContentSecurityPolicyFilter.java
index 7555aa6381..2b52365a6c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindContentSecurityPolicyFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindContentSecurityPolicyFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) Ignite Realtime Foundation 2022-2023. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindException.java
index 05ac239cd4..6f135b586a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java
index b56e8550b8..a2278778a0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, Ignite Realtime Foundation 2022-2023. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindServlet.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindServlet.java
index 766e8f4d17..c4ab10423e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpBindServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnection.java
index 121b18408e..d0910230ed 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnectionClosedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnectionClosedException.java
index 9826f76fa7..7b1427105b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnectionClosedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpConnectionClosedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java
index 8b70a94628..f8cbb12d04 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java
index fb33b76e75..b625b51067 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/HttpSessionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/ResourceServlet.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/ResourceServlet.java
index 628094ca60..d93a5614db 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/ResourceServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/ResourceServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionEventDispatcher.java
index acc726928d..5fae0a77c6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionListener.java
index 25e4e8054f..7de960b084 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/SessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/http/TempFileToucherTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/http/TempFileToucherTask.java
index 2b1abba247..5bf289b652 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/http/TempFileToucherTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/http/TempFileToucherTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/InterceptorManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/InterceptorManager.java
index 2eb4f531cf..add01e2132 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/InterceptorManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/InterceptorManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketCopier.java b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketCopier.java
index 56942ffd7c..77d99eb8ad 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketCopier.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketCopier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketInterceptor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketInterceptor.java
index 9063dfa8c0..37f217e5fe 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketInterceptor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketRejectedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketRejectedException.java
index a90cd3c01d..dd13a5981d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketRejectedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/interceptor/PacketRejectedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStore.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStore.java
index 34ed9df56b..602d0bab76 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStore.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStore.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfigException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfigException.java
index 87fec57d9f..ecf068c1c4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfigException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfigException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfiguration.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfiguration.java
index d3ba0a4081..a15e94799d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfiguration.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java
index 718e35b92e..c413e985fe 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java
index 9c9e0dc8e8..a4ac9e41c7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.jivesoftware.util.NamedThreadFactory;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateUtils.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateUtils.java
index d126d6d8f1..b2a0ad4be3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.slf4j.Logger;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/IdentityStore.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/IdentityStore.java
index 92e5f8b0aa..34cc93df7d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/IdentityStore.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/IdentityStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManager.java
index efaa1f2ad4..c5eacdfa59 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/TrustStore.java b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/TrustStore.java
index c0bf8abfb8..fbd2eb91fd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/TrustStore.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/keystore/TrustStore.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.jivesoftware.util.CertificateManager;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java
index 08fa90f1f8..a97cc55bb0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationMapping.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationMapping.java
index ebf4794bdd..3468f23eae 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java
index d321bf382e..5d9588a6be 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapAuthorizationPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java
index 7f6cc8c041..ddb8966ea7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java
index 644e287fb0..a36ba55161 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java
index 8a640a39e1..935430da4f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java
index 42d0cbc827..c28ee03d20 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapVCardProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/DefaultLockOutProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/DefaultLockOutProvider.java
index 1b853d3e6e..43e3be7557 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/DefaultLockOutProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/DefaultLockOutProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventDispatcher.java
index 868e5b1077..59ab6295e5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventListener.java
index 934a8b503f..5c33747057 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutFlag.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutFlag.java
index 84881363f2..435c1fe770 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutFlag.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutFlag.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutManager.java
index 1d36031f82..0a6392d851 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutProvider.java
index 9d7d0e3ff9..3e71b138db 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/lockout/LockOutProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegate.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegate.java
index b27ee53e6b..56a63ec20a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegate.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.mbean;
 
 import javax.annotation.Nonnull;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegateMBean.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegateMBean.java
index ee072690c7..ae28ff6b46 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegateMBean.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mbean/ThreadPoolExecutorDelegateMBean.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.mbean;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Channel.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Channel.java
index 92f140667a..393ce74285 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Channel.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Channel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DatagramListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DatagramListener.java
index 6ff155d376..78abf84a72 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DatagramListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DatagramListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DynamicAddressChannel.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DynamicAddressChannel.java
index 3f6103f1df..ace9c0468b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DynamicAddressChannel.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/DynamicAddressChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Echo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Echo.java
index d15c7453da..decdb3e994 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Echo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/Echo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxy.java
index adf9daeea8..73908e4c7b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java
index 9681bd853f..fc4bb70a47 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxyService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxySession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxySession.java
index 094065473d..99cf621259 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxySession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/MediaProxySession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/ProxyCandidate.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/ProxyCandidate.java
index 6393a27d9c..74ff29e62a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/ProxyCandidate.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/ProxyCandidate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/RelaySession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/RelaySession.java
index fce97c9976..41023ef905 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/RelaySession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/RelaySession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/SessionListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/SessionListener.java
index 43294274d5..3db0e902e2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/SessionListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/mediaproxy/SessionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/CannotBeInvitedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/CannotBeInvitedException.java
index 3671af3243..25f0bbdb82 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/CannotBeInvitedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/CannotBeInvitedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ConflictException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ConflictException.java
index 83e9307ef6..dfac38976c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ConflictException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ConflictException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/FMUCException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/FMUCException.java
index 40e3634b56..18fe432452 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/FMUCException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/FMUCException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ForbiddenException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ForbiddenException.java
index 415888a152..6025d3d1b5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ForbiddenException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ForbiddenException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java
index 796becfbe1..0a53bd9e0d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryStrategy.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryStrategy.java
index 2b8d83c1d4..d4f40e73e8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryStrategy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java
index b06cf7a25a..26e9545e5a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDelegate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDispatcher.java
index bfe2624906..7753c99b61 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventListener.java
index 6eff8d6528..c64acaac33 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java
index 685a9cbd8e..938dd42977 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java
index c1081b0974..05dadba6c0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2021-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java
index 94864a871c..48787947bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java
index 07e80d9113..cd5996bbe1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java
index 90ee91fdcd..e62b521d50 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/MultiUserChatService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2021-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAcceptableException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAcceptableException.java
index 0ddcc86a1a..619adbc59e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAcceptableException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAcceptableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAllowedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAllowedException.java
index 4305450bc0..00cb24cb55 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAllowedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/NotAllowedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RegistrationRequiredException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RegistrationRequiredException.java
index cf2877f689..28235e8c59 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RegistrationRequiredException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RegistrationRequiredException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RoomLockedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RoomLockedException.java
index cd88a1be51..2f6b9a9272 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RoomLockedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/RoomLockedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ServiceUnavailableException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ServiceUnavailableException.java
index 3dc300bc93..47f6f5f559 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ServiceUnavailableException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/ServiceUnavailableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/MUCServicePropertyClusterEventTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/MUCServicePropertyClusterEventTask.java
index 1b96233c10..e863c2ffa7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/MUCServicePropertyClusterEventTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/MUCServicePropertyClusterEventTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Jive Software. All rights reserved.
+ * Copyright (C) 2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/NewClusterMemberJoinedTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/NewClusterMemberJoinedTask.java
index f674a9dac1..6cf708701b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/NewClusterMemberJoinedTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/NewClusterMemberJoinedTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantAddedTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantAddedTask.java
index ff7bd08230..722a295d88 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantAddedTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantAddedTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantKickedForNicknameTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantKickedForNicknameTask.java
index 76a2ea373f..870c2eab5a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantKickedForNicknameTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantKickedForNicknameTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantRemovedTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantRemovedTask.java
index b75457ae8f..c247298eeb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantRemovedTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantRemovedTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantUpdatedTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantUpdatedTask.java
index f817070009..4533ada858 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantUpdatedTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/OccupantUpdatedTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceAddedEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceAddedEvent.java
index f5b80440a5..7fc16ec0f1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceAddedEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceAddedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceRemovedEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceRemovedEvent.java
index e2f4383de3..f2253b74be 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceRemovedEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceRemovedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceUpdatedEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceUpdatedEvent.java
index b8bd8e8dd4..8ac1de2687 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceUpdatedEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/ServiceUpdatedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/SyncLocalOccupantsAndSendJoinPresenceTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/SyncLocalOccupantsAndSendJoinPresenceTask.java
index 98f9d6e1d1..a98b8c3f79 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/SyncLocalOccupantsAndSendJoinPresenceTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/cluster/SyncLocalOccupantsAndSendJoinPresenceTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/ConversationLogEntry.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/ConversationLogEntry.java
index ea118d9ba3..b218ca6ab1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/ConversationLogEntry.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/ConversationLogEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java
index d77eeda6a5..384ce42057 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQAdminHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java
index 6c5df361ff..c394523cd6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCRegisterHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java
index 6b76fd970e..5b6bdee110 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java
index c73a68ada6..4455a31baf 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCvCardHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java
index 84cbf39e55..4c8c1c9dc3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMuclumbusSearchHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java
index 0b6d32a067..86225cd5d8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQOwnerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java
index dee05db81a..9910777e04 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/LocalMUCRoomManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2021 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java
index 7b89e41072..71fd29ff2d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCRoomSearchInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCRoomSearchInfo.java
index 83c4e9bf83..e99b197129 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCRoomSearchInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCRoomSearchInfo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.muc.spi;
 
 
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServiceProperties.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServiceProperties.java
index 6885fa63de..b1bfe4a1d8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServiceProperties.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServiceProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventDispatcher.java
index 64866146a1..1aabfd5419 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventListener.java
index d99fa93a67..e24d2071ea 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCServicePropertyEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
index 3036b43c06..949cc4d1d4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java
index 1074d3b952..1938becfb7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/OccupantManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ClientSessionConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ClientSessionConnection.java
index 93f879c304..c0f7fcebda 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ClientSessionConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ClientSessionConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ConnectionMultiplexerManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ConnectionMultiplexerManager.java
index 737773b1ab..c13d99166a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ConnectionMultiplexerManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/ConnectionMultiplexerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketDeliverer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketDeliverer.java
index b77e91d458..3975da053c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketDeliverer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketHandler.java
index 8da2a7f050..1307c4cee4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/MultiplexerPacketHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/Route.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/Route.java
index 553aa64d5c..5079662189 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/Route.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/Route.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/UnknownStanzaException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/UnknownStanzaException.java
index 7e48b32349..9bad4e9a94 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/UnknownStanzaException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/multiplex/UnknownStanzaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/BlockingReadingMode.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/BlockingReadingMode.java
index 96b21b8c27..5395f539fd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/BlockingReadingMode.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/BlockingReadingMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientStanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientStanzaHandler.java
index e124a046f3..d53087d80f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientStanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientStanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientTrustManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientTrustManager.java
index 263abe3988..b2106eedb3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientTrustManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ClientTrustManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ComponentStanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ComponentStanzaHandler.java
index 3ca045d9e3..70b334e470 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ComponentStanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ComponentStanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java
index ede695b520..af9e2adc67 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MXParser.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MXParser.java
index 85de96e10c..fe4c3fbb1a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MXParser.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MXParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MulticastDNSService.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MulticastDNSService.java
index e6c7820da0..e22739d05c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MulticastDNSService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MulticastDNSService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MultiplexerStanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MultiplexerStanzaHandler.java
index 4386c35ece..6d8103eb66 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/MultiplexerStanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/MultiplexerStanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/OCSPChecker.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/OCSPChecker.java
index 9620de2533..a35a89e017 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/OCSPChecker.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/OCSPChecker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java
index 4e969a309f..38590080a8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SASLAuthentication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
index b27b09193b..b2d57c48f2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerStanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrafficCounter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrafficCounter.java
index a77744a501..cab362224b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrafficCounter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrafficCounter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrustManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrustManager.java
index 4ba3be1850..e1eb768ef7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrustManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/ServerTrustManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java
index 7cc8d88d2d..911ff78bf7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketPacketWriteHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketPacketWriteHandler.java
index a7f12ccb58..1229d67665 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketPacketWriteHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketPacketWriteHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java
index 1a8608145b..714a32b041 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReadingMode.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReadingMode.java
index 1bf007b9fb..c7ec4bcda4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReadingMode.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReadingMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java
index 02abf3ab0a..c87ca7aeec 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.net;
 
 import org.jivesoftware.openfire.server.RemoteServerManager;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java
index 16d75dd189..8601242df6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/StanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStatus.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStatus.java
index 7fb3fa78c5..36efbef8fd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStatus.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software and Artur Hefczyc. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software and Artur Hefczyc, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamHandler.java
index 240f27fd4c..73444b7fe4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamReader.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamReader.java
index a33f5e4afb..783d5fa8c4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamReader.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamWriter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamWriter.java
index 77b837d02c..8f386664da 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamWriter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSStreamWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java
index dba463c5bb..2b18a50d65 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/TLSWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software and Artur Hefczyc, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software and Artur Hefczyc, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java
index c6426d5824..e368e824ea 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/VirtualConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMLSocketWriter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMLSocketWriter.java
index 83d4ea60d0..5c7538e5bb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMLSocketWriter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMLSocketWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java
index 6aa78b2406..56d9bbe880 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/InboundBufferSizeException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/InboundBufferSizeException.java
index 8b584bdb21..ce881a0e63 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/InboundBufferSizeException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/InboundBufferSizeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyComponentConnectionHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyComponentConnectionHandler.java
index 4606da4243..93e6b4bead 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyComponentConnectionHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyComponentConnectionHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.nio;
 
 import io.netty.channel.ChannelHandlerContext;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java
index 6e8d89752e..43d1b15b32 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyMultiplexerConnectionHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyMultiplexerConnectionHandler.java
index e77126b140..36200ae6ba 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyMultiplexerConnectionHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyMultiplexerConnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyServerConnectionHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyServerConnectionHandler.java
index 061eb8b2f3..f0b70e692f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyServerConnectionHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyServerConnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyXMPPDecoder.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyXMPPDecoder.java
index e06db8a49f..2a2e4c7ffa 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyXMPPDecoder.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/NettyXMPPDecoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/OfflinePacketDeliverer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/OfflinePacketDeliverer.java
index 1783688280..a5beb114dd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/OfflinePacketDeliverer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/OfflinePacketDeliverer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2015 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2015 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLLightweightParser.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLLightweightParser.java
index 569f8cd03e..6282bac802 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLLightweightParser.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLLightweightParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLNotWellFormedException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLNotWellFormedException.java
index de11134191..5923138933 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLNotWellFormedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/nio/XMLNotWellFormedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java
index 96532a5ca6..226f2eff90 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPOwnerHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPOwnerHandler.java
index 1cf5ae474e..d11064bfde 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPOwnerHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/IQPEPOwnerHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java
index aa0779bfa1..d33ded76e8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceInfo.java
index da76e3fc6f..1355d0a350 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java
index 05c0386d48..48003d2d4c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pep/PEPServiceManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyItem.java b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyItem.java
index 39ff58423c..f8f04d5575 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyItem.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java
index 4dd54478b7..3bc090a38f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListEventListener.java
index 8c6b5a3278..e862d23254 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListManager.java
index 0af0f4063c..8064cc5474 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java
index e310281ad4..78eecc720e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyListProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java
index 670669a06b..405e337f25 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java
index b701098352..58e7424875 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CollectionNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultNodeConfiguration.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultNodeConfiguration.java
index 67616e8f96..9a7e1e4110 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultNodeConfiguration.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultNodeConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java
index 607060c0ff..8eb0d668a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java
index 295fa958bd..7d5b378373 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/InMemoryPubSubPersistenceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/LeafNode.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/LeafNode.java
index 4ac9b46a9e..fb39a76f98 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/LeafNode.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/LeafNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java
index 81130942c2..5544cbfb27 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeAffiliate.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeAffiliate.java
index 2a3d82d828..45b2706c53 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeAffiliate.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeAffiliate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java
index 8189bd2475..0624b14006 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NotAcceptableException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NotAcceptableException.java
index 3daac2c439..bd0961e205 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NotAcceptableException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NotAcceptableException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java
index 91e38637c5..eaa84941fd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PendingSubscriptionsCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java
index 816db86d3a..ae27400a0a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubInfo.java
index a2af4b3dfe..0c8d1fd279 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java
index 584ea43907..cc19238204 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java
index 5ac79c5824..e1b62cb59f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProviderManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProviderManager.java
index 028cd77250..50c5d15c22 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProviderManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubPersistenceProviderManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java
index d6bad45e93..22b828eb3f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubServiceInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubServiceInfo.java
index 151eb6e31c..f240ffbc68 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubServiceInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubServiceInfo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.pubsub;
 
 import org.jivesoftware.openfire.XMPPServer;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java
index ccb6e53af1..13c89a1162 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PublishedItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java
index 402b6c2e4c..8f285ba90d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/AffiliationTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java
index 335f4ae079..f869f0d072 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/CancelSubscriptionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java
index 2801758403..648549d272 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/FlushTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java
index c28ace86ef..7cbb5578ed 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/ModifySubscriptionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java
index 1840dc524b..2b57cdc545 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NewSubscriptionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java
index 128a0db472..c6587a93ca 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/NodeTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java
index 86feff9a51..04150eb121 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RefreshNodeTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java
index 1d2e8c9a29..0215931ab5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/RemoveNodeTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java
index cfa8312e56..b961b4791b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/cluster/SubscriptionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AccessModel.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AccessModel.java
index 126eec872f..430a4f22f3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AccessModel.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AccessModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AuthorizeAccess.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AuthorizeAccess.java
index 49f7cf355d..bc16fd440e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AuthorizeAccess.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/AuthorizeAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlyPublishers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlyPublishers.java
index 47f3bd7177..33f5b5202d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlyPublishers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlyPublishers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlySubscribers.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlySubscribers.java
index 7fc8eb9bb7..088ed1c55f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlySubscribers.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OnlySubscribers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenAccess.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenAccess.java
index 968043d048..20e7a936af 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenAccess.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenPublisher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenPublisher.java
index d86b23efb5..b14a40051b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenPublisher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/OpenPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java
index bfc0c82eb3..c8bffd4c77 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PresenceAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PublisherModel.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PublisherModel.java
index 1c2e4202b4..0e2a765613 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PublisherModel.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/PublisherModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/RosterAccess.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/RosterAccess.java
index 4ea1a044fc..232dfe164a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/RosterAccess.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/RosterAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/WhitelistAccess.java b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/WhitelistAccess.java
index 6b104df47e..43560d64c3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/WhitelistAccess.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/models/WhitelistAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java
index 64fd4d8bba..00645e0c6b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/DefaultRosterItemProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java
index 658727c7f1..67e936f7b0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/Roster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventDispatcher.java
index 15fca160eb..608ac1c2cd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventListener.java
index 021841661d..63c50605ae 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java
index 5e6006bf6c..6cf67e6544 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItemProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItemProvider.java
index 3a6db280fd..1c86ab4739 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItemProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterItemProvider.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2005-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.roster;
 
 import java.util.Iterator;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java
index 79da624537..7d017e4198 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/AnonymousSaslServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/AnonymousSaslServer.java
index 9e11c198de..952493bab6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/AnonymousSaslServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/AnonymousSaslServer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.sasl;
 
 import org.jivesoftware.openfire.Connection;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalClientSaslServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalClientSaslServer.java
index 588daab7d9..bda836ac08 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalClientSaslServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalClientSaslServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServer.java
index e6fba3c902..6a636f8788 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/Failure.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/Failure.java
index af20451f40..35fb87af72 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/Failure.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/Failure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.sasl;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/JiveSharedSecretSaslServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/JiveSharedSecretSaslServer.java
index b22457c268..a84e500693 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/JiveSharedSecretSaslServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/JiveSharedSecretSaslServer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.sasl;
 
 import org.jivesoftware.util.JiveGlobals;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslFailureException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslFailureException.java
index 1adf76f857..de4b579a7d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslFailureException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslFailureException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.sasl;
 
 import javax.security.sasl.SaslException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslProvider.java
index f0e86b7355..f2aad87ec5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerFactoryImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerFactoryImpl.java
index 5ce455611a..e149060700 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerFactoryImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerPlainImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerPlainImpl.java
index 2781330d58..5001f3bd1b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerPlainImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/SaslServerPlainImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java
index 9ecb2663ba..159725385e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ScramSha1SaslServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Surevine Ltd
+ * Copyright (C) 2015 Surevine Ltd, 2016-2020 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/VerifyPasswordCallback.java b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/VerifyPasswordCallback.java
index 15d7738197..194ab6754c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/VerifyPasswordCallback.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/sasl/VerifyPasswordCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/AuditWriteOnlyException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/AuditWriteOnlyException.java
index 4f90c3c7ba..807b17f80b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/AuditWriteOnlyException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/AuditWriteOnlyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java
index b9f48619c7..3de84c84a7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/EventNotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/EventNotFoundException.java
index 442d001075..f5e14afaa6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/EventNotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/EventNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditEvent.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditEvent.java
index 9d114a75aa..58b760ee95 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditEvent.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditManager.java
index c7cbf4165d..fccc74d910 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditProvider.java
index 313c0cc768..2877e10a54 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/security/SecurityAuditProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java
index 79d2e4a4b4..42118a05e8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingServerSocketReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java
index 7adc1dcf86..1c7bfe6289 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2015-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerConfiguration.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerConfiguration.java
index a77ee62aa1..75eb876458 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerConfiguration.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerManager.java
index bd343a9070..3d7b48a96b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/server/RemoteServerManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java b/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java
index 16ce4a87e2..7ce80ee5d5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/server/ServerDialback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSession.java
index 570db411de..a524d85995 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java
index 5d40c2ee20..d0c72c66a3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionTask.java
index 9da523346f..6daa64d554 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSession.java
index 0d8eb60658..6eda1818db 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSessionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSessionTask.java
index a65ece8bf3..d3ce25f58a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSessionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ComponentSessionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSession.java
index 115685d658..bab116bb95 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSessionTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSessionTask.java
index 1ebc535958..d996412a15 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSessionTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionMultiplexerSessionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java
index c47d7e6e75..7dca501baa 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ConnectionSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/DeliverRawTextTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/DeliverRawTextTask.java
index 7256c92776..9e5939b51c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/DeliverRawTextTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/DeliverRawTextTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/DomainPair.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/DomainPair.java
index 2c75af28d4..7320680890 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/DomainPair.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/DomainPair.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.session;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/GetSessionsCountTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/GetSessionsCountTask.java
index 0874a6d24f..e4c7223478 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/GetSessionsCountTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/GetSessionsCountTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/IncomingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/IncomingServerSession.java
index 3ee946dcd6..3f2b720691 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/IncomingServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/IncomingServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java
index 4b6ff44c1c..999bef579b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalClientSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalComponentSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalComponentSession.java
index 2b8016b7b5..9f37c4041c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalComponentSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalComponentSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalConnectionMultiplexerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalConnectionMultiplexerSession.java
index 6059dcfd87..1be6926e63 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalConnectionMultiplexerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalConnectionMultiplexerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java
index a4f83e0814..cd059b39c6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
index f5eac68e59..709bcd1ef3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalServerSession.java
index ae774be095..30148c8f2d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java
index f6404f75de..465e40277f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/OutgoingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/OutgoingServerSession.java
index d1afbca44a..e6b2db07d6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/OutgoingServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/OutgoingServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ProcessPacketTask.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ProcessPacketTask.java
index aff5eecb9b..ab23307949 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ProcessPacketTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ProcessPacketTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteClientSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteClientSession.java
index 20bc6a88dc..988c0fa824 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteClientSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteClientSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteComponentSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteComponentSession.java
index 70fe0f7544..f28adbf48c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteComponentSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteComponentSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteConnectionMultiplexerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteConnectionMultiplexerSession.java
index 4a92e1787a..3fdd676bc2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteConnectionMultiplexerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteConnectionMultiplexerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteOutgoingServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteOutgoingServerSession.java
index 7b3f5aa278..15eebda2c4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteOutgoingServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteOutgoingServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSession.java
index 7e3fba76e5..6cd01d647b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software, Ignite Realtime Foundation 2023. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocator.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocator.java
index be4f65da89..b4293b9722 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocator.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocatorImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocatorImpl.java
index e7dda84195..902aacd39f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocatorImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/RemoteSessionLocatorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2007-2009 Jive Software, 2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ServerSession.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ServerSession.java
index 0312cc8f5c..793b69ae46 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/ServerSession.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/ServerSession.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/Session.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/Session.java
index 6874f77851..b03940116c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/Session.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/Session.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, Ignite Realtime Foundation 2023. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareServerVersionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareServerVersionManager.java
index 5cc9275fcc..704143f359 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareServerVersionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareServerVersionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareVersionManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareVersionManager.java
index 12b545503b..c6ef361df5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareVersionManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/session/SoftwareVersionManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2019-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java
index ab76ab4fa4..1e96dba22a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/BasicStreamIDFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ClientRoute.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ClientRoute.java
index 1ccf818236..687463345c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ClientRoute.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ClientRoute.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionAcceptor.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionAcceptor.java
index f35d1986e7..6aabbb72f2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionAcceptor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionAcceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.spi;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionConfiguration.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionConfiguration.java
index a5b9dde028..a5188f70e0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionConfiguration.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionConfiguration.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.spi;
 
 import org.jivesoftware.openfire.Connection;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java
index d1be0ba8cb..0dffd1528e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
index a94ea2b9b9..45247fd2b5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionType.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionType.java
index b63cbaa568..840a3beb85 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionType.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionType.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.spi;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java
index 06e9a6d6d6..a070de30b1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/LocalRoutingTable.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/LocalRoutingTable.java
index 6097b4b420..ca999f4d6e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/LocalRoutingTable.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/LocalRoutingTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/NettyServerInitializer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/NettyServerInitializer.java
index 60000e681f..3c50b41f1d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/NettyServerInitializer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/NettyServerInitializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.spi;
 
 import io.netty.channel.ChannelInitializer;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketDelivererImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketDelivererImpl.java
index 4e6c4e60ff..3483915c5c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketDelivererImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketDelivererImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketRouterImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketRouterImpl.java
index 7c02daf404..1085855396 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketRouterImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketRouterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketTransporterImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketTransporterImpl.java
index 152c44daf5..18de64523a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketTransporterImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PacketTransporterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java
index d7d736b706..3a985e2e48 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/PresenceManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java
index 7d88060d40..cf610bdf43 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
index 2864aa73e9..c202114b4d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/spi/XMPPServerInfoImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
index 5de2c77bb1..3e118b6305 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/Statistic.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/Statistic.java
index e8c2f9fa4f..d432d4d453 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/Statistic.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/Statistic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/StatisticsManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/StatisticsManager.java
index d36b977256..302d192aa2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/StatisticsManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/StatisticsManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/i18nStatistic.java b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/i18nStatistic.java
index 6c499d04b1..5f9d33af99 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/stats/i18nStatistic.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/stats/i18nStatistic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2008 Jive Software. All rights reserved.
+ * Copyright (C) 1999-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java
index 37ddb35fc2..9523d54118 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/streammanagement/StreamManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/transport/TransportHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/transport/TransportHandler.java
index e35223feb3..3cf3545d99 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/transport/TransportHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/transport/TransportHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/update/AvailablePlugin.java b/xmppserver/src/main/java/org/jivesoftware/openfire/update/AvailablePlugin.java
index 548421af6a..a89f126aeb 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/update/AvailablePlugin.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/update/AvailablePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/update/DownloadStatus.java b/xmppserver/src/main/java/org/jivesoftware/openfire/update/DownloadStatus.java
index dd2dd82c70..794d7c2e35 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/update/DownloadStatus.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/update/DownloadStatus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java
index db9b659f0e..755fad6177 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/update/PluginDownloadManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/update/Update.java b/xmppserver/src/main/java/org/jivesoftware/openfire/update/Update.java
index 86f93dfc5f..5484f8cf74 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/update/Update.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/update/Update.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java
index 2dfc2fbf4a..eba3ea01e7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/update/UpdateManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/AuthorizationBasedUserProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/AuthorizationBasedUserProviderMapper.java
index a5f8ca2ac5..7ac20b6b68 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/AuthorizationBasedUserProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/AuthorizationBasedUserProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/DefaultUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/DefaultUserProvider.java
index 963a26a07f..21b54b3aa1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/DefaultUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/DefaultUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java
index d853a08c6e..69f09023a7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/HybridUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2018-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/JDBCUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/JDBCUserProvider.java
index cac413dbff..06ac790034 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/JDBCUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/JDBCUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/MappedUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/MappedUserProvider.java
index f29d91921e..79caa1e3f4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/MappedUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/MappedUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2018-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/NativeUserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/NativeUserProvider.java
index 896c54985f..5cce6e6a5f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/NativeUserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/NativeUserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/POP3UserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/POP3UserProvider.java
index 4afd077fed..e381a61f2f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/POP3UserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/POP3UserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventDispatcher.java
index 66486778c8..cb2973e8f5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventListener.java
index ba364e5d0c..02d0442b26 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PresenceEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PropertyBasedUserProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PropertyBasedUserProviderMapper.java
index 56c6e4c940..348f98692d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/PropertyBasedUserProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/PropertyBasedUserProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Ignite Realtime Foundation
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/User.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/User.java
index bcda99b83c..0bc3b1b586 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/User.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserAlreadyExistsException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserAlreadyExistsException.java
index b9ed102d5f..9a61a51d4f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserAlreadyExistsException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserAlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserCollection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserCollection.java
index d98c48eb4c..9bad457e94 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserCollection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java
index ba25410d86..9bb6bc997a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java
index a744270fe9..14c1c22d48 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserMultiProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2018 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameManager.java
index efd2542fb7..5e44c70235 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameProvider.java
index f5714e6c77..903c4b0119 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNameProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNotFoundException.java
index 0c3df6343a..c0c80bca14 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserNotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProvider.java
index 4df217479a..15b46623ef 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProviderMapper.java
index 47f3bf7ef4..510be307e0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/UserProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IgniteRealtime.org
+ * Copyright (C) 2016 IgniteRealtime.org, 2017-2018 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/DefaultUserPropertyProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/DefaultUserPropertyProvider.java
index 282714da68..4c3dc94c68 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/DefaultUserPropertyProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/DefaultUserPropertyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java
index 87b52b9cf4..70a2057aad 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/HybridUserPropertyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/JDBCUserPropertyProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/JDBCUserPropertyProvider.java
index d96ba1c38e..6a53642319 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/JDBCUserPropertyProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/JDBCUserPropertyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2020 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProvider.java
index 0d63bbdae4..f6bee00dc9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/MappedUserPropertyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProvider.java
index 7a40232960..6f60c284aa 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProviderMapper.java b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProviderMapper.java
index cb8cbe9564..13bbd321a2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProviderMapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/user/property/UserPropertyProviderMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 IgniteRealtime.org
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java
index 19f149451d..5e0afcd615 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/DefaultVCardProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/PhotoResizer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/PhotoResizer.java
index 960ab59e97..efbf6fc5aa 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/PhotoResizer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/PhotoResizer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.vcard;
 
 import org.dom4j.Element;
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardEventDispatcher.java
index 4e1903308f..3c28508dfd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardListener.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardListener.java
index 25d8673ddb..a32e8d667c 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardManager.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardManager.java
index 66805929ad..be7fbc61f5 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardProvider.java b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardProvider.java
index d7487dada3..22415595dd 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardProvider.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/vcard/VCardProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/OpenfireWebSocketServlet.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/OpenfireWebSocketServlet.java
index 9ca9575106..83b1ffbaca 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/OpenfireWebSocketServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/OpenfireWebSocketServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Tom Evans, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2015 Tom Evans, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/StreamManagementPacketRouter.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/StreamManagementPacketRouter.java
index 7b1d6a5694..46198ee826 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/StreamManagementPacketRouter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/StreamManagementPacketRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Tom Evans. All rights reserved.
+ * Copyright (C) 2015 Tom Evans, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java
index 88ddd91330..7f6e2437fc 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientConnectionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Tom Evans, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2015 Tom Evans, 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java
index 46ab27f0de..68ee0039ba 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketClientStanzaHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java
index 0b019d1edf..41dd416eaf 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/WebSocketConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Tom Evans, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2015 Tom Evans, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XMPPPPacketReaderFactory.java b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XMPPPPacketReaderFactory.java
index 1076bf64ec..07785a3b4a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XMPPPPacketReaderFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/websocket/XMPPPPacketReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Tom Evans. All rights reserved.
+ * Copyright (C) 2015 Tom Evans, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/AesEncryptor.java b/xmppserver/src/main/java/org/jivesoftware/util/AesEncryptor.java
index 15dbb73a96..6edb6959bc 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/AesEncryptor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/AesEncryptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.nio.charset.StandardCharsets;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/AlreadyExistsException.java b/xmppserver/src/main/java/org/jivesoftware/util/AlreadyExistsException.java
index 73dccc9fc9..15a64b39e2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/AlreadyExistsException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/AlreadyExistsException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java b/xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java
index 6e6bdc80b8..a32cc9f515 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/AutoCloseableReentrantLock.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.util.Collections;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/Base64.java b/xmppserver/src/main/java/org/jivesoftware/util/Base64.java
index 3de154e1a0..b135bfe536 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/Base64.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/Base64.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2006-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 /**
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/BeanUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/BeanUtils.java
index 50cc4247d2..196fe710a6 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/BeanUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/BeanUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/Blowfish.java b/xmppserver/src/main/java/org/jivesoftware/util/Blowfish.java
index 2e0a6d85c2..6024e1a258 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/Blowfish.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/Blowfish.java
@@ -1,11 +1,21 @@
 /*
+ * Copyright (c) 1997-2002 Markus Hahn <markus_hahn@gmx.net>, 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
  * Adapted from Markus Hahn's Blowfish package so that all functionality is
  * in a single source file. Please visit the following URL for his excellent
  * package: http://www.hotpixel.net/software.html
  *
- * Copyright (c) 1997-2002 Markus Hahn <markus_hahn@gmx.net>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * Released under the Apache 2.0 license.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jivesoftware.util;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ByteFormat.java b/xmppserver/src/main/java/org/jivesoftware/util/ByteFormat.java
index d522cd063e..4a4e97301f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ByteFormat.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ByteFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/CacheableOptional.java b/xmppserver/src/main/java/org/jivesoftware/util/CacheableOptional.java
index 934a45f28c..a367813619 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/CacheableOptional.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/CacheableOptional.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import org.jivesoftware.util.cache.CacheSizes;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/CertificateEventListener.java b/xmppserver/src/main/java/org/jivesoftware/util/CertificateEventListener.java
index 6ec95d40d3..0762a3ebd9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/CertificateEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/CertificateEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/CertificateManager.java b/xmppserver/src/main/java/org/jivesoftware/util/CertificateManager.java
index b2705d31b3..385f22d160 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/CertificateManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/CertificateManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ClassUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/ClassUtils.java
index 4d4d28a2cb..24e0e9fd1d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ClassUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ClassUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/CookieUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/CookieUtils.java
index 1451018df0..8bdf8a9cb7 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/CookieUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/CookieUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ElementUtil.java b/xmppserver/src/main/java/org/jivesoftware/util/ElementUtil.java
index 23404139f5..0c72312245 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ElementUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ElementUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2009 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/EmailService.java b/xmppserver/src/main/java/org/jivesoftware/util/EmailService.java
index 9e6607cb9c..cd3a24bed1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/EmailService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/EmailService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2003-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/Encryptor.java b/xmppserver/src/main/java/org/jivesoftware/util/Encryptor.java
index a681712775..fe3b75a2b9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/Encryptor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/Encryptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 public interface Encryptor {
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/FastDateFormat.java b/xmppserver/src/main/java/org/jivesoftware/util/FastDateFormat.java
index da8af8e883..caf4921a2b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/FastDateFormat.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/FastDateFormat.java
@@ -50,6 +50,8 @@
  * For more information about Tea, please see http://opensource.go.com/.
  */
 
+//TODO: https://igniterealtime.atlassian.net/browse/OF-2754
+
 package org.jivesoftware.util;
 
 import java.util.Date;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java b/xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java
index 3542a78b2d..47ae693f17 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/FaviconServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/HTTPConnectionException.java b/xmppserver/src/main/java/org/jivesoftware/util/HTTPConnectionException.java
index 3e5b2ac659..f5454bcb4f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/HTTPConnectionException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/HTTPConnectionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ImmediateFuture.java b/xmppserver/src/main/java/org/jivesoftware/util/ImmediateFuture.java
index a4e53bdbea..9dc004d203 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ImmediateFuture.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ImmediateFuture.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.util.concurrent.Future;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/InitializationException.java b/xmppserver/src/main/java/org/jivesoftware/util/InitializationException.java
index 3d2a1ff06b..38dc82a292 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/InitializationException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/InitializationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JavaSpecVersion.java b/xmppserver/src/main/java/org/jivesoftware/util/JavaSpecVersion.java
index 3cfa7e9452..3e0bd35106 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JavaSpecVersion.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JavaSpecVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveBeanInfo.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveBeanInfo.java
index 9cb5817999..fd61a13e80 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveBeanInfo.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveBeanInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
index 36b47fb08d..fb586aa277 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
index e9a1214c84..629c8dcfac 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveGlobals.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveInitialLdapContext.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveInitialLdapContext.java
index 93be4db6cd..8999ff627a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveInitialLdapContext.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveInitialLdapContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/JiveProperties.java b/xmppserver/src/main/java/org/jivesoftware/util/JiveProperties.java
index 0d4ef559c6..782b2896f0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/JiveProperties.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/JiveProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/LinkedList.java b/xmppserver/src/main/java/org/jivesoftware/util/LinkedList.java
index 6e799036ba..3aa5303611 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/LinkedList.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/LinkedList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/LinkedListNode.java b/xmppserver/src/main/java/org/jivesoftware/util/LinkedListNode.java
index 5729d303a7..c16edecf23 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/LinkedListNode.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/LinkedListNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ListPager.java b/xmppserver/src/main/java/org/jivesoftware/util/ListPager.java
index 59270eb791..a5551a7b57 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ListPager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ListPager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.io.UnsupportedEncodingException;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/LocaleFilter.java b/xmppserver/src/main/java/org/jivesoftware/util/LocaleFilter.java
index 8b0ee88132..53a0d25b64 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/LocaleFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/LocaleFilter.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
index 2111aea543..e5a668b47e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/LocaleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/Log.java b/xmppserver/src/main/java/org/jivesoftware/util/Log.java
index e222ca9067..f4adb38a3b 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/Log.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/Log.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ModificationNotAllowedException.java b/xmppserver/src/main/java/org/jivesoftware/util/ModificationNotAllowedException.java
index 5565842f24..856c48d0ce 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ModificationNotAllowedException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ModificationNotAllowedException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/NamedThreadFactory.java b/xmppserver/src/main/java/org/jivesoftware/util/NamedThreadFactory.java
index 7362bfc8e6..d0bcf0a9ba 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/NamedThreadFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/NamedThreadFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.util.concurrent.ThreadFactory;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/NotFoundException.java b/xmppserver/src/main/java/org/jivesoftware/util/NotFoundException.java
index c526a1dc80..34f22e0743 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/NotFoundException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/NotFoundException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/ParamUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/ParamUtils.java
index 9f4259500f..efa0387b5e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/ParamUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/ParamUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/PersistableMap.java b/xmppserver/src/main/java/org/jivesoftware/util/PersistableMap.java
index 7a66ea2359..a24a383e4a 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/PersistableMap.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/PersistableMap.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.util.HashMap;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/PropertyClusterEventTask.java b/xmppserver/src/main/java/org/jivesoftware/util/PropertyClusterEventTask.java
index 813c13e0c8..443fcb5805 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/PropertyClusterEventTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/PropertyClusterEventTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventDispatcher.java b/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventDispatcher.java
index b641c01862..e96b3a7245 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventDispatcher.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventListener.java b/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventListener.java
index 066abf0514..7b1de72346 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventListener.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/PropertyEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java b/xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java
index 2b427d6b08..4b2f8406f0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/SAXReaderUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/SetCharacterEncodingFilter.java b/xmppserver/src/main/java/org/jivesoftware/util/SetCharacterEncodingFilter.java
index 095469a1da..254fcaa196 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/SetCharacterEncodingFilter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/SetCharacterEncodingFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/SimpleSSLSocketFactory.java b/xmppserver/src/main/java/org/jivesoftware/util/SimpleSSLSocketFactory.java
index 1799215474..7886bf62d0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/SimpleSSLSocketFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/SimpleSSLSocketFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/SmsService.java b/xmppserver/src/main/java/org/jivesoftware/util/SmsService.java
index 01946f1e75..7fd0f508d4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/SmsService.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/SmsService.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import org.apache.commons.pool2.BasePooledObjectFactory;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java
index 29b960960c..4a68ff5252 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java b/xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java
index 1833a3deb3..cbb2b59288 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/SystemProperty.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import java.time.Duration;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/TaskEngine.java b/xmppserver/src/main/java/org/jivesoftware/util/TaskEngine.java
index ac3aa9d49a..cb088d3d3e 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/TaskEngine.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/TaskEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/Version.java b/xmppserver/src/main/java/org/jivesoftware/util/Version.java
index e7f5821526..6381f53b88 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/Version.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/Version.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/WebBean.java b/xmppserver/src/main/java/org/jivesoftware/util/WebBean.java
index 02a413d4ba..09eaecc0c3 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/WebBean.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/WebBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/WebManager.java b/xmppserver/src/main/java/org/jivesoftware/util/WebManager.java
index 83ec91f6d4..835183c1e0 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/WebManager.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/WebManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/WebXmlUtils.java b/xmppserver/src/main/java/org/jivesoftware/util/WebXmlUtils.java
index c6d31cf813..67086fe85d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/WebXmlUtils.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/WebXmlUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2016-2021 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import org.dom4j.Document;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java b/xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java
index df6d9c1512..73278586a9 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/XMLWriter.java b/xmppserver/src/main/java/org/jivesoftware/util/XMLWriter.java
index 67f459bf34..611bc19478 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/XMLWriter.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/XMLWriter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2005-2006 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import org.dom4j.*;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/XMPPDateTimeFormat.java b/xmppserver/src/main/java/org/jivesoftware/util/XMPPDateTimeFormat.java
index 4f39b94f4e..db170a8410 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/XMPPDateTimeFormat.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/XMPPDateTimeFormat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Florian Schmaus
+ * Copyright (C) 2013 Florian Schmaus, 2017-2019 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java
index 3264000804..3ca477828d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java
index 94e762eeb7..af5c9e93ae 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactoryStrategy.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactoryStrategy.java
index 0a28f70f5a..843cb4e580 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactoryStrategy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheFactoryStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheSizes.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheSizes.java
index 1cfe4e59d8..309929daf4 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheSizes.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheSizes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheUtil.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheUtil.java
index 2a77046acc..db17f43441 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java
index ce474626fd..2a729b8850 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CacheWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/Cacheable.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/Cacheable.java
index 3a6fc2b337..a1d2ae796f 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/Cacheable.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/Cacheable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/CannotCalculateSizeException.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/CannotCalculateSizeException.java
index ec5d1b7641..8838b37dd8 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/CannotCalculateSizeException.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/CannotCalculateSizeException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ClusterTask.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ClusterTask.java
index 8573f54835..b5bc649720 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ClusterTask.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ClusterTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ComponentCacheWrapper.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ComponentCacheWrapper.java
index a7d48fa8c6..29ae83617d 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ComponentCacheWrapper.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ComponentCacheWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2020 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java
index e0c95477f8..aca6407d29 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyChecks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyMonitor.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyMonitor.java
index 60d2ac74e6..56abab1754 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyMonitor.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ConsistencyMonitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 IgniteRealtime Foundation
+ * Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java
index da184d94c2..0c59991f86 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultExternalizableUtil.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultExternalizableUtil.java
index 88b47f4752..14fbc361da 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultExternalizableUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultExternalizableUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java
index 1eae3d917a..bf266bbeb2 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultLocalCacheStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2021 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java
index 644e8f3c3d..599e3bd619 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtilStrategy.java b/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtilStrategy.java
index 5f646b19f5..4f736d1bbe 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtilStrategy.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtilStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2005-2008 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cert/CNCertificateIdentityMapping.java b/xmppserver/src/main/java/org/jivesoftware/util/cert/CNCertificateIdentityMapping.java
index 354099679c..d61394fe88 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cert/CNCertificateIdentityMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cert/CNCertificateIdentityMapping.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util.cert;
 
 import java.security.cert.X509Certificate;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cert/CertificateIdentityMapping.java b/xmppserver/src/main/java/org/jivesoftware/util/cert/CertificateIdentityMapping.java
index 6dc0565833..03f6b83758 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cert/CertificateIdentityMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cert/CertificateIdentityMapping.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2018 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util.cert;
 
 import java.security.cert.X509Certificate;
diff --git a/xmppserver/src/main/java/org/jivesoftware/util/cert/SANCertificateIdentityMapping.java b/xmppserver/src/main/java/org/jivesoftware/util/cert/SANCertificateIdentityMapping.java
index dcd24a156e..23b4cb3bf1 100644
--- a/xmppserver/src/main/java/org/jivesoftware/util/cert/SANCertificateIdentityMapping.java
+++ b/xmppserver/src/main/java/org/jivesoftware/util/cert/SANCertificateIdentityMapping.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util.cert;
 
 import org.bouncycastle.asn1.*;
diff --git a/xmppserver/src/main/webapp/audit-policy.jsp b/xmppserver/src/main/webapp/audit-policy.jsp
index 4012914293..2097079aa8 100644
--- a/xmppserver/src/main/webapp/audit-policy.jsp
+++ b/xmppserver/src/main/webapp/audit-policy.jsp
@@ -1,5 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
+  - Copyright (C) 2016-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/available-plugins.jsp b/xmppserver/src/main/webapp/available-plugins.jsp
index d3cfec0962..dd1825e4e7 100644
--- a/xmppserver/src/main/webapp/available-plugins.jsp
+++ b/xmppserver/src/main/webapp/available-plugins.jsp
@@ -1,5 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
   - You may obtain a copy of the License at
diff --git a/xmppserver/src/main/webapp/component-session-details.jsp b/xmppserver/src/main/webapp/component-session-details.jsp
index 5310963fdd..99f29e04b0 100644
--- a/xmppserver/src/main/webapp/component-session-details.jsp
+++ b/xmppserver/src/main/webapp/component-session-details.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/component-session-summary.jsp b/xmppserver/src/main/webapp/component-session-summary.jsp
index 4c66295cd2..d012806243 100644
--- a/xmppserver/src/main/webapp/component-session-summary.jsp
+++ b/xmppserver/src/main/webapp/component-session-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/compression-settings.jsp b/xmppserver/src/main/webapp/compression-settings.jsp
index f38861d9fd..69c3d7f0da 100644
--- a/xmppserver/src/main/webapp/compression-settings.jsp
+++ b/xmppserver/src/main/webapp/compression-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software, Ignite Realtime Foundation 2023. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/connection-managers-settings.jsp b/xmppserver/src/main/webapp/connection-managers-settings.jsp
index 7845615327..5798e99575 100644
--- a/xmppserver/src/main/webapp/connection-managers-settings.jsp
+++ b/xmppserver/src/main/webapp/connection-managers-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/connection-settings-advanced.jsp b/xmppserver/src/main/webapp/connection-settings-advanced.jsp
index cd12ffddb2..add878df30 100644
--- a/xmppserver/src/main/webapp/connection-settings-advanced.jsp
+++ b/xmppserver/src/main/webapp/connection-settings-advanced.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.util.ParamUtils" %>
diff --git a/xmppserver/src/main/webapp/connection-settings-external-components.jsp b/xmppserver/src/main/webapp/connection-settings-external-components.jsp
index df9415d1a9..b4437c4b3f 100644
--- a/xmppserver/src/main/webapp/connection-settings-external-components.jsp
+++ b/xmppserver/src/main/webapp/connection-settings-external-components.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="org.jivesoftware.openfire.component.ExternalComponentConfiguration" %>
diff --git a/xmppserver/src/main/webapp/connection-settings-socket-c2s.jsp b/xmppserver/src/main/webapp/connection-settings-socket-c2s.jsp
index 54a8051257..8d6c20f604 100644
--- a/xmppserver/src/main/webapp/connection-settings-socket-c2s.jsp
+++ b/xmppserver/src/main/webapp/connection-settings-socket-c2s.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.time.Duration" %>
 <%@ page import="java.util.HashMap" %>
diff --git a/xmppserver/src/main/webapp/connection-settings-socket-s2s.jsp b/xmppserver/src/main/webapp/connection-settings-socket-s2s.jsp
index 15f8c32f1c..6cf9a7a7c5 100644
--- a/xmppserver/src/main/webapp/connection-settings-socket-s2s.jsp
+++ b/xmppserver/src/main/webapp/connection-settings-socket-s2s.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.spi.ConnectionConfiguration" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
diff --git a/xmppserver/src/main/webapp/decorators/main.jsp b/xmppserver/src/main/webapp/decorators/main.jsp
index 4f03842734..767b2c8de1 100644
--- a/xmppserver/src/main/webapp/decorators/main.jsp
+++ b/xmppserver/src/main/webapp/decorators/main.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/decorators/setup.jsp b/xmppserver/src/main/webapp/decorators/setup.jsp
index 6e0e49a9c1..b10b584e5d 100644
--- a/xmppserver/src/main/webapp/decorators/setup.jsp
+++ b/xmppserver/src/main/webapp/decorators/setup.jsp
@@ -1,6 +1,6 @@
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/dns-check.jsp b/xmppserver/src/main/webapp/dns-check.jsp
index 6aa8039084..2880d36f7d 100644
--- a/xmppserver/src/main/webapp/dns-check.jsp
+++ b/xmppserver/src/main/webapp/dns-check.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 
diff --git a/xmppserver/src/main/webapp/error-serverdown.jsp b/xmppserver/src/main/webapp/error-serverdown.jsp
index bc605d74c7..10a392dc0b 100644
--- a/xmppserver/src/main/webapp/error-serverdown.jsp
+++ b/xmppserver/src/main/webapp/error-serverdown.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
  <%--
 --%>
diff --git a/xmppserver/src/main/webapp/error.jsp b/xmppserver/src/main/webapp/error.jsp
index 59183a89df..14759404a6 100644
--- a/xmppserver/src/main/webapp/error.jsp
+++ b/xmppserver/src/main/webapp/error.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.io.*,
                  org.jivesoftware.util.ParamUtils,
diff --git a/xmppserver/src/main/webapp/file-transfer-proxy.jsp b/xmppserver/src/main/webapp/file-transfer-proxy.jsp
index 6cd014582d..78a532a166 100644
--- a/xmppserver/src/main/webapp/file-transfer-proxy.jsp
+++ b/xmppserver/src/main/webapp/file-transfer-proxy.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/group-create.jsp b/xmppserver/src/main/webapp/group-create.jsp
index 4133a92d60..4b44d42600 100644
--- a/xmppserver/src/main/webapp/group-create.jsp
+++ b/xmppserver/src/main/webapp/group-create.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/group-delete.jsp b/xmppserver/src/main/webapp/group-delete.jsp
index 352af5fb00..565ae77100 100644
--- a/xmppserver/src/main/webapp/group-delete.jsp
+++ b/xmppserver/src/main/webapp/group-delete.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/group-edit.jsp b/xmppserver/src/main/webapp/group-edit.jsp
index 3c994c852b..f9df47823e 100644
--- a/xmppserver/src/main/webapp/group-edit.jsp
+++ b/xmppserver/src/main/webapp/group-edit.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/group-summary.jsp b/xmppserver/src/main/webapp/group-summary.jsp
index 6304b4ef5b..18c7c627d3 100644
--- a/xmppserver/src/main/webapp/group-summary.jsp
+++ b/xmppserver/src/main/webapp/group-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/http-bind.jsp b/xmppserver/src/main/webapp/http-bind.jsp
index 1cff495c0a..5207fcab7e 100644
--- a/xmppserver/src/main/webapp/http-bind.jsp
+++ b/xmppserver/src/main/webapp/http-bind.jsp
@@ -1,6 +1,6 @@
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/import-keystore-certificate.jsp b/xmppserver/src/main/webapp/import-keystore-certificate.jsp
index 484a603804..d530ffbcc4 100644
--- a/xmppserver/src/main/webapp/import-keystore-certificate.jsp
+++ b/xmppserver/src/main/webapp/import-keystore-certificate.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2007-2008 Jive Software, 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
diff --git a/xmppserver/src/main/webapp/import-truststore-certificate.jsp b/xmppserver/src/main/webapp/import-truststore-certificate.jsp
index 861a9d0584..02fd8ebb3b 100644
--- a/xmppserver/src/main/webapp/import-truststore-certificate.jsp
+++ b/xmppserver/src/main/webapp/import-truststore-certificate.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 <%@ page import="org.jivesoftware.openfire.keystore.TrustStore"%>
diff --git a/xmppserver/src/main/webapp/index.jsp b/xmppserver/src/main/webapp/index.jsp
index d903f38cda..897bb9a518 100644
--- a/xmppserver/src/main/webapp/index.jsp
+++ b/xmppserver/src/main/webapp/index.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/ldap-group.jsp b/xmppserver/src/main/webapp/ldap-group.jsp
index d68e88cf57..4afbcdeb7a 100644
--- a/xmppserver/src/main/webapp/ldap-group.jsp
+++ b/xmppserver/src/main/webapp/ldap-group.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.HashMap" %>
diff --git a/xmppserver/src/main/webapp/ldap-server.jsp b/xmppserver/src/main/webapp/ldap-server.jsp
index 29cce4f5f3..ba932525ad 100644
--- a/xmppserver/src/main/webapp/ldap-server.jsp
+++ b/xmppserver/src/main/webapp/ldap-server.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%
     String serverType = null;
diff --git a/xmppserver/src/main/webapp/ldap-user.jsp b/xmppserver/src/main/webapp/ldap-user.jsp
index 88687f49af..271f157d7d 100644
--- a/xmppserver/src/main/webapp/ldap-user.jsp
+++ b/xmppserver/src/main/webapp/ldap-user.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.HashMap" %>
diff --git a/xmppserver/src/main/webapp/log.jsp b/xmppserver/src/main/webapp/log.jsp
index 8d160c286c..cbd5eef68a 100644
--- a/xmppserver/src/main/webapp/log.jsp
+++ b/xmppserver/src/main/webapp/log.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/login.jsp b/xmppserver/src/main/webapp/login.jsp
index e0b0cd4241..11e9678a67 100644
--- a/xmppserver/src/main/webapp/login.jsp
+++ b/xmppserver/src/main/webapp/login.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2010 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.admin.AdminConsole,
                 org.jivesoftware.openfire.admin.AdminManager"
diff --git a/xmppserver/src/main/webapp/loginToken.jsp b/xmppserver/src/main/webapp/loginToken.jsp
index 04ad8d7b28..4da230b69d 100644
--- a/xmppserver/src/main/webapp/loginToken.jsp
+++ b/xmppserver/src/main/webapp/loginToken.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.admin.AdminConsole,
                  org.jivesoftware.admin.LoginLimitManager"
diff --git a/xmppserver/src/main/webapp/logviewer.jsp b/xmppserver/src/main/webapp/logviewer.jsp
index e350142438..e442c06271 100644
--- a/xmppserver/src/main/webapp/logviewer.jsp
+++ b/xmppserver/src/main/webapp/logviewer.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/manage-updates.jsp b/xmppserver/src/main/webapp/manage-updates.jsp
index c91a682b8e..dc0b4f4301 100644
--- a/xmppserver/src/main/webapp/manage-updates.jsp
+++ b/xmppserver/src/main/webapp/manage-updates.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/media-proxy.jsp b/xmppserver/src/main/webapp/media-proxy.jsp
index d5d1185958..b98fc23d09 100644
--- a/xmppserver/src/main/webapp/media-proxy.jsp
+++ b/xmppserver/src/main/webapp/media-proxy.jsp
@@ -1,6 +1,6 @@
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-create-permission.jsp b/xmppserver/src/main/webapp/muc-create-permission.jsp
index d37dd768ef..ff062c4574 100644
--- a/xmppserver/src/main/webapp/muc-create-permission.jsp
+++ b/xmppserver/src/main/webapp/muc-create-permission.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-default-settings.jsp b/xmppserver/src/main/webapp/muc-default-settings.jsp
index 7bfbd440c5..6e40010d53 100644
--- a/xmppserver/src/main/webapp/muc-default-settings.jsp
+++ b/xmppserver/src/main/webapp/muc-default-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2010 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2010 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-history-settings.jsp b/xmppserver/src/main/webapp/muc-history-settings.jsp
index 3207976b60..7cb5dec684 100644
--- a/xmppserver/src/main/webapp/muc-history-settings.jsp
+++ b/xmppserver/src/main/webapp/muc-history-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-affiliations.jsp b/xmppserver/src/main/webapp/muc-room-affiliations.jsp
index c57023d244..326d1f0162 100644
--- a/xmppserver/src/main/webapp/muc-room-affiliations.jsp
+++ b/xmppserver/src/main/webapp/muc-room-affiliations.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-cache.jsp b/xmppserver/src/main/webapp/muc-room-cache.jsp
index ed1f927618..16cdae601b 100644
--- a/xmppserver/src/main/webapp/muc-room-cache.jsp
+++ b/xmppserver/src/main/webapp/muc-room-cache.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2021-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-create.jsp b/xmppserver/src/main/webapp/muc-room-create.jsp
index 92917d5ff7..0d62c2c44e 100644
--- a/xmppserver/src/main/webapp/muc-room-create.jsp
+++ b/xmppserver/src/main/webapp/muc-room-create.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-delete.jsp b/xmppserver/src/main/webapp/muc-room-delete.jsp
index 031204a4da..34f27f16da 100644
--- a/xmppserver/src/main/webapp/muc-room-delete.jsp
+++ b/xmppserver/src/main/webapp/muc-room-delete.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-edit-form.jsp b/xmppserver/src/main/webapp/muc-room-edit-form.jsp
index da51b2f348..eccb97ed67 100644
--- a/xmppserver/src/main/webapp/muc-room-edit-form.jsp
+++ b/xmppserver/src/main/webapp/muc-room-edit-form.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-federation.jsp b/xmppserver/src/main/webapp/muc-room-federation.jsp
index 2621169e03..e91677b897 100644
--- a/xmppserver/src/main/webapp/muc-room-federation.jsp
+++ b/xmppserver/src/main/webapp/muc-room-federation.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2020-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-occupants.jsp b/xmppserver/src/main/webapp/muc-room-occupants.jsp
index dc407f966f..037a711f73 100644
--- a/xmppserver/src/main/webapp/muc-room-occupants.jsp
+++ b/xmppserver/src/main/webapp/muc-room-occupants.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-room-summary.jsp b/xmppserver/src/main/webapp/muc-room-summary.jsp
index 156a11a0e6..4ad3b52147 100644
--- a/xmppserver/src/main/webapp/muc-room-summary.jsp
+++ b/xmppserver/src/main/webapp/muc-room-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-service-create.jsp b/xmppserver/src/main/webapp/muc-service-create.jsp
index 383dcec567..1b6650e31d 100644
--- a/xmppserver/src/main/webapp/muc-service-create.jsp
+++ b/xmppserver/src/main/webapp/muc-service-create.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-service-delete.jsp b/xmppserver/src/main/webapp/muc-service-delete.jsp
index df49c6403b..2c3a635b3b 100644
--- a/xmppserver/src/main/webapp/muc-service-delete.jsp
+++ b/xmppserver/src/main/webapp/muc-service-delete.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-service-edit-form.jsp b/xmppserver/src/main/webapp/muc-service-edit-form.jsp
index 17b6b45ed4..39e37f03e9 100644
--- a/xmppserver/src/main/webapp/muc-service-edit-form.jsp
+++ b/xmppserver/src/main/webapp/muc-service-edit-form.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-service-summary.jsp b/xmppserver/src/main/webapp/muc-service-summary.jsp
index 5c1dc45dbf..efd0eb76e4 100644
--- a/xmppserver/src/main/webapp/muc-service-summary.jsp
+++ b/xmppserver/src/main/webapp/muc-service-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-sysadmins.jsp b/xmppserver/src/main/webapp/muc-sysadmins.jsp
index 37217543b1..485a14362e 100644
--- a/xmppserver/src/main/webapp/muc-sysadmins.jsp
+++ b/xmppserver/src/main/webapp/muc-sysadmins.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/muc-tasks.jsp b/xmppserver/src/main/webapp/muc-tasks.jsp
index 90654f8eed..05c487e93b 100644
--- a/xmppserver/src/main/webapp/muc-tasks.jsp
+++ b/xmppserver/src/main/webapp/muc-tasks.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/offline-messages.jsp b/xmppserver/src/main/webapp/offline-messages.jsp
index 38eecc0142..19a195e1da 100644
--- a/xmppserver/src/main/webapp/offline-messages.jsp
+++ b/xmppserver/src/main/webapp/offline-messages.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/plugin-admin.jsp b/xmppserver/src/main/webapp/plugin-admin.jsp
index 00fbfc67f5..c23b674d44 100644
--- a/xmppserver/src/main/webapp/plugin-admin.jsp
+++ b/xmppserver/src/main/webapp/plugin-admin.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/plugin-showfile.jsp b/xmppserver/src/main/webapp/plugin-showfile.jsp
index 864ca0da19..7b3af62d8d 100644
--- a/xmppserver/src/main/webapp/plugin-showfile.jsp
+++ b/xmppserver/src/main/webapp/plugin-showfile.jsp
@@ -1,10 +1,5 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ page import="org.jivesoftware.util.ParamUtils" %>
-<%@ page import="org.jivesoftware.openfire.container.Plugin" %>
-<%@ page import="org.jivesoftware.openfire.container.PluginManager" %>
-<%@ page import="java.nio.file.Path" %>
-<%@ page import="java.io.*" %><%--
-  - Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+<%--
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -18,6 +13,14 @@
   - See the License for the specific language governing permissions and
   - limitations under the License.
 --%>
+
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page import="org.jivesoftware.util.ParamUtils" %>
+<%@ page import="org.jivesoftware.openfire.container.Plugin" %>
+<%@ page import="org.jivesoftware.openfire.container.PluginManager" %>
+<%@ page import="java.nio.file.Path" %>
+<%@ page import="java.io.*" %>
+
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager"  />
 <%
     webManager.init(request, response, session, application, out );
diff --git a/xmppserver/src/main/webapp/private-data-settings.jsp b/xmppserver/src/main/webapp/private-data-settings.jsp
index bb0bc049d4..68cb342898 100644
--- a/xmppserver/src/main/webapp/private-data-settings.jsp
+++ b/xmppserver/src/main/webapp/private-data-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/profile-settings.jsp b/xmppserver/src/main/webapp/profile-settings.jsp
index 1c54034ca3..1c92b945c7 100644
--- a/xmppserver/src/main/webapp/profile-settings.jsp
+++ b/xmppserver/src/main/webapp/profile-settings.jsp
@@ -1,12 +1,5 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ page import="org.jivesoftware.util.JiveGlobals" %>
-<%@ page import="org.jivesoftware.openfire.ldap.LdapManager" %>
-<%@ page import="org.jivesoftware.openfire.auth.AuthFactory" %>
-<%@ page import="org.jivesoftware.openfire.ldap.LdapAuthProvider" %>
-<%@ page import="javax.naming.ldap.LdapName" %>
 <%--
-  -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -21,6 +14,13 @@
   - limitations under the License.
 --%>
 
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page import="org.jivesoftware.util.JiveGlobals" %>
+<%@ page import="org.jivesoftware.openfire.ldap.LdapManager" %>
+<%@ page import="org.jivesoftware.openfire.auth.AuthFactory" %>
+<%@ page import="org.jivesoftware.openfire.ldap.LdapAuthProvider" %>
+<%@ page import="javax.naming.ldap.LdapName" %>
+
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
diff --git a/xmppserver/src/main/webapp/pubsub-form-table.jsp b/xmppserver/src/main/webapp/pubsub-form-table.jsp
index 3bb17107af..3f1dbc8ffe 100644
--- a/xmppserver/src/main/webapp/pubsub-form-table.jsp
+++ b/xmppserver/src/main/webapp/pubsub-form-table.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
diff --git a/xmppserver/src/main/webapp/pubsub-node-affiliates-delete.jsp b/xmppserver/src/main/webapp/pubsub-node-affiliates-delete.jsp
index 9fd5ae0e77..d9ebeaed0c 100644
--- a/xmppserver/src/main/webapp/pubsub-node-affiliates-delete.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-affiliates-delete.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@page import="org.jivesoftware.openfire.pep.PEPServiceInfo,
                 org.jivesoftware.openfire.pubsub.NodeAffiliate,
diff --git a/xmppserver/src/main/webapp/pubsub-node-affiliates-edit.jsp b/xmppserver/src/main/webapp/pubsub-node-affiliates-edit.jsp
index 09ec76a1bf..7fc4a201ff 100644
--- a/xmppserver/src/main/webapp/pubsub-node-affiliates-edit.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-affiliates-edit.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@page import="org.jivesoftware.openfire.XMPPServer,
                 org.jivesoftware.openfire.pep.PEPServiceInfo,
diff --git a/xmppserver/src/main/webapp/pubsub-node-affiliates.jsp b/xmppserver/src/main/webapp/pubsub-node-affiliates.jsp
index a522201e9c..6c61dfb48e 100644
--- a/xmppserver/src/main/webapp/pubsub-node-affiliates.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-affiliates.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer,
                  org.jivesoftware.openfire.pep.PEPServiceInfo,
diff --git a/xmppserver/src/main/webapp/pubsub-node-configuration.jsp b/xmppserver/src/main/webapp/pubsub-node-configuration.jsp
index 7c09f06db5..0ae5a6504f 100644
--- a/xmppserver/src/main/webapp/pubsub-node-configuration.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-configuration.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2020-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.pep.PEPServiceInfo,
                  org.jivesoftware.openfire.pubsub.Node,
diff --git a/xmppserver/src/main/webapp/pubsub-node-delete.jsp b/xmppserver/src/main/webapp/pubsub-node-delete.jsp
index 0f6d8bac9f..c79bbb4a0f 100644
--- a/xmppserver/src/main/webapp/pubsub-node-delete.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-delete.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.pep.PEPServiceInfo,
                  org.jivesoftware.openfire.pubsub.Node,
diff --git a/xmppserver/src/main/webapp/pubsub-node-edit.jsp b/xmppserver/src/main/webapp/pubsub-node-edit.jsp
index 6ca9a8fe12..f52e45d5be 100644
--- a/xmppserver/src/main/webapp/pubsub-node-edit.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-edit.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.pubsub.Node,
                  org.jivesoftware.openfire.pubsub.PubSubServiceInfo,
diff --git a/xmppserver/src/main/webapp/pubsub-node-items.jsp b/xmppserver/src/main/webapp/pubsub-node-items.jsp
index e73ac1eb17..5e8d94bca7 100644
--- a/xmppserver/src/main/webapp/pubsub-node-items.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-items.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer,
                  org.jivesoftware.openfire.pep.PEPServiceInfo,
diff --git a/xmppserver/src/main/webapp/pubsub-node-subscribers.jsp b/xmppserver/src/main/webapp/pubsub-node-subscribers.jsp
index 680e031b76..317adb2c9a 100644
--- a/xmppserver/src/main/webapp/pubsub-node-subscribers.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-subscribers.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.pep.PEPServiceInfo,
                  org.jivesoftware.openfire.pubsub.Node,
diff --git a/xmppserver/src/main/webapp/pubsub-node-summary.jsp b/xmppserver/src/main/webapp/pubsub-node-summary.jsp
index 9c0d68635e..7db7532c0f 100644
--- a/xmppserver/src/main/webapp/pubsub-node-summary.jsp
+++ b/xmppserver/src/main/webapp/pubsub-node-summary.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer,
                  org.jivesoftware.openfire.pep.PEPServiceInfo,
diff --git a/xmppserver/src/main/webapp/pubsub-service-summary.jsp b/xmppserver/src/main/webapp/pubsub-service-summary.jsp
index caae39373e..26e941920a 100644
--- a/xmppserver/src/main/webapp/pubsub-service-summary.jsp
+++ b/xmppserver/src/main/webapp/pubsub-service-summary.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.pubsub.PubSubServiceInfo,
                  org.jivesoftware.openfire.pubsub.PubSubServiceInfo.listType,
diff --git a/xmppserver/src/main/webapp/reg-settings.jsp b/xmppserver/src/main/webapp/reg-settings.jsp
index d01a9ed9e1..5effbc7b73 100644
--- a/xmppserver/src/main/webapp/reg-settings.jsp
+++ b/xmppserver/src/main/webapp/reg-settings.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/security-audit-viewer-jsp.jsp b/xmppserver/src/main/webapp/security-audit-viewer-jsp.jsp
index a8d8e05e63..7bfbf23918 100644
--- a/xmppserver/src/main/webapp/security-audit-viewer-jsp.jsp
+++ b/xmppserver/src/main/webapp/security-audit-viewer-jsp.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="admin" uri="admin" %>
diff --git a/xmppserver/src/main/webapp/security-certificate-details.jsp b/xmppserver/src/main/webapp/security-certificate-details.jsp
index 069dc8d01d..95ce5573d6 100644
--- a/xmppserver/src/main/webapp/security-certificate-details.jsp
+++ b/xmppserver/src/main/webapp/security-certificate-details.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 
diff --git a/xmppserver/src/main/webapp/security-certificate-store-backup.jsp b/xmppserver/src/main/webapp/security-certificate-store-backup.jsp
index ea37c5f18b..b0c61a8aff 100644
--- a/xmppserver/src/main/webapp/security-certificate-store-backup.jsp
+++ b/xmppserver/src/main/webapp/security-certificate-store-backup.jsp
@@ -1,3 +1,19 @@
+<%--
+  ~ Copyright (C) 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  --%>
+
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
@@ -16,22 +32,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 
-<%--
-  ~ Copyright (C) 2018 Ignite Realtime Foundation. All rights reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  --%>
-
 <jsp:useBean id="webManager" class="org.jivesoftware.util.WebManager" />
 <jsp:useBean id="now" class="java.util.Date"/>
 <%  webManager.init(request, response, session, application, out );
diff --git a/xmppserver/src/main/webapp/security-certificate-store-management.jsp b/xmppserver/src/main/webapp/security-certificate-store-management.jsp
index 8d39cf169f..8691c7bf6b 100644
--- a/xmppserver/src/main/webapp/security-certificate-store-management.jsp
+++ b/xmppserver/src/main/webapp/security-certificate-store-management.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 <%@ page import="org.jivesoftware.openfire.spi.ConnectionType" %>
diff --git a/xmppserver/src/main/webapp/security-keystore-signing-request.jsp b/xmppserver/src/main/webapp/security-keystore-signing-request.jsp
index 86ad588487..7017e9de41 100644
--- a/xmppserver/src/main/webapp/security-keystore-signing-request.jsp
+++ b/xmppserver/src/main/webapp/security-keystore-signing-request.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2008 Jive Software, 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@page import="java.util.Enumeration"%>
 <%@page import="org.jivesoftware.openfire.XMPPServer"%>
diff --git a/xmppserver/src/main/webapp/security-keystore.jsp b/xmppserver/src/main/webapp/security-keystore.jsp
index d77ddf22b0..1f8d66c12b 100644
--- a/xmppserver/src/main/webapp/security-keystore.jsp
+++ b/xmppserver/src/main/webapp/security-keystore.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@page import="org.jivesoftware.util.StringUtils"%>
 <%@page import="org.jivesoftware.util.CertificateManager"%>
diff --git a/xmppserver/src/main/webapp/security-truststore.jsp b/xmppserver/src/main/webapp/security-truststore.jsp
index 5ec01fd6c5..92e6f3d32a 100644
--- a/xmppserver/src/main/webapp/security-truststore.jsp
+++ b/xmppserver/src/main/webapp/security-truststore.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2018-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp"%>
 <%@ page import="org.jivesoftware.openfire.keystore.TrustStore"%>
diff --git a/xmppserver/src/main/webapp/server-connectiontest.jsp b/xmppserver/src/main/webapp/server-connectiontest.jsp
index 938398ecdc..72eb73ae0b 100644
--- a/xmppserver/src/main/webapp/server-connectiontest.jsp
+++ b/xmppserver/src/main/webapp/server-connectiontest.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
-  ~ Copyright (C) 2017 Ignite Realtime Foundation. All rights reserved.
+  ~ Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-db-stats.jsp b/xmppserver/src/main/webapp/server-db-stats.jsp
index ae22d2ec27..2a5650055a 100644
--- a/xmppserver/src/main/webapp/server-db-stats.jsp
+++ b/xmppserver/src/main/webapp/server-db-stats.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-db.jsp b/xmppserver/src/main/webapp/server-db.jsp
index f2b40dce8b..c4edf5d0a9 100644
--- a/xmppserver/src/main/webapp/server-db.jsp
+++ b/xmppserver/src/main/webapp/server-db.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-locale.jsp b/xmppserver/src/main/webapp/server-locale.jsp
index 6ef2592927..a062582b37 100644
--- a/xmppserver/src/main/webapp/server-locale.jsp
+++ b/xmppserver/src/main/webapp/server-locale.jsp
@@ -1,6 +1,6 @@
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-props.jsp b/xmppserver/src/main/webapp/server-props.jsp
index b7a028f4ac..c33b4ce99c 100644
--- a/xmppserver/src/main/webapp/server-props.jsp
+++ b/xmppserver/src/main/webapp/server-props.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-restart.jsp b/xmppserver/src/main/webapp/server-restart.jsp
index 093317e580..003f8749ac 100644
--- a/xmppserver/src/main/webapp/server-restart.jsp
+++ b/xmppserver/src/main/webapp/server-restart.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
diff --git a/xmppserver/src/main/webapp/server-session-details.jsp b/xmppserver/src/main/webapp/server-session-details.jsp
index e7adda773d..4721e0d63d 100644
--- a/xmppserver/src/main/webapp/server-session-details.jsp
+++ b/xmppserver/src/main/webapp/server-session-details.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/server-session-summary.jsp b/xmppserver/src/main/webapp/server-session-summary.jsp
index 302d84e249..2bb53cd3e7 100644
--- a/xmppserver/src/main/webapp/server-session-summary.jsp
+++ b/xmppserver/src/main/webapp/server-session-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/session-conflict.jsp b/xmppserver/src/main/webapp/session-conflict.jsp
index 0e96724718..003cbcfe4c 100644
--- a/xmppserver/src/main/webapp/session-conflict.jsp
+++ b/xmppserver/src/main/webapp/session-conflict.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/session-details.jsp b/xmppserver/src/main/webapp/session-details.jsp
index 2988beceef..b0048a34dc 100644
--- a/xmppserver/src/main/webapp/session-details.jsp
+++ b/xmppserver/src/main/webapp/session-details.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/session-summary.jsp b/xmppserver/src/main/webapp/session-summary.jsp
index 1e0b753770..999af438a7 100644
--- a/xmppserver/src/main/webapp/session-summary.jsp
+++ b/xmppserver/src/main/webapp/session-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/setup/index.jsp b/xmppserver/src/main/webapp/setup/index.jsp
index 67579bbc92..908821a2cf 100644
--- a/xmppserver/src/main/webapp/setup/index.jsp
+++ b/xmppserver/src/main/webapp/setup/index.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2010 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%@ page import="java.io.File,
diff --git a/xmppserver/src/main/webapp/setup/setup-admin-settings.jsp b/xmppserver/src/main/webapp/setup/setup-admin-settings.jsp
index 8e35358a2f..84046d0535 100644
--- a/xmppserver/src/main/webapp/setup/setup-admin-settings.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-admin-settings.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2016-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
 --%>
diff --git a/xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp b/xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp
index 518103cd0e..8f9fe8d08e 100644
--- a/xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-admin-settings_test.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
 <%@ page import="org.jivesoftware.util.ParamUtils, org.jivesoftware.openfire.ldap.LdapManager, org.jivesoftware.openfire.user.UserNotFoundException, org.xmpp.packet.JID" %>
diff --git a/xmppserver/src/main/webapp/setup/setup-completed.jsp b/xmppserver/src/main/webapp/setup/setup-completed.jsp
index 8474a1bdef..2ba53d5a38 100644
--- a/xmppserver/src/main/webapp/setup/setup-completed.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-completed.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
 --%>
diff --git a/xmppserver/src/main/webapp/setup/setup-datasource-jndi.jsp b/xmppserver/src/main/webapp/setup/setup-datasource-jndi.jsp
index d5672dd4e1..4c88afc069 100644
--- a/xmppserver/src/main/webapp/setup/setup-datasource-jndi.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-datasource-jndi.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.database.DbConnectionManager,
                  org.jivesoftware.database.JNDIDataSourceProvider,
diff --git a/xmppserver/src/main/webapp/setup/setup-datasource-settings.jsp b/xmppserver/src/main/webapp/setup/setup-datasource-settings.jsp
index 3f57eb3d8e..0c70fcd412 100644
--- a/xmppserver/src/main/webapp/setup/setup-datasource-settings.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-datasource-settings.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.database.ConnectionProvider,
                  org.jivesoftware.database.DbConnectionManager,
diff --git a/xmppserver/src/main/webapp/setup/setup-datasource-standard.jsp b/xmppserver/src/main/webapp/setup/setup-datasource-standard.jsp
index be98414f99..2721e97c80 100644
--- a/xmppserver/src/main/webapp/setup/setup-datasource-standard.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-datasource-standard.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.database.DbConnectionManager,
                  org.jivesoftware.database.DefaultConnectionProvider,
diff --git a/xmppserver/src/main/webapp/setup/setup-finished.jsp b/xmppserver/src/main/webapp/setup/setup-finished.jsp
index 83abef1722..3b4bedd9e3 100644
--- a/xmppserver/src/main/webapp/setup/setup-finished.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-finished.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
 --%>
diff --git a/xmppserver/src/main/webapp/setup/setup-host-settings.jsp b/xmppserver/src/main/webapp/setup/setup-host-settings.jsp
index 4f89276aa5..3a2f9b18be 100644
--- a/xmppserver/src/main/webapp/setup/setup-host-settings.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-host-settings.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2007 Jive Software, 2016-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.net.InetAddress" %>
 <%@ page import="java.net.UnknownHostException" %>
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-group.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-group.jsp
index 0a3242ea4c..383eef38ff 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-group.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-group.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer"%>
 
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp
index e9c7d67e97..0d850c5513 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-group_test.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.admin.LdapGroupTester" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-server.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-server.jsp
index 62789953a6..a6d115873e 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-server.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-server.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2018-2019 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 <%
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-server_test.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-server_test.jsp
index 43c420d5ad..09b97262af 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-server_test.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-server_test.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
 <%@ page import="org.jivesoftware.openfire.ldap.LdapManager, javax.naming.*, javax.naming.ldap.LdapContext, java.net.UnknownHostException" %>
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-user.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-user.jsp
index 69ad9aad7b..137b106cc3 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-user.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-user.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2017-2019 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer" %>
 
diff --git a/xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp b/xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp
index a2af7db9ee..67235f38b0 100644
--- a/xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-ldap-user_test.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2007 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.admin.LdapUserProfile" %>
 <%@ page import="org.jivesoftware.admin.LdapUserTester" %>
diff --git a/xmppserver/src/main/webapp/setup/setup-profile-settings.jsp b/xmppserver/src/main/webapp/setup/setup-profile-settings.jsp
index 0db48dd998..dafd316be3 100644
--- a/xmppserver/src/main/webapp/setup/setup-profile-settings.jsp
+++ b/xmppserver/src/main/webapp/setup/setup-profile-settings.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2006-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="org.jivesoftware.openfire.XMPPServer"%>
 <%@ page import="org.jivesoftware.util.JiveGlobals"%>
diff --git a/xmppserver/src/main/webapp/system-admin-console-access.jsp b/xmppserver/src/main/webapp/system-admin-console-access.jsp
index 0ef06406b5..08448cf98b 100644
--- a/xmppserver/src/main/webapp/system-admin-console-access.jsp
+++ b/xmppserver/src/main/webapp/system-admin-console-access.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page errorPage="error.jsp" %>
 <%@ page import="org.jivesoftware.openfire.container.AdminConsolePlugin " %>
diff --git a/xmppserver/src/main/webapp/system-cache-details.jsp b/xmppserver/src/main/webapp/system-cache-details.jsp
index f549872f19..a8a734ba59 100644
--- a/xmppserver/src/main/webapp/system-cache-details.jsp
+++ b/xmppserver/src/main/webapp/system-cache-details.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <jsp:useBean scope="request" id="errorMessage" class="java.lang.String"/>
diff --git a/xmppserver/src/main/webapp/system-cache.jsp b/xmppserver/src/main/webapp/system-cache.jsp
index 8d532ee6c2..64e969a859 100644
--- a/xmppserver/src/main/webapp/system-cache.jsp
+++ b/xmppserver/src/main/webapp/system-cache.jsp
@@ -1,17 +1,6 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ page import="java.text.DecimalFormat"%>
-<%@ page import="java.text.NumberFormat"%>
-<%@ page import="java.time.Duration"%>
-<%@ page import="org.jivesoftware.util.CookieUtils"%>
-<%@ page import="org.jivesoftware.util.JiveGlobals"%>
-<%@ page import="org.jivesoftware.util.ParamUtils"%>
-<%@ page import="org.jivesoftware.util.StringUtils"%>
-<%@ page import="org.jivesoftware.util.cache.Cache" %>
-<%@ page import="org.jivesoftware.util.cache.CacheWrapper" %>
-<%@ page import="org.jivesoftware.util.cache.DefaultCache" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -26,6 +15,18 @@
   - limitations under the License.
 --%>
 
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page import="java.text.DecimalFormat"%>
+<%@ page import="java.text.NumberFormat"%>
+<%@ page import="java.time.Duration"%>
+<%@ page import="org.jivesoftware.util.CookieUtils"%>
+<%@ page import="org.jivesoftware.util.JiveGlobals"%>
+<%@ page import="org.jivesoftware.util.ParamUtils"%>
+<%@ page import="org.jivesoftware.util.StringUtils"%>
+<%@ page import="org.jivesoftware.util.cache.Cache" %>
+<%@ page import="org.jivesoftware.util.cache.CacheWrapper" %>
+<%@ page import="org.jivesoftware.util.cache.DefaultCache" %>
+
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 <%@ taglib prefix="admin" uri="admin" %>
diff --git a/xmppserver/src/main/webapp/system-clustering-data-consistency-check.jsp b/xmppserver/src/main/webapp/system-clustering-data-consistency-check.jsp
index 3c04986d7c..09cc2ec515 100644
--- a/xmppserver/src/main/webapp/system-clustering-data-consistency-check.jsp
+++ b/xmppserver/src/main/webapp/system-clustering-data-consistency-check.jsp
@@ -2,7 +2,7 @@
 
 <%--
   -
-  - Copyright (C) 2021 Ignite Realtime Foundation. All rights reserved.
+  - Copyright (C) 2021-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/system-clustering.jsp b/xmppserver/src/main/webapp/system-clustering.jsp
index b97b7e91cc..7425938271 100644
--- a/xmppserver/src/main/webapp/system-clustering.jsp
+++ b/xmppserver/src/main/webapp/system-clustering.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/system-email.jsp b/xmppserver/src/main/webapp/system-email.jsp
index b11f7badb2..e22a72ef99 100644
--- a/xmppserver/src/main/webapp/system-email.jsp
+++ b/xmppserver/src/main/webapp/system-email.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/system-emailtest.jsp b/xmppserver/src/main/webapp/system-emailtest.jsp
index 93fe95f266..9655688dd1 100644
--- a/xmppserver/src/main/webapp/system-emailtest.jsp
+++ b/xmppserver/src/main/webapp/system-emailtest.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/system-properties.jsp b/xmppserver/src/main/webapp/system-properties.jsp
index 79cb1706b3..cf9a9f2565 100644
--- a/xmppserver/src/main/webapp/system-properties.jsp
+++ b/xmppserver/src/main/webapp/system-properties.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2019-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
diff --git a/xmppserver/src/main/webapp/system-sms.jsp b/xmppserver/src/main/webapp/system-sms.jsp
index ec3dd3cb4b..5d3c5772c8 100644
--- a/xmppserver/src/main/webapp/system-sms.jsp
+++ b/xmppserver/src/main/webapp/system-sms.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ page import="java.util.*,
                  org.jivesoftware.util.*"
diff --git a/xmppserver/src/main/webapp/system-smstest.jsp b/xmppserver/src/main/webapp/system-smstest.jsp
index 967a88b6e2..c77cc53485 100644
--- a/xmppserver/src/main/webapp/system-smstest.jsp
+++ b/xmppserver/src/main/webapp/system-smstest.jsp
@@ -1,6 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-create.jsp b/xmppserver/src/main/webapp/user-create.jsp
index eb18dbf0f9..37dd50cc6b 100644
--- a/xmppserver/src/main/webapp/user-create.jsp
+++ b/xmppserver/src/main/webapp/user-create.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-delete.jsp b/xmppserver/src/main/webapp/user-delete.jsp
index ed557a0d05..1a9a8676c2 100644
--- a/xmppserver/src/main/webapp/user-delete.jsp
+++ b/xmppserver/src/main/webapp/user-delete.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-edit-form.jsp b/xmppserver/src/main/webapp/user-edit-form.jsp
index 1dfa69afd2..3d2b908d56 100644
--- a/xmppserver/src/main/webapp/user-edit-form.jsp
+++ b/xmppserver/src/main/webapp/user-edit-form.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-groups.jsp b/xmppserver/src/main/webapp/user-groups.jsp
index cfb008d9fd..11282f9573 100644
--- a/xmppserver/src/main/webapp/user-groups.jsp
+++ b/xmppserver/src/main/webapp/user-groups.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-lockout.jsp b/xmppserver/src/main/webapp/user-lockout.jsp
index 4a21daeaa6..751a15c47c 100644
--- a/xmppserver/src/main/webapp/user-lockout.jsp
+++ b/xmppserver/src/main/webapp/user-lockout.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-message.jsp b/xmppserver/src/main/webapp/user-message.jsp
index 9ed230944d..37f958b238 100644
--- a/xmppserver/src/main/webapp/user-message.jsp
+++ b/xmppserver/src/main/webapp/user-message.jsp
@@ -2,7 +2,7 @@
 
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-password.jsp b/xmppserver/src/main/webapp/user-password.jsp
index ba9343532e..d2ae1e78e4 100644
--- a/xmppserver/src/main/webapp/user-password.jsp
+++ b/xmppserver/src/main/webapp/user-password.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-privacylists.jsp b/xmppserver/src/main/webapp/user-privacylists.jsp
index e4da2e0243..7479a81cba 100644
--- a/xmppserver/src/main/webapp/user-privacylists.jsp
+++ b/xmppserver/src/main/webapp/user-privacylists.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2020-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-properties.jsp b/xmppserver/src/main/webapp/user-properties.jsp
index 1c3f3a25e1..92830f633e 100644
--- a/xmppserver/src/main/webapp/user-properties.jsp
+++ b/xmppserver/src/main/webapp/user-properties.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-roster-add.jsp b/xmppserver/src/main/webapp/user-roster-add.jsp
index 7ec9f8894e..7cd752aaa2 100644
--- a/xmppserver/src/main/webapp/user-roster-add.jsp
+++ b/xmppserver/src/main/webapp/user-roster-add.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-roster-delete.jsp b/xmppserver/src/main/webapp/user-roster-delete.jsp
index 807af90c16..5896b2cfb8 100644
--- a/xmppserver/src/main/webapp/user-roster-delete.jsp
+++ b/xmppserver/src/main/webapp/user-roster-delete.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-roster-edit.jsp b/xmppserver/src/main/webapp/user-roster-edit.jsp
index 51160cc302..bfb16b9f53 100644
--- a/xmppserver/src/main/webapp/user-roster-edit.jsp
+++ b/xmppserver/src/main/webapp/user-roster-edit.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-roster-view.jsp b/xmppserver/src/main/webapp/user-roster-view.jsp
index a61f1c86a0..92222c5e84 100644
--- a/xmppserver/src/main/webapp/user-roster-view.jsp
+++ b/xmppserver/src/main/webapp/user-roster-view.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-roster.jsp b/xmppserver/src/main/webapp/user-roster.jsp
index 67dc5adb0f..6ee76be5cd 100644
--- a/xmppserver/src/main/webapp/user-roster.jsp
+++ b/xmppserver/src/main/webapp/user-roster.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2005-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2005-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-search.jsp b/xmppserver/src/main/webapp/user-search.jsp
index d0987247f0..80e1b5228b 100644
--- a/xmppserver/src/main/webapp/user-search.jsp
+++ b/xmppserver/src/main/webapp/user-search.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
 --%>
diff --git a/xmppserver/src/main/webapp/user-summary.jsp b/xmppserver/src/main/webapp/user-summary.jsp
index b8cbda9e24..c4431368ec 100644
--- a/xmppserver/src/main/webapp/user-summary.jsp
+++ b/xmppserver/src/main/webapp/user-summary.jsp
@@ -1,7 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%--
   -
-  - Copyright (C) 2004-2008 Jive Software. All rights reserved.
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/main/webapp/user-tabs.jsp b/xmppserver/src/main/webapp/user-tabs.jsp
index e47c00eaff..4ea883bce9 100644
--- a/xmppserver/src/main/webapp/user-tabs.jsp
+++ b/xmppserver/src/main/webapp/user-tabs.jsp
@@ -1,3 +1,19 @@
+<%--
+  -
+  - Copyright (C) 2004-2008 Jive Software, 2017-2022 Ignite Realtime Foundation. All rights reserved.
+  -
+  - Licensed under the Apache License, Version 2.0 (the "License");
+  - you may not use this file except in compliance with the License.
+  - You may obtain a copy of the License at
+  -
+  -     http://www.apache.org/licenses/LICENSE-2.0
+  -
+  - Unless required by applicable law or agreed to in writing, software
+  - distributed under the License is distributed on an "AS IS" BASIS,
+  - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  - See the License for the specific language governing permissions and
+  - limitations under the License.
+--%>
 <%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%--
diff --git a/xmppserver/src/test/java/org/jivesoftware/Fixtures.java b/xmppserver/src/test/java/org/jivesoftware/Fixtures.java
index 88298bbc64..efc63eb933 100644
--- a/xmppserver/src/test/java/org/jivesoftware/Fixtures.java
+++ b/xmppserver/src/test/java/org/jivesoftware/Fixtures.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/admin/AuthCheckFilterTest.java b/xmppserver/src/test/java/org/jivesoftware/admin/AuthCheckFilterTest.java
index 7287ffa5cc..eae402841a 100644
--- a/xmppserver/src/test/java/org/jivesoftware/admin/AuthCheckFilterTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/admin/AuthCheckFilterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/admin/LoginLimitManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/admin/LoginLimitManagerTest.java
index ff81c5951d..bb8a5f3136 100644
--- a/xmppserver/src/test/java/org/jivesoftware/admin/LoginLimitManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/admin/LoginLimitManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticatorTest.java b/xmppserver/src/test/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticatorTest.java
index e5ff65642a..9914a7194c 100644
--- a/xmppserver/src/test/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticatorTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/admin/SiteMinderServletRequestAuthenticatorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/OfflineMessageStoreTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/OfflineMessageStoreTest.java
index ef3e067de3..add45107ce 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/OfflineMessageStoreTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/OfflineMessageStoreTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/admin/GroupBasedAdminProviderTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/admin/GroupBasedAdminProviderTest.java
index 3c2297b369..ea2b499f51 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/admin/GroupBasedAdminProviderTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/admin/GroupBasedAdminProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/archive/ArchiverTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/archive/ArchiverTest.java
index 9a29923432..ac34d298e5 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/archive/ArchiverTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/archive/ArchiverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/auth/JDBCAuthProviderTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/auth/JDBCAuthProviderTest.java
index 66577edce2..89df215780 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/auth/JDBCAuthProviderTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/auth/JDBCAuthProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/carbons/MessageCarbonsTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/carbons/MessageCarbonsTest.java
index 1909c50c1d..94858dbad2 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/carbons/MessageCarbonsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/carbons/MessageCarbonsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/cluster/ClusterMonitorTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/cluster/ClusterMonitorTest.java
index 73ea4e0125..11182cfead 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/cluster/ClusterMonitorTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/cluster/ClusterMonitorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupJIDTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupJIDTest.java
index 134eda53cb..353205416e 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupJIDTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupJIDTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerNoMockTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerNoMockTest.java
index 9c44b42b69..3639310393 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerNoMockTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerNoMockTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerTest.java
index 90bed00318..425e3b5fdd 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/group/GroupManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/handler/IQEntityTimeHandlerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/handler/IQEntityTimeHandlerTest.java
index 45c377eb37..0dff3c9d37 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/handler/IQEntityTimeHandlerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/handler/IQEntityTimeHandlerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/http/HttpSessionDeliverableTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/http/HttpSessionDeliverableTest.java
index 7700a6e3ca..536bc3dd0c 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/http/HttpSessionDeliverableTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/http/HttpSessionDeliverableTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CertificateUtilsTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CertificateUtilsTest.java
index 31e8e3e12d..80bf6a85d5 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CertificateUtilsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CertificateUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CheckChainTrustedTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CheckChainTrustedTest.java
index 1382d63728..e8f8322436 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CheckChainTrustedTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/CheckChainTrustedTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.junit.*;
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/KeystoreTestUtils.java b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/KeystoreTestUtils.java
index 9f7f7b6da7..f3ad56efc2 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/KeystoreTestUtils.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/KeystoreTestUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.keystore;
 
 import org.bouncycastle.asn1.x500.X500Name;
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManagerTest.java
index b1203dd010..a09fe496be 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/keystore/OpenfireX509TrustManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java
index 2664a35fa9..3168de3bf3 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/ldap/LdapManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/MucPrivilegesTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/MucPrivilegesTest.java
index bd6d4fa69b..5a258c2915 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/MucPrivilegesTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/MucPrivilegesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/OccupantManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/OccupantManagerTest.java
index 98a0416804..7e6b6a9fd5 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/OccupantManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/muc/spi/OccupantManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Community. All rights reserved.
+ * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java
index 9f9165e316..f03735dd02 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/net/DNSUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/nio/XmlNumericCharacterReferenceTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/nio/XmlNumericCharacterReferenceTest.java
index e6ed1f485a..beceac58f8 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/nio/XmlNumericCharacterReferenceTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/nio/XmlNumericCharacterReferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServerTest.java
index 931117682c..351ddb691d 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/sasl/ExternalServerSaslServerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteInitiatingServerDummy.java b/xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteInitiatingServerDummy.java
index aa3d56e888..abb743279b 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteInitiatingServerDummy.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteInitiatingServerDummy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.openfire.session;
 
 import org.dom4j.*;
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/session/SessionTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/session/SessionTest.java
index 4f0b16c5b2..76dea8f47b 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/session/SessionTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/session/SessionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactoryTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactoryTest.java
index 2932313237..10e9440fb5 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactoryTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/spi/EncryptionArtifactFactoryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtilTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtilTest.java
index 4269ef65fe..f3a95e6fde 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtilTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/stanzaid/StanzaIDUtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/streammanagement/StreamManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/streammanagement/StreamManagerTest.java
index eb0db057d5..73a0e5fc6c 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/streammanagement/StreamManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/streammanagement/StreamManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/openfire/user/UserManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/openfire/user/UserManagerTest.java
index 9fb9adf9e5..0738493c34 100644
--- a/xmppserver/src/test/java/org/jivesoftware/openfire/user/UserManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/openfire/user/UserManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/AdminConsoleTest.java b/xmppserver/src/test/java/org/jivesoftware/util/AdminConsoleTest.java
index 1e58aa3cfd..f1c75bde1a 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/AdminConsoleTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/AdminConsoleTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software. 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/AesEncryptorTest.java b/xmppserver/src/test/java/org/jivesoftware/util/AesEncryptorTest.java
index 415958e658..f057e5be72 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/AesEncryptorTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/AesEncryptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java b/xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java
index 8393b53752..60e9551cdf 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/AutoCloseableReentrantLockTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2018-2019 Ignite Realtime Foundation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.jivesoftware.util;
 
 import static org.awaitility.Awaitility.await;
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/BlowfishEncryptorTest.java b/xmppserver/src/test/java/org/jivesoftware/util/BlowfishEncryptorTest.java
index 3a068f21f5..0ea49c8aa0 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/BlowfishEncryptorTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/BlowfishEncryptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/CacheableOptionalTest.java b/xmppserver/src/test/java/org/jivesoftware/util/CacheableOptionalTest.java
index eebce0793d..c531311131 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/CacheableOptionalTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/CacheableOptionalTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java
index 4fada297dc..50a108ef8d 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/CertificateManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/CertificateTest.java b/xmppserver/src/test/java/org/jivesoftware/util/CertificateTest.java
index 005eeec4b8..ec46b0ee53 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/CertificateTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/CertificateTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/EntityCapabilitiesManagerTest.java b/xmppserver/src/test/java/org/jivesoftware/util/EntityCapabilitiesManagerTest.java
index 276082e122..bb1c7c63c2 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/EntityCapabilitiesManagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/EntityCapabilitiesManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/JIDTest.java b/xmppserver/src/test/java/org/jivesoftware/util/JIDTest.java
index 0a6133dcf9..b94616810f 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/JIDTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/JIDTest.java
@@ -1,8 +1,17 @@
 /*
- * Copyright (C) 2004-2007 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2007 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
- * This software is published under the terms of the GNU Public License (GPL),
- * a copy of which is included in this distribution.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package org.jivesoftware.util;
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/JavaSpecVersionTest.java b/xmppserver/src/test/java/org/jivesoftware/util/JavaSpecVersionTest.java
index 2a5228e965..b2f652d3cc 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/JavaSpecVersionTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/JavaSpecVersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java b/xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java
index d71653f18f..3689fc02f0 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/LDAPTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Daniel Henninger, 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2008 Daniel Henninger, 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/ListPagerTest.java b/xmppserver/src/test/java/org/jivesoftware/util/ListPagerTest.java
index d1518021a3..cbf1149bcf 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/ListPagerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/ListPagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2018-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java b/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
index b24cb5bebb..6186aa5732 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/LocaleUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/StringUtilsTest.java b/xmppserver/src/test/java/org/jivesoftware/util/StringUtilsTest.java
index 7b0067de06..a3938e8c0e 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/StringUtilsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/StringUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java b/xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java
index ed547c2d9d..5f2a608dd9 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/SystemPropertyTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2019-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/VersionTest.java b/xmppserver/src/test/java/org/jivesoftware/util/VersionTest.java
index 32a645b951..738dbc7b76 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/VersionTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/VersionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/WebXmlUtilsTest.java b/xmppserver/src/test/java/org/jivesoftware/util/WebXmlUtilsTest.java
index 1e159774a5..d683c4c254 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/WebXmlUtilsTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/WebXmlUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2016-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/XMLPropertiesTest.java b/xmppserver/src/test/java/org/jivesoftware/util/XMLPropertiesTest.java
index b05ebecbbf..cc97a8107c 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/XMLPropertiesTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/XMLPropertiesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022-2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/XMPPDateTimeFormatTest.java b/xmppserver/src/test/java/org/jivesoftware/util/XMPPDateTimeFormatTest.java
index 0ee46390bf..0ec56c0f3e 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/XMPPDateTimeFormatTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/XMPPDateTimeFormatTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2017-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java b/xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java
index 715a72417c..759bb803e9 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/cache/CacheFactoryConfigTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software, 2022 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/java/org/jivesoftware/util/cache/ReverseLookupComputingCacheEntryListenerTest.java b/xmppserver/src/test/java/org/jivesoftware/util/cache/ReverseLookupComputingCacheEntryListenerTest.java
index 454cc046bc..e08c64f03b 100644
--- a/xmppserver/src/test/java/org/jivesoftware/util/cache/ReverseLookupComputingCacheEntryListenerTest.java
+++ b/xmppserver/src/test/java/org/jivesoftware/util/cache/ReverseLookupComputingCacheEntryListenerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Ignite Realtime Foundation. All rights reserved.
+ * Copyright (C) 2021-2023 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestReader.java b/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestReader.java
index 9ba87d9752..632d27aece 100644
--- a/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestReader.java
+++ b/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestWriter.java b/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestWriter.java
index b78c8817c7..ad578b5958 100644
--- a/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestWriter.java
+++ b/xmppserver/src/test/throttletest/src/org/jivesoftware/openfire/test/throttle/ThrottleTestWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Jive Software. All rights reserved.
+ * Copyright (C) 2004-2008 Jive Software, 2017-2018 Ignite Realtime Foundation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.