From a1ba3abdc84b71d6d4299834c1ce286f05b9abef Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 15 Jan 2026 08:47:18 -0800
Subject: [PATCH 1/4] GUACAMOLE-2139: Automatically derive license information
 without manually formatted README.

---
 doc/licenses/generate-license-files.sh | 330 +++++++++++++++++++++----
 1 file changed, 283 insertions(+), 47 deletions(-)

diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh
index 76f8296b5..2afd52ee1 100755
--- a/doc/licenses/generate-license-files.sh
+++ b/doc/licenses/generate-license-files.sh
@@ -17,12 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim
-# into Makefile.in. Though the build system (GNU Autotools) automatically adds
-# its own license boilerplate to the generated Makefile.in, that boilerplate
-# does not apply to the transcluded portions of Makefile.am which are licensed
-# to you by the ASF under the Apache License, Version 2.0, as described above.
-#
 
 #
 # generate-license-files.sh
@@ -84,19 +78,55 @@
 #
 # Regardless of whether a dependency is documented within the top-level
 # guacamole-client project or within the relevant subproject, the subdirectory
-# for each dependency must contain a "README" file describing the dependency,
-# the version used, the copyright holder(s), and the license. Examples of the
-# formatting expected for these README files can be found within the existing
-# dependency license directories.
+# for each dependency must contain at least one file containing headers describing
+# the dependency, the copyright holder(s), and the license.
 #
-# Files that contain the word "notice", regardless of case, are considered by
-# this script to be the notice file mentioned within the Apache License, and
+# Filenames that contain the word "notice", regardless of case, are considered
+# by this script to be the notice file mentioned within the Apache License, and
 # will be copied verbatim into the generated NOTICE file.
 #
 # Files that that are not recognized as any other type of file are considered
 # by this script to be the license and will be included verbatim within the
 # generated LICENSE if they are less than 50 lines.
 #
+# ** PLEASE SEE THE EXISTING DEPENDENCY LICENSE DIRECTORIES FOR EXAMPLES OF
+# THIS IN PRACTICE **
+#
+# License header fields
+# ---------------------
+#
+# The possible header fields are:
+#
+# Field   | Description
+# ------- | -------------------------------------------------------------------
+# Name    | REQUIRED. The name of the component.
+# License | REQUIRED. The human-readable name of the copyright license (Apache v2.0, MIT, etc.).
+# From    | REQUIRED. The original developer, current maintainer, or copyright holder.
+# URL     | REQUIRED. The URL of the component's web page.
+# Version | The version number of the component (if not determined by Maven/NPM).
+# Source  | The URL that the current file may be downloaded from.
+# +       | Arbitrary comments or information that should be included with the license.
+#
+# The value for the Source header may contain any of the following variables in
+# shell format ($VARIABLE or ${VARIABLE}), to allow for URLs that vary by version:
+#
+# Variable  | Description
+# --------- | ----------------------------------------------------------------
+# VERSION   | The exact version number provided.
+# _VERSION_ | The version number provided, with all periods replaced with underscore.
+# MAJOR     | The major (leftmost) component of the version number.
+# MINOR     | The minor (second from the left) component of the version number.
+# PATCH     | The patch (third from the left) component of the version number.
+# REV       | The "revision" (fourth from the left) component of the version number.
+#
+# If a field is included multiple times within the same header, each value is
+# considered to be one line of that field. If multiple "Source" headers are
+# provided, each is tried in order until the download succeeds.
+#
+# ** IMPORTANT: ** Except for "Source", which may be included in any license
+# information file to permit dynamic updates of that information, all of these
+# fields MUST be located within the same file.
+#
 
 ##
 ## The filename of the file containing whether any errors have been logged. The
@@ -151,14 +181,19 @@ list_dependency_license_info() {
 
     # List the license directories of all runtime dependencies, as dictated by
     # the "dep-coordinates.txt" files included within those directories
-    sed 's/^[[:space:]]\+//' | grep -o '^[^: ]\+\(:[^: ]*\)\{1,3\}' | while read DEPENDENCY; do
+    sed 's/^[[:space:]]\+//' | grep -o '^[^: ]\+\(:[^: ]*\)\{1,3\}' \
+        | while read DEPENDENCY; do
 
-        if ! grep -l "$DEPENDENCY[[:space:]]*$" "$LICENSES_DIR"/*/dep-coordinates.txt; then
+        local DEPENDENCY_REGEX="`echo "$DEPENDENCY" | sed 's/[^:]*/\\\\(&\\\\|\*\\\\)/g'`"
+        local VERSION="`echo "$DEPENDENCY" | sed 's/.*://'`"
+
+        if ! grep -l "^$DEPENDENCY_REGEX[[:space:]]*$" "$LICENSES_DIR"/*/dep-coordinates.txt \
+            | sed "s/$/ $VERSION/g"; then
             error "License information missing for $DEPENDENCY"
         fi
 
-    done | sort -u | while read LICENSE_INFO_COORDS_FILE; do
-        dirname "$LICENSE_INFO_COORDS_FILE"
+    done | sort -u -k 1,1 | while read LICENSE_INFO_COORDS_FILE VERSION; do
+        printf '%s %s\n' "`dirname "$LICENSE_INFO_COORDS_FILE"`" "$VERSION"
     done
 
     # Include license directories for all dependencies not pulled in automatically
@@ -175,15 +210,16 @@ list_dependency_license_info() {
 ## written to STDOUT. Each directory must be on its own line.
 ##
 sort_dependency_license_info() {
-    while read LICENSE_INFO; do
+    while read LICENSE_INFO VERSION; do
 
-        if [ ! -e "$LICENSE_INFO/README" ]; then
-            error "Missing license README in $LICENSE_INFO"
-            continue
-        fi
+        local PRIMARY_FILE="`primary_file "$LICENSE_INFO"`"
 
-        NAME="`grep . < "$LICENSE_INFO/README" | head -n1`"
-        printf "%s\t%s\n" "$NAME" "$LICENSE_INFO"
+        # Skip if primary file missing (error will be logged by primary_file
+        # function call above)
+        [ -n "$PRIMARY_FILE" ] || continue
+
+        local NAME="`get_header_value "$PRIMARY_FILE" Name`"
+        printf "%s\t%s %s\n" "$NAME" "$LICENSE_INFO" "$VERSION"
 
     done | sort -f | cut -f2
 }
@@ -236,7 +272,6 @@ license_file() {
     find "$DIR" -mindepth 1 \
             -a \! -iname "*notice*" \
             -a \! -name "dep-coordinates.txt" \
-            -a \! -name "README" \
         | if ! single_result; then
            error "Multiple license files found within $DIR"
         fi 
@@ -258,6 +293,29 @@ notice_file() {
         fi 
 }
 
+##
+## Determines which file within the given directory is the primary source of
+## license information, dictated by whichever file contains the "License"
+## field. If such a file exists, it is printed to STDOUT. If not, an error is
+## logged.
+##
+## @param DIR
+##     The directory to search.
+##
+primary_file() {
+
+    DIR="$1"
+    for FILENAME in "$DIR"/*; do
+        if [ ! -d "$FILENAME" ] && [ -n "`get_header_value "$FILENAME" License`" ]; then
+            echo "$FILENAME"
+            return
+        fi
+    done
+
+    error "No file containing \"License\" field found within $DIR"
+
+}
+
 ##
 ## Prints the contents of the given file, excluding any blank lines at the
 ## beginning and end of the file.
@@ -278,6 +336,134 @@ trim_file() {
 
 }
 
+##
+## Reads text from STDIN, printing that text to STDOUT with leading spaces. If
+## the text consists of only a single line, a single leading space is added. If
+## the text consists of multiple lines, each line is indented by two levels,
+## with four spaces per level.
+##
+format_multiline() {
+
+    local INDENT="        "
+    local NEXT_LINE
+
+    read FIRST_LINE
+
+    if read NEXT_LINE; then
+        printf '\n'
+        printf "%s%s\n" "$INDENT" "$FIRST_LINE"
+        printf "%s%s\n" "$INDENT" "$NEXT_LINE"
+        while read NEXT_LINE; do
+            printf "%s%s\n" "$INDENT" "$NEXT_LINE"
+        done
+    else
+        printf ' %s\n' "$FIRST_LINE"
+    fi
+    
+}
+
+##
+## Performs variable substitution on STDIN, replacing version-related variables
+## with values derived from the given version number. Variables must be
+## formatted as "$VARIABLE" or "${VARIABLE}".
+##
+## Supported variables are:
+##
+## @param VERSION
+##     The version number to substitute.
+##
+subst_version() {
+
+    local VERSION="$1"
+    local _VERSION_="`echo "$VERSION" | sed 's/\./_/g'`"
+
+    local MAJOR MINOR PATCH REV
+    read -r MAJOR MINOR PATCH REV <<EOF
+`echo "$VERSION" | sed 's/[^0-9]\+/ /g'`
+EOF
+
+    env "VERSION=$VERSION" \
+        "_VERSION_=$_VERSION_" \
+        "MAJOR=$MAJOR" \
+        "MINOR=$MINOR" \
+        "PATCH=$PATCH" \
+        "REV=$REV" \
+        envsubst '$VERSION $_VERSION_ $MAJOR $MINOR $PATCH $REV'
+
+}
+
+##
+## Retrieves all header lines from the given file. The header lines of a
+## license-related file are all lines that precede the first "BEGIN LICENSE
+## FILE" marker.
+##
+## @param FILENAME
+##     The file to retrieve the header from.
+##
+get_header() {
+
+    local FILENAME="$1"
+
+    sed -n \
+        -e '/^# --- BEGIN LICENSE FILE \(\[[^]]*\] \)\?---$/q' \
+        -e 's/^#[[:space:]]*//p' \
+        "$FILENAME" | grep .
+
+}
+
+##
+## Retrieves the header field having the given name from the given file. The
+## header lines of a license-related file are all lines that precede the first
+## "BEGIN LICENSE FILE" marker, and a header field is a name/value pair
+## included within this header on its own line in the form "NAME: VALUE", where
+## "NAME" is the field name and "VALUE" is the desired value.
+##
+## If a field is included multiple times within the same header, each value is
+## considered to be one line of that field.
+##
+get_header_value() {
+
+    local FILENAME="$1"
+    local FIELD="$2"
+
+    get_header "$FILENAME" | grep "^$FIELD:" \
+        | sed 's/^[^:]*:[[:space:]]*//' \
+        | sed 's/[[:space:]]\+$//' \
+        | grep .
+
+}
+
+##
+## Retrieves the full license contents from the given license file. If the
+## license information is version-specific, the provided version is used to
+## determine which contents are returned based the versions noted in "BEGIN
+## LICENSE FILE [VERSION]" and "END LICENSE FILE [VERSION]" markers. If no
+## version is provided, only unversioned markers will be used.
+##
+## @param FILENAME
+##     The file to retrieve license contents from.
+##
+## @param VERSION
+##     The version of the component that the license applies to.
+##
+get_license() {
+
+    local FILENAME="$1"
+    local VERSION="$2"
+    local VERSION_MATCH='[^]]*'
+    
+    if [ -n "$VERSION" ]; then
+        VERSION_MATCH="$(echo "$VERSION" | sed 's:[/$.*\[\\^]:\\&:g')"
+    fi
+
+    sed -n \
+        -e '1,/^# --- BEGIN LICENSE FILE \(\['"$VERSION_MATCH"'\] \)\?---$/d' \
+        -e '/^# --- END LICENSE FILE \(\['"$VERSION_MATCH"'\] \)\?---$/q' \
+        -e 'p' \
+        "$FILENAME"
+
+}
+
 # Verify that an output directory was provided
 if [ -z "$DEPENDENCY_LIST" -o -z "$OUTPUT_DIR" ]; then
     error "USAGE: $0 DEPENDENCY_LIST OUTPUT_DIRECTORY"
@@ -311,7 +497,7 @@ cp "$BASEDIR/NOTICE" "$OUTPUT_DIR/"
 PREAMBLE_ADDED=0
 find "$DEPENDENCY_LIST" -type f -exec cat '{}' + | \
     list_dependency_license_info | sort_dependency_license_info | \
-    while read LICENSE_INFO_DIR; do
+    while read LICENSE_INFO_DIR VERSION; do
 
     # Add subcomponent license preamble if not already added
     if [ "$PREAMBLE_ADDED" = 0 ]; then
@@ -323,6 +509,7 @@ APACHE GUACAMOLE SUBCOMPONENTS
 Apache Guacamole includes a number of subcomponents with separate copyright
 notices and license terms. Your use of these subcomponents is subject to the
 terms and conditions of the following licenses.
+
 EOF
         PREAMBLE_ADDED=1
     fi
@@ -330,32 +517,82 @@ EOF
     # Locate LICENSE and NOTICE files
     LICENSE_FILE="`license_file "$LICENSE_INFO_DIR"`"
     NOTICE_FILE="`notice_file "$LICENSE_INFO_DIR"`"
+    PRIMARY_FILE="`primary_file "$LICENSE_INFO_DIR"`"
 
-    # Extract component name from README
-    COMPONENT_NAME="`trim_file "$LICENSE_INFO_DIR/README" | head -n1 | grep -o '^[^(]*[^([:space:]]'`"
+    # Skip if primary file missing (error will be logged by primary_file
+    # function call above)
+    [ -n "$PRIMARY_FILE" ] || continue
 
-    # Add license information to LICENSE
-    printf '\n\n' >> "$OUTPUT_DIR/LICENSE"
-    trim_file "$LICENSE_INFO_DIR/README" >> "$OUTPUT_DIR/LICENSE"
-
-    # Append verbatim copy of license if small enough
-    if [ -n "$LICENSE_FILE" ]; then
-        if [ "`wc -l < "$LICENSE_FILE"`" -le "$LICENSE_COPY_LIMIT" ]; then
-            echo >> "$OUTPUT_DIR/LICENSE"
-            trim_file "$LICENSE_FILE" >> "$OUTPUT_DIR/LICENSE"
-        fi
-    fi
-
-    # Copy NOTICE, if provided
-    if [ -n "$NOTICE_FILE" ]; then
-        printf '\n======== NOTICE for "%s" ========\n\n' "$COMPONENT_NAME" >> "$OUTPUT_DIR/NOTICE"
-        trim_file "$NOTICE_FILE" >> "$OUTPUT_DIR/NOTICE"
-    fi
+    BUNDLED_LICENSE_FILE="bundled/`basename "$LICENSE_INFO_DIR"`/`basename "$LICENSE_FILE"`"
+    BUNDLED_NOTICE_FILE="bundled/`basename "$LICENSE_INFO_DIR"`/`basename "$NOTICE_FILE"`"
 
     # Include verbatim copy of license information
     mkdir -p "$OUTPUT_DIR/bundled/"
     cp -Lr "$LICENSE_INFO_DIR" "$OUTPUT_DIR/bundled/"
 
+    TITLE="`get_header_value "$PRIMARY_FILE" Name`"
+    TITLE="$TITLE (`get_header_value "$PRIMARY_FILE" URL`)"
+
+    # Get VERSION from header field if not otherwise available (for
+    # dependencies not pulled in by Maven or NPM, like fonts)
+    if [ -z "$VERSION" ]; then
+        VERSION="`get_header_value "$PRIMARY_FILE" Version`"
+        if [ -z "$VERSION" ]; then
+            VERSION="N/A"
+        fi
+    fi
+
+    (
+
+        # Add license information to LICENSE
+        printf '\n'
+
+        cat <<EOF
+$TITLE
+`printf '%s' "$TITLE" | sed 's/./-/g'`
+
+    Version: $VERSION
+    From:`get_header_value "$PRIMARY_FILE" From | format_multiline`
+    License(s):
+EOF
+
+        # Copy LICENSE, if provided (we omit the local copy of the LICENSE if the
+        # software is Apache-licensed, as we already bundle a copy ourselves)
+        printf '        '
+        if [ -n "$LICENSE_FILE" ] && get_license "$LICENSE_FILE" "$VERSION" | grep -q .; then
+
+            printf '%s (%s)\n\n' \
+                "`get_header_value "$PRIMARY_FILE" License`" \
+                "$BUNDLED_LICENSE_FILE"
+
+            get_license "$LICENSE_FILE" "$VERSION" > "$OUTPUT_DIR/$BUNDLED_LICENSE_FILE"
+            printf '\n' >> "$OUTPUT_DIR/$BUNDLED_LICENSE_FILE"
+            get_header_value "$PRIMARY_FILE" "+" >> "$OUTPUT_DIR/$BUNDLED_LICENSE_FILE"
+
+            # Append verbatim copy of license if small enough
+            LICENSE_LINE_COUNT="`get_license "$LICENSE_FILE" "$VERSION" | wc -l`"
+            if [ "$LICENSE_LINE_COUNT" -gt 0 -a "$LICENSE_LINE_COUNT" -le "$LICENSE_COPY_LIMIT" ]; then
+                printf '>\n'
+                get_license "$LICENSE_FILE" "$VERSION" | sed 's/^/> /' | sed 's/[[:space:]]\+$//'
+                printf '>\n\n'
+                get_header_value "$PRIMARY_FILE" "+" && printf '\n'
+            fi
+
+        else
+            printf '%s\n\n' "`get_header_value "$PRIMARY_FILE" License`"
+        fi
+
+    ) | subst_version "$VERSION" >> "$OUTPUT_DIR/LICENSE"
+
+
+    # Copy NOTICE, if provided
+    if [ -n "$NOTICE_FILE" ]; then
+        COMPONENT_NAME="`get_header_value "$PRIMARY_FILE" Name`"
+        printf '\n======== NOTICE for "%s" ========\n\n' "$COMPONENT_NAME" >> "$OUTPUT_DIR/NOTICE"
+        get_license "$NOTICE_FILE" "$VERSION" >> "$OUTPUT_DIR/NOTICE"
+        get_license "$NOTICE_FILE" "$VERSION" > "$OUTPUT_DIR/$BUNDLED_NOTICE_FILE"
+    fi
+
     # Add README describing nature of the "bundled/" directory
     cat > "$OUTPUT_DIR/bundled/README" <<EOF
 Apache Guacamole includes a number of subcomponents with separate copyright
@@ -366,9 +603,8 @@ EOF
 
 done
 
-# Do not double-bundle the information contained in the README files (it's
-# already in LICENSE), nor internal mappings like dep-coordinates.txt
-for EXCLUDED_FILE in README dep-coordinates.txt; do
+# Do not include internal dep-coordinates.txt mappings
+for EXCLUDED_FILE in dep-coordinates.txt; do
     rm -f "$OUTPUT_DIR/bundled"/*/"$EXCLUDED_FILE"
 done
 

From 78b16f16387d09afa2c0d2e56e456ed32dc5c342 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 15 Jan 2026 13:40:09 -0800
Subject: [PATCH 2/4] GUACAMOLE-2139: Migrate all license information to new
 automated format.

---
 doc/licenses/angular-1.8.3/README             |   8 -
 .../angular-1.8.3/dep-coordinates.txt         |   2 -
 doc/licenses/angular-translate-2.19.1/README  |   8 -
 .../dep-coordinates.txt                       |   3 -
 .../LICENSE                                   |   9 +-
 .../angular-translate/dep-coordinates.txt     |   3 +
 .../{angular-1.8.3 => angular}/LICENSE        |   7 +
 doc/licenses/angular/dep-coordinates.txt      |   2 +
 doc/licenses/antlr-2.7.7/README               |   8 -
 .../{antlr-2.7.7 => antlr}/LICENSE.txt        |   7 +
 .../dep-coordinates.txt                       |   2 +-
 doc/licenses/aopalliance-1.0/LICENSE          |   4 -
 doc/licenses/aopalliance-1.0/README           |   8 -
 .../aopalliance-1.0/dep-coordinates.txt       |   1 -
 doc/licenses/aopalliance/LICENSE              |   8 +
 doc/licenses/aopalliance/dep-coordinates.txt  |   1 +
 doc/licenses/apache-commons-1.16.0/NOTICE     |   5 -
 doc/licenses/apache-commons-1.16.0/README     |   8 -
 .../apache-commons-1.16.0/dep-coordinates.txt |   1 -
 doc/licenses/apache-commons-1.17.1/NOTICE     |   5 -
 doc/licenses/apache-commons-1.17.1/README     |   7 -
 .../apache-commons-1.17.1/dep-coordinates.txt |   1 -
 .../apache-commons-beanutils-1.7.0/NOTICE     |   2 -
 .../apache-commons-beanutils-1.7.0/README     |   9 -
 .../dep-coordinates.txt                       |   2 -
 doc/licenses/apache-commons-beanutils/NOTICE  |   9 +
 .../dep-coordinates.txt                       |   2 +
 doc/licenses/apache-commons-chain-1.2/NOTICE  |   5 -
 doc/licenses/apache-commons-chain-1.2/README  |   9 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-chain/NOTICE      |  12 +
 .../apache-commons-chain/dep-coordinates.txt  |   1 +
 doc/licenses/apache-commons-codec-1.11/NOTICE |  17 --
 doc/licenses/apache-commons-codec-1.11/README |   8 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-codec/NOTICE      |  38 +++
 .../apache-commons-codec/dep-coordinates.txt  |   1 +
 .../apache-commons-collections-3.2.2/NOTICE   |   2 -
 .../apache-commons-collections-3.2.2/README   |   9 -
 .../dep-coordinates.txt                       |   1 -
 .../apache-commons-collections-4.4/NOTICE     |   5 -
 .../apache-commons-collections-4.4/README     |   9 -
 .../dep-coordinates.txt                       |   1 -
 .../apache-commons-collections/NOTICE         |  16 +
 .../dep-coordinates.txt                       |   2 +
 .../apache-commons-configuration-1.5/NOTICE   |   5 -
 .../apache-commons-configuration-1.5/README   |   9 -
 .../dep-coordinates.txt                       |   1 -
 .../apache-commons-configuration/NOTICE       |  12 +
 .../dep-coordinates.txt                       |   1 +
 .../apache-commons-digester-1.8/NOTICE        |   5 -
 .../apache-commons-digester-1.8/README        |   9 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-digester/NOTICE   |  12 +
 .../dep-coordinates.txt                       |   1 +
 doc/licenses/apache-commons-lang-2.3/NOTICE   |   5 -
 doc/licenses/apache-commons-lang-2.3/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../apache-commons-lang-3.17.0/NOTICE         |   5 -
 .../apache-commons-lang-3.17.0/README         |   7 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-lang/NOTICE       |  19 ++
 .../apache-commons-lang/dep-coordinates.txt   |   2 +
 .../apache-commons-logging-1.2/NOTICE         |   6 -
 .../apache-commons-logging-1.2/README         |   9 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-logging/NOTICE    |  12 +
 .../dep-coordinates.txt                       |   1 +
 doc/licenses/apache-commons-pool-1.5.4/NOTICE |  12 -
 doc/licenses/apache-commons-pool-1.5.4/README |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../apache-commons-pool-2.12.0/NOTICE         |   5 -
 .../apache-commons-pool-2.12.0/README         |   8 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-pool/NOTICE       |  26 ++
 .../apache-commons-pool/dep-coordinates.txt   |   2 +
 .../apache-commons-text-1.12.0/NOTICE.txt     |   5 -
 .../apache-commons-text-1.12.0/README         |   7 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/apache-commons-text/NOTICE.txt   |  12 +
 .../apache-commons-text/dep-coordinates.txt   |   1 +
 doc/licenses/apache-directory-api/NOTICE      |  12 +
 .../apache-directory-api/dep-coordinates.txt  |   1 +
 doc/licenses/apache-mina-2.2.4/NOTICE         |   5 -
 doc/licenses/apache-mina-2.2.4/README         |   8 -
 .../apache-mina-2.2.4/dep-coordinates.txt     |   1 -
 doc/licenses/apache-mina/NOTICE               |  12 +
 doc/licenses/apache-mina/dep-coordinates.txt  |   1 +
 doc/licenses/apache-santuario-2.2.6/README    |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../NOTICE                                    |   7 +
 .../apache-santuario/dep-coordinates.txt      |   1 +
 doc/licenses/assert-1.5.0/README              |   8 -
 doc/licenses/assert-1.5.0/dep-coordinates.txt |   1 -
 doc/licenses/{util-0.11.1 => assert}/LICENSE  |   7 +
 doc/licenses/assert/dep-coordinates.txt       |   1 +
 doc/licenses/base64-js-1.5.1/README           |   8 -
 .../base64-js-1.5.1/dep-coordinates.txt       |   1 -
 .../{base64-js-1.5.1 => base64-js}/LICENSE    |   7 +
 doc/licenses/base64-js/dep-coordinates.txt    |   1 +
 .../blob-polyfill-9.0.20240710/README         |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../blob-polyfill/dep-coordinates.txt         |   1 +
 doc/licenses/bouncycastle-1.44/LICENSE        |   7 -
 doc/licenses/bouncycastle-1.44/README         |   8 -
 .../bouncycastle-1.44/dep-coordinates.txt     |   1 -
 doc/licenses/bouncycastle-1.80/LICENSE        |  18 --
 doc/licenses/bouncycastle-1.80/README         |   7 -
 .../bouncycastle-1.80/dep-coordinates.txt     |   3 -
 doc/licenses/bouncycastle-fips-2.1.0/README   |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../bouncycastle-fips/dep-coordinates.txt     |   1 +
 .../bouncycastle-pkix-fips-2.1.9/README       |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../dep-coordinates.txt                       |   1 +
 .../bouncycastle-util-fips-2.1.4/README       |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../dep-coordinates.txt                       |   1 +
 doc/licenses/bouncycastle/LICENSE             |  34 +++
 doc/licenses/bouncycastle/dep-coordinates.txt |   4 +
 doc/licenses/buffer-4.9.2/README              |   7 -
 doc/licenses/buffer-4.9.2/dep-coordinates.txt |   1 -
 doc/licenses/{buffer-4.9.2 => buffer}/LICENSE |   7 +
 doc/licenses/buffer/dep-coordinates.txt       |   1 +
 doc/licenses/byte-buddy-1.15.4/README         |   8 -
 .../byte-buddy-1.15.4/dep-coordinates.txt     |   1 -
 .../{byte-buddy-1.15.4 => byte-buddy}/NOTICE  |   7 +
 doc/licenses/byte-buddy/dep-coordinates.txt   |   1 +
 doc/licenses/caffeine-2.9.3/README            |   7 -
 .../caffeine-2.9.3/dep-coordinates.txt        |   1 -
 doc/licenses/caffeine/LICENSE                 |   4 +
 doc/licenses/caffeine/dep-coordinates.txt     |   1 +
 doc/licenses/cas-client-3.6.4/NOTICE          |   2 -
 doc/licenses/cas-client-3.6.4/README          |   8 -
 .../cas-client-3.6.4/dep-coordinates.txt      |   1 -
 doc/licenses/cas-client/NOTICE                |   9 +
 doc/licenses/cas-client/dep-coordinates.txt   |   1 +
 doc/licenses/checker-qual-3.19.0/LICENSE.txt  |  22 --
 doc/licenses/checker-qual-3.19.0/README       |   8 -
 .../checker-qual-3.19.0/dep-coordinates.txt   |   1 -
 doc/licenses/checker-qual-3.37.0/README       |   8 -
 .../checker-qual-3.37.0/dep-coordinates.txt   |   1 -
 .../LICENSE.txt                               |   7 +
 doc/licenses/checker-qual/dep-coordinates.txt |   1 +
 doc/licenses/core-util-is-1.0.3/README        |   7 -
 .../core-util-is-1.0.3/dep-coordinates.txt    |   1 -
 .../LICENSE                                   |   7 +
 doc/licenses/core-util-is/dep-coordinates.txt |   1 +
 doc/licenses/css-loader-5.2.7/README          |   8 -
 .../css-loader-5.2.7/dep-coordinates.txt      |   1 -
 .../{css-loader-5.2.7 => css-loader}/LICENSE  |   7 +
 doc/licenses/css-loader/dep-coordinates.txt   |   1 +
 doc/licenses/csv-6.3.9/README                 |   7 -
 doc/licenses/csv-6.3.9/dep-coordinates.txt    |   2 -
 doc/licenses/{csv-6.3.9 => csv}/LICENSE       |   7 +
 doc/licenses/csv/dep-coordinates.txt          |   2 +
 doc/licenses/d3-path-3.1.0/README             |   8 -
 .../d3-path-3.1.0/dep-coordinates.txt         |   1 -
 .../{d3-path-3.1.0 => d3-path}/LICENSE        |   7 +
 doc/licenses/d3-path/dep-coordinates.txt      |   1 +
 doc/licenses/d3-shape-3.2.0/README            |   8 -
 .../d3-shape-3.2.0/dep-coordinates.txt        |   1 -
 .../{d3-shape-3.2.0 => d3-shape}/LICENSE      |   7 +
 doc/licenses/d3-shape/dep-coordinates.txt     |   1 +
 doc/licenses/datalist-polyfill-1.25.1/README  |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../datalist-polyfill/dep-coordinates.txt     |   1 +
 doc/licenses/directory-api-2.1.7/NOTICE       |   5 -
 doc/licenses/directory-api-2.1.7/README       |   7 -
 .../directory-api-2.1.7/dep-coordinates.txt   |   1 -
 doc/licenses/dom4j-2.1.4/README               |   8 -
 doc/licenses/{dom4j-2.1.4 => dom4j}/LICENSE   |   7 +
 .../dep-coordinates.txt                       |   2 +-
 doc/licenses/duo-universal-sdk-1.3.1/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   9 +-
 .../duo-universal-sdk/dep-coordinates.txt     |   1 +
 doc/licenses/ehcache-2.4.0/README             |   8 -
 .../ehcache-2.4.0/dep-coordinates.txt         |   1 -
 doc/licenses/ehcache/LICENSE                  |   4 +
 doc/licenses/ehcache/dep-coordinates.txt      |   1 +
 doc/licenses/error-prone-2.10.0/README        |   8 -
 .../error-prone-2.10.0/dep-coordinates.txt    |   1 -
 doc/licenses/error-prone-2.21.1/README        |   8 -
 .../error-prone-2.21.1/dep-coordinates.txt    |   1 -
 doc/licenses/error-prone/LICENSE              |   4 +
 doc/licenses/error-prone/dep-coordinates.txt  |   1 +
 doc/licenses/events-3.3.0/README              |   7 -
 doc/licenses/events-3.3.0/dep-coordinates.txt |   1 -
 doc/licenses/{events-3.3.0 => events}/LICENSE |   7 +
 doc/licenses/events/dep-coordinates.txt       |   1 +
 doc/licenses/file-saver-2.0.5/README          |   8 -
 .../file-saver-2.0.5/dep-coordinates.txt      |   1 -
 .../LICENSE.md                                |   7 +
 doc/licenses/file-saver/dep-coordinates.txt   |   1 +
 doc/licenses/findbugs-jsr305-3.0.2/README     |   8 -
 .../findbugs-jsr305-3.0.2/dep-coordinates.txt |   1 -
 .../LICENSE                                   |   7 +
 .../findbugs-jsr305/dep-coordinates.txt       |   1 +
 doc/licenses/fuzzysort-3.0.2/README           |   7 -
 .../fuzzysort-3.0.2/dep-coordinates.txt       |   1 -
 .../{fuzzysort-3.0.2 => fuzzysort}/LICENSE    |   7 +
 doc/licenses/fuzzysort/dep-coordinates.txt    |   1 +
 doc/licenses/glassfish-hk2-2.6.1/README       |   8 -
 .../glassfish-hk2-2.6.1/dep-coordinates.txt   |   6 -
 .../LICENSE.md                                |   7 +
 .../glassfish-hk2/dep-coordinates.txt         |   6 +
 doc/licenses/guava-32.1.3-jre/README          |   8 -
 .../guava-32.1.3-jre/dep-coordinates.txt      |   3 -
 doc/licenses/guava/LICENSE                    |   4 +
 doc/licenses/guava/dep-coordinates.txt        |   3 +
 doc/licenses/guice-5.1.0/README               |   8 -
 doc/licenses/guice-5.1.0/dep-coordinates.txt  |   3 -
 doc/licenses/guice/LICENSE                    |   4 +
 doc/licenses/guice/dep-coordinates.txt        |   3 +
 doc/licenses/ieee754-1.2.1/README             |   7 -
 .../ieee754-1.2.1/dep-coordinates.txt         |   1 -
 .../{ieee754-1.2.1 => ieee754}/LICENSE        |   7 +
 doc/licenses/ieee754/dep-coordinates.txt      |   1 +
 doc/licenses/inherits-2.0.3/README            |   8 -
 .../inherits-2.0.3/dep-coordinates.txt        |   1 -
 doc/licenses/inherits-2.0.4/LICENSE           |  15 -
 doc/licenses/inherits-2.0.4/README            |   8 -
 .../inherits-2.0.4/dep-coordinates.txt        |   1 -
 .../{inherits-2.0.3 => inherits}/LICENSE      |   7 +
 doc/licenses/inherits/dep-coordinates.txt     |   1 +
 doc/licenses/ipaddress-5.5.1/README           |   8 -
 .../ipaddress-5.5.1/dep-coordinates.txt       |   1 -
 doc/licenses/ipaddress/LICENSE                |   4 +
 doc/licenses/ipaddress/dep-coordinates.txt    |   1 +
 doc/licenses/isarray-1.0.0/README             |   8 -
 .../isarray-1.0.0/dep-coordinates.txt         |   1 -
 .../{isarray-1.0.0 => isarray}/LICENSE        |   7 +
 doc/licenses/isarray/dep-coordinates.txt      |   1 +
 doc/licenses/j2objc-annotations-2.8/README    |   8 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/j2objc-annotations/LICENSE       |   4 +
 .../j2objc-annotations/dep-coordinates.txt    |   1 +
 doc/licenses/jackson-2.19.0/README            |   8 -
 .../jackson-2.19.0/dep-coordinates.txt        |   4 -
 doc/licenses/jackson-databind-2.19.0/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../NOTICE                                    |   7 +
 .../jackson-databind/dep-coordinates.txt      |   1 +
 .../{jackson-2.19.0 => jackson}/NOTICE        |   7 +
 doc/licenses/jackson/dep-coordinates.txt      |   4 +
 doc/licenses/jai-imageio-core-1.4.0/README    |  12 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.txt                               |  10 +
 .../jai-imageio-core/dep-coordinates.txt      |   1 +
 .../jakarta-activation-1.2.1/LICENSE.md       |  29 --
 doc/licenses/jakarta-activation-1.2.1/README  |   8 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/jakarta-activation-1.2.2/README  |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../jakarta-activation/dep-coordinates.txt    |   1 +
 .../jakarta-annotation-api-1.3.5/README       |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../dep-coordinates.txt                       |   1 +
 doc/licenses/jakarta-jaxb-2.3.2/README        |   8 -
 .../jakarta-jaxb-2.3.2/dep-coordinates.txt    |   3 -
 doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md    |  28 --
 doc/licenses/jakarta-jaxb-2.3.3/README        |   8 -
 .../jakarta-jaxb-2.3.3/dep-coordinates.txt    |   3 -
 .../LICENSE.md                                |   9 +-
 doc/licenses/jakarta-jaxb/dep-coordinates.txt |   3 +
 .../jakarta-validation-api-2.0.2/README       |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../jakarta-validation-api-2.1.3/NOTICE       |  11 -
 .../jakarta-validation-api-2.1.3/README       |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../NOTICE                                    |   8 +-
 .../dep-coordinates.txt                       |   1 +
 doc/licenses/jakarta-ws-rs-api-2.1.6/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../jakarta-ws-rs-api/dep-coordinates.txt     |   1 +
 doc/licenses/java-jwt-4.0.0/README            |   8 -
 .../java-jwt-4.0.0/dep-coordinates.txt        |   1 -
 .../{java-jwt-4.0.0 => java-jwt}/LICENSE      |   9 +-
 doc/licenses/java-jwt/dep-coordinates.txt     |   1 +
 doc/licenses/java-saml-2.9.0/README           |   8 -
 .../java-saml-2.9.0/dep-coordinates.txt       |   2 -
 .../{java-saml-2.9.0 => java-saml}/LICENSE    |   7 +
 doc/licenses/java-saml/dep-coordinates.txt    |   2 +
 doc/licenses/javaee-activation-1.2.0/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.txt                               |   7 +
 .../javaee-activation/dep-coordinates.txt     |   1 +
 doc/licenses/javassist-3.30.2-ga/README       |   8 -
 .../javassist-3.30.2-ga/dep-coordinates.txt   |   1 -
 doc/licenses/javassist/LICENSE                |   4 +
 doc/licenses/javassist/dep-coordinates.txt    |   1 +
 doc/licenses/javax.inject-1/README            |   8 -
 .../javax.inject-1/dep-coordinates.txt        |   1 -
 doc/licenses/javax.inject/LICENSE             |   4 +
 doc/licenses/javax.inject/dep-coordinates.txt |   1 +
 doc/licenses/jaxb-api-2.2.12/README           |   8 -
 .../jaxb-api-2.2.12/dep-coordinates.txt       |   1 -
 doc/licenses/jaxb-api-2.3.1/LICENSE.txt       | 274 ------------------
 doc/licenses/jaxb-api-2.3.1/README            |   8 -
 .../jaxb-api-2.3.1/dep-coordinates.txt        |   1 -
 .../{jaxb-api-2.2.12 => jaxb-api}/LICENSE.txt |   7 +
 doc/licenses/jaxb-api/dep-coordinates.txt     |   1 +
 doc/licenses/jcommander-1.82/NOTICE           |   1 -
 doc/licenses/jcommander-1.82/README           |   8 -
 .../jcommander-1.82/dep-coordinates.txt       |   1 -
 doc/licenses/jcommander/NOTICE                |   8 +
 doc/licenses/jcommander/dep-coordinates.txt   |   1 +
 doc/licenses/jersey-2.46/README               |   8 -
 doc/licenses/jersey-2.46/dep-coordinates.txt  |   7 -
 .../{jersey-2.46 => jersey}/LICENSE.md        |   7 +
 doc/licenses/jersey/dep-coordinates.txt       |   7 +
 .../jetbrains-annotations-13.0/README         |   9 -
 .../dep-coordinates.txt                       |   1 -
 doc/licenses/jetbrains-annotations/LICENSE    |   4 +
 .../jetbrains-annotations/dep-coordinates.txt |   1 +
 doc/licenses/joda-time-2.10.6/NOTICE          |   2 -
 doc/licenses/joda-time-2.10.6/README          |   8 -
 .../joda-time-2.10.6/dep-coordinates.txt      |   1 -
 doc/licenses/joda-time/NOTICE                 |   9 +
 doc/licenses/joda-time/dep-coordinates.txt    |   1 +
 doc/licenses/jose4j-0.9.6/README              |   8 -
 doc/licenses/jose4j-0.9.6/dep-coordinates.txt |   1 -
 doc/licenses/{jose4j-0.9.6 => jose4j}/NOTICE  |   8 +-
 doc/licenses/jose4j/dep-coordinates.txt       |   1 +
 doc/licenses/jquery-3.7.1/README              |   8 -
 doc/licenses/jquery-3.7.1/dep-coordinates.txt |   1 -
 .../{jquery-3.7.1 => jquery}/LICENSE.txt      |   7 +
 doc/licenses/jquery/dep-coordinates.txt       |   1 +
 doc/licenses/jradius-1.1.5/README             |   8 -
 .../jradius-1.1.5/dep-coordinates.txt         |   3 -
 .../{jradius-1.1.5 => jradius}/LICENSE        |   7 +
 doc/licenses/jradius/dep-coordinates.txt      |   3 +
 doc/licenses/jsr250-api-1.0/README            |   9 -
 .../jsr250-api-1.0/dep-coordinates.txt        |   1 -
 .../CDDLv1.0.txt                              |  10 +-
 doc/licenses/jsr250-api/dep-coordinates.txt   |   1 +
 doc/licenses/jstz-2.1.1/README                |   8 -
 doc/licenses/jstz-2.1.1/dep-coordinates.txt   |   1 -
 doc/licenses/{jstz-2.1.1 => jstz}/LICENSE     |   9 +-
 doc/licenses/jstz/dep-coordinates.txt         |   1 +
 doc/licenses/kotlin-1.4.10/NOTICE.txt         |   2 -
 doc/licenses/kotlin-1.4.10/README             |   8 -
 .../kotlin-1.4.10/dep-coordinates.txt         |   5 -
 doc/licenses/kotlin-1.9.25/NOTICE.txt         |   2 -
 doc/licenses/kotlin-1.9.25/README             |   8 -
 .../kotlin-1.9.25/dep-coordinates.txt         |   5 -
 doc/licenses/kotlin/NOTICE.txt                |   9 +
 doc/licenses/kotlin/dep-coordinates.txt       |   5 +
 .../kotlinx-serialization-1.9.0/NOTICE.txt    |   2 -
 .../kotlinx-serialization-1.9.0/README        |   8 -
 .../dep-coordinates.txt                       |   2 -
 doc/licenses/kotlinx-serialization/NOTICE.txt |   9 +
 .../kotlinx-serialization/dep-coordinates.txt |   2 +
 doc/licenses/ksm-sdk-17.1.1/README            |   9 -
 .../ksm-sdk-17.1.1/dep-coordinates.txt        |   1 -
 .../{ksm-sdk-17.1.1 => ksm-sdk}/LICENSE       |   7 +
 doc/licenses/ksm-sdk/dep-coordinates.txt      |   1 +
 doc/licenses/lodash-4.17.21/README            |   8 -
 .../lodash-4.17.21/dep-coordinates.txt        |   1 -
 .../{lodash-4.17.21 => lodash}/LICENSE        |   7 +
 doc/licenses/lodash/dep-coordinates.txt       |   1 +
 doc/licenses/logback-1.3.15/README            |   8 -
 .../logback-1.3.15/dep-coordinates.txt        |   2 -
 .../{logback-1.3.15 => logback}/LICENSE.txt   |   8 +-
 doc/licenses/logback/dep-coordinates.txt      |   2 +
 doc/licenses/logging-interceptor-4.9.1/README |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../NOTICE                                    |   9 +-
 .../logging-interceptor/dep-coordinates.txt   |   1 +
 doc/licenses/make-plural-3.0.6/README         |   8 -
 .../make-plural-3.0.6/dep-coordinates.txt     |   1 -
 .../LICENSE                                   |   7 +
 doc/licenses/make-plural/dep-coordinates.txt  |   1 +
 doc/licenses/messageformat-1.0.2/README       |   8 -
 .../messageformat-1.0.2/dep-coordinates.txt   |   1 -
 .../messageformat-parser-1.1.0/README         |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../messageformat-parser/dep-coordinates.txt  |   1 +
 .../LICENSE                                   |   7 +
 .../messageformat/dep-coordinates.txt         |   1 +
 doc/licenses/mybatis-3.5.19/README            |   8 -
 .../mybatis-3.5.19/dep-coordinates.txt        |   1 -
 doc/licenses/mybatis-guice-3.18/README        |   8 -
 .../mybatis-guice-3.18/dep-coordinates.txt    |   1 -
 .../NOTICE                                    |   8 +-
 .../mybatis-guice/dep-coordinates.txt         |   1 +
 .../{mybatis-3.5.19 => mybatis}/NOTICE        |   8 +-
 doc/licenses/mybatis/dep-coordinates.txt      |   1 +
 doc/licenses/object-assign-4.1.1/README       |   8 -
 .../object-assign-4.1.1/dep-coordinates.txt   |   1 -
 .../LICENSE                                   |   7 +
 .../object-assign/dep-coordinates.txt         |   1 +
 doc/licenses/okhttp-4.12.0/README             |   8 -
 .../okhttp-4.12.0/dep-coordinates.txt         |   2 -
 doc/licenses/{okhttp-4.12.0 => okhttp}/NOTICE |   7 +
 doc/licenses/okhttp/dep-coordinates.txt       |   2 +
 doc/licenses/okio-3.6.0/README                |   8 -
 doc/licenses/okio-3.6.0/dep-coordinates.txt   |   2 -
 doc/licenses/{okio-3.6.0 => okio}/NOTICE      |   7 +
 doc/licenses/okio/dep-coordinates.txt         |   2 +
 .../osgi-resource-locator-1.0.3/README        |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../osgi-resource-locator/dep-coordinates.txt |   1 +
 doc/licenses/pickr-1.8.2/README               |   8 -
 doc/licenses/pickr-1.8.2/dep-coordinates.txt  |   1 -
 doc/licenses/{pickr-1.8.2 => pickr}/LICENSE   |   7 +
 doc/licenses/pickr/dep-coordinates.txt        |   1 +
 doc/licenses/process-0.11.10/README           |   8 -
 .../process-0.11.10/dep-coordinates.txt       |   1 -
 .../process-nextick-args-2.0.1/README         |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../process-nextick-args/dep-coordinates.txt  |   1 +
 .../license.md                                |   7 +
 .../{process-0.11.10 => process}/LICENSE      |   7 +
 doc/licenses/process/dep-coordinates.txt      |   1 +
 doc/licenses/readable-stream-2.3.7/README     |   8 -
 .../readable-stream-2.3.7/dep-coordinates.txt |   1 -
 .../LICENSE                                   |   7 +
 .../readable-stream/dep-coordinates.txt       |   1 +
 doc/licenses/reserved-words-0.1.2/README      |   8 -
 .../reserved-words-0.1.2/dep-coordinates.txt  |   1 -
 .../LICENSE                                   |   7 +
 .../reserved-words/dep-coordinates.txt        |   1 +
 doc/licenses/retrofit-2.11.0/README           |   8 -
 .../retrofit-2.11.0/dep-coordinates.txt       |   2 -
 .../{retrofit-2.11.0 => retrofit}/NOTICE      |   7 +
 doc/licenses/retrofit/dep-coordinates.txt     |   2 +
 doc/licenses/safe-buffer-5.1.2/README         |   8 -
 .../safe-buffer-5.1.2/dep-coordinates.txt     |   1 -
 .../LICENSE                                   |   7 +
 doc/licenses/safe-buffer/dep-coordinates.txt  |   1 +
 doc/licenses/setimmediate-1.0.5/README        |   8 -
 .../setimmediate-1.0.5/dep-coordinates.txt    |   1 -
 .../LICENSE.txt                               |   7 +
 doc/licenses/setimmediate/dep-coordinates.txt |   1 +
 doc/licenses/slf4j-api-2.0.17/README          |   8 -
 .../slf4j-api-2.0.17/dep-coordinates.txt      |   2 -
 .../LICENSE.txt                               |   7 +
 doc/licenses/slf4j-api/dep-coordinates.txt    |   2 +
 doc/licenses/snakeyaml-2.4/README             |   8 -
 .../snakeyaml-2.4/dep-coordinates.txt         |   1 -
 doc/licenses/snakeyaml/LICENSE                |   4 +
 doc/licenses/snakeyaml/dep-coordinates.txt    |   1 +
 doc/licenses/spring-framework-3.0.5/README    |   8 -
 .../dep-coordinates.txt                       |   6 -
 doc/licenses/spring-framework/LICENSE         |   4 +
 .../spring-framework/dep-coordinates.txt      |   6 +
 doc/licenses/stream-browserify-2.0.2/README   |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../stream-browserify/dep-coordinates.txt     |   1 +
 doc/licenses/string_decoder-1.1.1/README      |   8 -
 .../string_decoder-1.1.1/dep-coordinates.txt  |   1 -
 .../LICENSE                                   |   7 +
 .../string_decoder/dep-coordinates.txt        |   1 +
 doc/licenses/timers-browserify-2.0.12/README  |   8 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE.md                                |   7 +
 .../timers-browserify/dep-coordinates.txt     |   1 +
 doc/licenses/util-0.11.1/README               |   8 -
 doc/licenses/util-0.11.1/dep-coordinates.txt  |   1 -
 doc/licenses/util-deprecate-1.0.2/README      |   8 -
 .../util-deprecate-1.0.2/dep-coordinates.txt  |   1 -
 .../LICENSE                                   |   7 +
 .../util-deprecate/dep-coordinates.txt        |   1 +
 doc/licenses/{assert-1.5.0 => util}/LICENSE   |   7 +
 doc/licenses/util/dep-coordinates.txt         |   1 +
 doc/licenses/webpack-4.47.0/README            |   8 -
 .../webpack-4.47.0/dep-coordinates.txt        |   1 -
 .../{webpack-4.47.0 => webpack}/LICENSE       |   7 +
 doc/licenses/webpack/dep-coordinates.txt      |   1 +
 doc/licenses/woodstox-core-5.4.0/README       |   7 -
 .../woodstox-core-5.4.0/dep-coordinates.txt   |   1 -
 doc/licenses/woodstox-core/LICENSE            |   4 +
 .../woodstox-core/dep-coordinates.txt         |   1 +
 doc/licenses/woodstox-stax2-api-4.2/README    |   7 -
 .../dep-coordinates.txt                       |   1 -
 .../LICENSE                                   |   7 +
 .../woodstox-stax2-api/dep-coordinates.txt    |   1 +
 doc/licenses/xpp3-1.1.4c/README               |   9 -
 .../{xpp3-1.1.4c => xpp3}/LICENSE.txt         |   7 +
 doc/licenses/{xpp3-1.1.4c => xpp3}/NOTICE     |   2 +
 .../{xpp3-1.1.4c => xpp3}/dep-coordinates.txt |   2 +-
 doc/licenses/zxing-3.5.3/NOTICE               |   7 -
 doc/licenses/zxing-3.5.3/README               |   8 -
 doc/licenses/zxing-3.5.3/dep-coordinates.txt  |   2 -
 doc/licenses/{zxing-3.5.3 => zxing}/AUTHORS   |   2 +
 doc/licenses/zxing/NOTICE                     |  14 +
 doc/licenses/zxing/dep-coordinates.txt        |   2 +
 .../bundled/totp-reference-impl-07/README     |   8 -
 .../totp-reference-impl-07/license.txt        |   9 +-
 .../bundled/angular-module-shim-0.0.4/README  |   8 -
 .../LICENSE                                   |  10 +-
 .../src/licenses/bundled/carlito/LICENSE      |   8 +-
 guacamole/src/licenses/bundled/carlito/README |   8 -
 .../glyptodon-enterprise-player/LICENSE       |   8 +
 .../glyptodon-enterprise-player/README        |   9 -
 508 files changed, 1088 insertions(+), 1739 deletions(-)
 delete mode 100644 doc/licenses/angular-1.8.3/README
 delete mode 100644 doc/licenses/angular-1.8.3/dep-coordinates.txt
 delete mode 100644 doc/licenses/angular-translate-2.19.1/README
 delete mode 100644 doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
 rename doc/licenses/{angular-translate-2.19.1 => angular-translate}/LICENSE (83%)
 create mode 100644 doc/licenses/angular-translate/dep-coordinates.txt
 rename doc/licenses/{angular-1.8.3 => angular}/LICENSE (86%)
 create mode 100644 doc/licenses/angular/dep-coordinates.txt
 delete mode 100644 doc/licenses/antlr-2.7.7/README
 rename doc/licenses/{antlr-2.7.7 => antlr}/LICENSE.txt (85%)
 rename doc/licenses/{antlr-2.7.7 => antlr}/dep-coordinates.txt (82%)
 delete mode 100644 doc/licenses/aopalliance-1.0/LICENSE
 delete mode 100644 doc/licenses/aopalliance-1.0/README
 delete mode 100644 doc/licenses/aopalliance-1.0/dep-coordinates.txt
 create mode 100644 doc/licenses/aopalliance/LICENSE
 create mode 100644 doc/licenses/aopalliance/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-1.16.0/NOTICE
 delete mode 100644 doc/licenses/apache-commons-1.16.0/README
 delete mode 100644 doc/licenses/apache-commons-1.16.0/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-1.17.1/NOTICE
 delete mode 100644 doc/licenses/apache-commons-1.17.1/README
 delete mode 100644 doc/licenses/apache-commons-1.17.1/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-beanutils-1.7.0/NOTICE
 delete mode 100644 doc/licenses/apache-commons-beanutils-1.7.0/README
 delete mode 100644 doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-beanutils/NOTICE
 create mode 100644 doc/licenses/apache-commons-beanutils/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-chain-1.2/NOTICE
 delete mode 100644 doc/licenses/apache-commons-chain-1.2/README
 delete mode 100644 doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-chain/NOTICE
 create mode 100644 doc/licenses/apache-commons-chain/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-codec-1.11/NOTICE
 delete mode 100644 doc/licenses/apache-commons-codec-1.11/README
 delete mode 100644 doc/licenses/apache-commons-codec-1.11/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-codec/NOTICE
 create mode 100644 doc/licenses/apache-commons-codec/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-collections-3.2.2/NOTICE
 delete mode 100644 doc/licenses/apache-commons-collections-3.2.2/README
 delete mode 100644 doc/licenses/apache-commons-collections-3.2.2/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-collections-4.4/NOTICE
 delete mode 100644 doc/licenses/apache-commons-collections-4.4/README
 delete mode 100644 doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-collections/NOTICE
 create mode 100644 doc/licenses/apache-commons-collections/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-configuration-1.5/NOTICE
 delete mode 100644 doc/licenses/apache-commons-configuration-1.5/README
 delete mode 100644 doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-configuration/NOTICE
 create mode 100644 doc/licenses/apache-commons-configuration/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-digester-1.8/NOTICE
 delete mode 100644 doc/licenses/apache-commons-digester-1.8/README
 delete mode 100644 doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-digester/NOTICE
 create mode 100644 doc/licenses/apache-commons-digester/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-lang-2.3/NOTICE
 delete mode 100644 doc/licenses/apache-commons-lang-2.3/README
 delete mode 100644 doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-lang-3.17.0/NOTICE
 delete mode 100644 doc/licenses/apache-commons-lang-3.17.0/README
 delete mode 100644 doc/licenses/apache-commons-lang-3.17.0/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-lang/NOTICE
 create mode 100644 doc/licenses/apache-commons-lang/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-logging-1.2/NOTICE
 delete mode 100644 doc/licenses/apache-commons-logging-1.2/README
 delete mode 100644 doc/licenses/apache-commons-logging-1.2/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-logging/NOTICE
 create mode 100644 doc/licenses/apache-commons-logging/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-pool-1.5.4/NOTICE
 delete mode 100644 doc/licenses/apache-commons-pool-1.5.4/README
 delete mode 100644 doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-pool-2.12.0/NOTICE
 delete mode 100644 doc/licenses/apache-commons-pool-2.12.0/README
 delete mode 100644 doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-pool/NOTICE
 create mode 100644 doc/licenses/apache-commons-pool/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-commons-text-1.12.0/NOTICE.txt
 delete mode 100644 doc/licenses/apache-commons-text-1.12.0/README
 delete mode 100644 doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-commons-text/NOTICE.txt
 create mode 100644 doc/licenses/apache-commons-text/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-directory-api/NOTICE
 create mode 100644 doc/licenses/apache-directory-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-mina-2.2.4/NOTICE
 delete mode 100644 doc/licenses/apache-mina-2.2.4/README
 delete mode 100644 doc/licenses/apache-mina-2.2.4/dep-coordinates.txt
 create mode 100644 doc/licenses/apache-mina/NOTICE
 create mode 100644 doc/licenses/apache-mina/dep-coordinates.txt
 delete mode 100644 doc/licenses/apache-santuario-2.2.6/README
 delete mode 100644 doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
 rename doc/licenses/{apache-santuario-2.2.6 => apache-santuario}/NOTICE (71%)
 create mode 100644 doc/licenses/apache-santuario/dep-coordinates.txt
 delete mode 100644 doc/licenses/assert-1.5.0/README
 delete mode 100644 doc/licenses/assert-1.5.0/dep-coordinates.txt
 rename doc/licenses/{util-0.11.1 => assert}/LICENSE (84%)
 create mode 100644 doc/licenses/assert/dep-coordinates.txt
 delete mode 100644 doc/licenses/base64-js-1.5.1/README
 delete mode 100644 doc/licenses/base64-js-1.5.1/dep-coordinates.txt
 rename doc/licenses/{base64-js-1.5.1 => base64-js}/LICENSE (84%)
 create mode 100644 doc/licenses/base64-js/dep-coordinates.txt
 delete mode 100644 doc/licenses/blob-polyfill-9.0.20240710/README
 delete mode 100644 doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt
 rename doc/licenses/{blob-polyfill-9.0.20240710 => blob-polyfill}/LICENSE.md (85%)
 create mode 100644 doc/licenses/blob-polyfill/dep-coordinates.txt
 delete mode 100644 doc/licenses/bouncycastle-1.44/LICENSE
 delete mode 100644 doc/licenses/bouncycastle-1.44/README
 delete mode 100644 doc/licenses/bouncycastle-1.44/dep-coordinates.txt
 delete mode 100644 doc/licenses/bouncycastle-1.80/LICENSE
 delete mode 100644 doc/licenses/bouncycastle-1.80/README
 delete mode 100644 doc/licenses/bouncycastle-1.80/dep-coordinates.txt
 delete mode 100644 doc/licenses/bouncycastle-fips-2.1.0/README
 delete mode 100644 doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt
 rename doc/licenses/{bouncycastle-util-fips-2.1.4 => bouncycastle-fips}/LICENSE (82%)
 create mode 100644 doc/licenses/bouncycastle-fips/dep-coordinates.txt
 delete mode 100644 doc/licenses/bouncycastle-pkix-fips-2.1.9/README
 delete mode 100644 doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt
 rename doc/licenses/{bouncycastle-pkix-fips-2.1.9 => bouncycastle-pkix-fips}/LICENSE (81%)
 create mode 100644 doc/licenses/bouncycastle-pkix-fips/dep-coordinates.txt
 delete mode 100644 doc/licenses/bouncycastle-util-fips-2.1.4/README
 delete mode 100644 doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt
 rename doc/licenses/{bouncycastle-fips-2.1.0 => bouncycastle-util-fips}/LICENSE (81%)
 create mode 100644 doc/licenses/bouncycastle-util-fips/dep-coordinates.txt
 create mode 100644 doc/licenses/bouncycastle/LICENSE
 create mode 100644 doc/licenses/bouncycastle/dep-coordinates.txt
 delete mode 100644 doc/licenses/buffer-4.9.2/README
 delete mode 100644 doc/licenses/buffer-4.9.2/dep-coordinates.txt
 rename doc/licenses/{buffer-4.9.2 => buffer}/LICENSE (84%)
 create mode 100644 doc/licenses/buffer/dep-coordinates.txt
 delete mode 100644 doc/licenses/byte-buddy-1.15.4/README
 delete mode 100644 doc/licenses/byte-buddy-1.15.4/dep-coordinates.txt
 rename doc/licenses/{byte-buddy-1.15.4 => byte-buddy}/NOTICE (74%)
 create mode 100644 doc/licenses/byte-buddy/dep-coordinates.txt
 delete mode 100644 doc/licenses/caffeine-2.9.3/README
 delete mode 100644 doc/licenses/caffeine-2.9.3/dep-coordinates.txt
 create mode 100644 doc/licenses/caffeine/LICENSE
 create mode 100644 doc/licenses/caffeine/dep-coordinates.txt
 delete mode 100644 doc/licenses/cas-client-3.6.4/NOTICE
 delete mode 100644 doc/licenses/cas-client-3.6.4/README
 delete mode 100644 doc/licenses/cas-client-3.6.4/dep-coordinates.txt
 create mode 100644 doc/licenses/cas-client/NOTICE
 create mode 100644 doc/licenses/cas-client/dep-coordinates.txt
 delete mode 100644 doc/licenses/checker-qual-3.19.0/LICENSE.txt
 delete mode 100644 doc/licenses/checker-qual-3.19.0/README
 delete mode 100644 doc/licenses/checker-qual-3.19.0/dep-coordinates.txt
 delete mode 100644 doc/licenses/checker-qual-3.37.0/README
 delete mode 100644 doc/licenses/checker-qual-3.37.0/dep-coordinates.txt
 rename doc/licenses/{checker-qual-3.37.0 => checker-qual}/LICENSE.txt (83%)
 create mode 100644 doc/licenses/checker-qual/dep-coordinates.txt
 delete mode 100644 doc/licenses/core-util-is-1.0.3/README
 delete mode 100644 doc/licenses/core-util-is-1.0.3/dep-coordinates.txt
 rename doc/licenses/{core-util-is-1.0.3 => core-util-is}/LICENSE (85%)
 create mode 100644 doc/licenses/core-util-is/dep-coordinates.txt
 delete mode 100644 doc/licenses/css-loader-5.2.7/README
 delete mode 100644 doc/licenses/css-loader-5.2.7/dep-coordinates.txt
 rename doc/licenses/{css-loader-5.2.7 => css-loader}/LICENSE (84%)
 create mode 100644 doc/licenses/css-loader/dep-coordinates.txt
 delete mode 100644 doc/licenses/csv-6.3.9/README
 delete mode 100644 doc/licenses/csv-6.3.9/dep-coordinates.txt
 rename doc/licenses/{csv-6.3.9 => csv}/LICENSE (84%)
 create mode 100644 doc/licenses/csv/dep-coordinates.txt
 delete mode 100644 doc/licenses/d3-path-3.1.0/README
 delete mode 100644 doc/licenses/d3-path-3.1.0/dep-coordinates.txt
 rename doc/licenses/{d3-path-3.1.0 => d3-path}/LICENSE (81%)
 create mode 100644 doc/licenses/d3-path/dep-coordinates.txt
 delete mode 100644 doc/licenses/d3-shape-3.2.0/README
 delete mode 100644 doc/licenses/d3-shape-3.2.0/dep-coordinates.txt
 rename doc/licenses/{d3-shape-3.2.0 => d3-shape}/LICENSE (81%)
 create mode 100644 doc/licenses/d3-shape/dep-coordinates.txt
 delete mode 100644 doc/licenses/datalist-polyfill-1.25.1/README
 delete mode 100644 doc/licenses/datalist-polyfill-1.25.1/dep-coordinates.txt
 rename doc/licenses/{datalist-polyfill-1.25.1 => datalist-polyfill}/LICENSE (82%)
 create mode 100644 doc/licenses/datalist-polyfill/dep-coordinates.txt
 delete mode 100644 doc/licenses/directory-api-2.1.7/NOTICE
 delete mode 100644 doc/licenses/directory-api-2.1.7/README
 delete mode 100644 doc/licenses/directory-api-2.1.7/dep-coordinates.txt
 delete mode 100644 doc/licenses/dom4j-2.1.4/README
 rename doc/licenses/{dom4j-2.1.4 => dom4j}/LICENSE (90%)
 rename doc/licenses/{dom4j-2.1.4 => dom4j}/dep-coordinates.txt (82%)
 delete mode 100644 doc/licenses/duo-universal-sdk-1.3.1/README
 delete mode 100644 doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt
 rename doc/licenses/{duo-universal-sdk-1.3.1 => duo-universal-sdk}/LICENSE (88%)
 create mode 100644 doc/licenses/duo-universal-sdk/dep-coordinates.txt
 delete mode 100644 doc/licenses/ehcache-2.4.0/README
 delete mode 100644 doc/licenses/ehcache-2.4.0/dep-coordinates.txt
 create mode 100644 doc/licenses/ehcache/LICENSE
 create mode 100644 doc/licenses/ehcache/dep-coordinates.txt
 delete mode 100644 doc/licenses/error-prone-2.10.0/README
 delete mode 100644 doc/licenses/error-prone-2.10.0/dep-coordinates.txt
 delete mode 100644 doc/licenses/error-prone-2.21.1/README
 delete mode 100644 doc/licenses/error-prone-2.21.1/dep-coordinates.txt
 create mode 100644 doc/licenses/error-prone/LICENSE
 create mode 100644 doc/licenses/error-prone/dep-coordinates.txt
 delete mode 100644 doc/licenses/events-3.3.0/README
 delete mode 100644 doc/licenses/events-3.3.0/dep-coordinates.txt
 rename doc/licenses/{events-3.3.0 => events}/LICENSE (83%)
 create mode 100644 doc/licenses/events/dep-coordinates.txt
 delete mode 100644 doc/licenses/file-saver-2.0.5/README
 delete mode 100644 doc/licenses/file-saver-2.0.5/dep-coordinates.txt
 rename doc/licenses/{file-saver-2.0.5 => file-saver}/LICENSE.md (84%)
 create mode 100644 doc/licenses/file-saver/dep-coordinates.txt
 delete mode 100644 doc/licenses/findbugs-jsr305-3.0.2/README
 delete mode 100644 doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt
 rename doc/licenses/{findbugs-jsr305-3.0.2 => findbugs-jsr305}/LICENSE (86%)
 create mode 100644 doc/licenses/findbugs-jsr305/dep-coordinates.txt
 delete mode 100644 doc/licenses/fuzzysort-3.0.2/README
 delete mode 100644 doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt
 rename doc/licenses/{fuzzysort-3.0.2 => fuzzysort}/LICENSE (83%)
 create mode 100644 doc/licenses/fuzzysort/dep-coordinates.txt
 delete mode 100644 doc/licenses/glassfish-hk2-2.6.1/README
 delete mode 100644 doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt
 rename doc/licenses/{glassfish-hk2-2.6.1 => glassfish-hk2}/LICENSE.md (97%)
 create mode 100644 doc/licenses/glassfish-hk2/dep-coordinates.txt
 delete mode 100644 doc/licenses/guava-32.1.3-jre/README
 delete mode 100644 doc/licenses/guava-32.1.3-jre/dep-coordinates.txt
 create mode 100644 doc/licenses/guava/LICENSE
 create mode 100644 doc/licenses/guava/dep-coordinates.txt
 delete mode 100644 doc/licenses/guice-5.1.0/README
 delete mode 100644 doc/licenses/guice-5.1.0/dep-coordinates.txt
 create mode 100644 doc/licenses/guice/LICENSE
 create mode 100644 doc/licenses/guice/dep-coordinates.txt
 delete mode 100644 doc/licenses/ieee754-1.2.1/README
 delete mode 100644 doc/licenses/ieee754-1.2.1/dep-coordinates.txt
 rename doc/licenses/{ieee754-1.2.1 => ieee754}/LICENSE (89%)
 create mode 100644 doc/licenses/ieee754/dep-coordinates.txt
 delete mode 100644 doc/licenses/inherits-2.0.3/README
 delete mode 100644 doc/licenses/inherits-2.0.3/dep-coordinates.txt
 delete mode 100644 doc/licenses/inherits-2.0.4/LICENSE
 delete mode 100644 doc/licenses/inherits-2.0.4/README
 delete mode 100644 doc/licenses/inherits-2.0.4/dep-coordinates.txt
 rename doc/licenses/{inherits-2.0.3 => inherits}/LICENSE (78%)
 create mode 100644 doc/licenses/inherits/dep-coordinates.txt
 delete mode 100644 doc/licenses/ipaddress-5.5.1/README
 delete mode 100644 doc/licenses/ipaddress-5.5.1/dep-coordinates.txt
 create mode 100644 doc/licenses/ipaddress/LICENSE
 create mode 100644 doc/licenses/ipaddress/dep-coordinates.txt
 delete mode 100644 doc/licenses/isarray-1.0.0/README
 delete mode 100644 doc/licenses/isarray-1.0.0/dep-coordinates.txt
 rename doc/licenses/{isarray-1.0.0 => isarray}/LICENSE (84%)
 create mode 100644 doc/licenses/isarray/dep-coordinates.txt
 delete mode 100644 doc/licenses/j2objc-annotations-2.8/README
 delete mode 100644 doc/licenses/j2objc-annotations-2.8/dep-coordinates.txt
 create mode 100644 doc/licenses/j2objc-annotations/LICENSE
 create mode 100644 doc/licenses/j2objc-annotations/dep-coordinates.txt
 delete mode 100644 doc/licenses/jackson-2.19.0/README
 delete mode 100644 doc/licenses/jackson-2.19.0/dep-coordinates.txt
 delete mode 100644 doc/licenses/jackson-databind-2.19.0/README
 delete mode 100644 doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt
 rename doc/licenses/{jackson-databind-2.19.0 => jackson-databind}/NOTICE (51%)
 create mode 100644 doc/licenses/jackson-databind/dep-coordinates.txt
 rename doc/licenses/{jackson-2.19.0 => jackson}/NOTICE (53%)
 create mode 100644 doc/licenses/jackson/dep-coordinates.txt
 delete mode 100644 doc/licenses/jai-imageio-core-1.4.0/README
 delete mode 100644 doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt
 rename doc/licenses/{jai-imageio-core-1.4.0 => jai-imageio-core}/LICENSE.txt (81%)
 create mode 100644 doc/licenses/jai-imageio-core/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-activation-1.2.1/LICENSE.md
 delete mode 100644 doc/licenses/jakarta-activation-1.2.1/README
 delete mode 100644 doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-activation-1.2.2/README
 delete mode 100644 doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt
 rename doc/licenses/{jakarta-activation-1.2.2 => jakarta-activation}/LICENSE.md (88%)
 create mode 100644 doc/licenses/jakarta-activation/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-annotation-api-1.3.5/README
 delete mode 100644 doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt
 rename doc/licenses/{jakarta-ws-rs-api-2.1.6 => jakarta-annotation-api}/LICENSE.md (99%)
 create mode 100644 doc/licenses/jakarta-annotation-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-jaxb-2.3.2/README
 delete mode 100644 doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md
 delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/README
 delete mode 100644 doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt
 rename doc/licenses/{jakarta-jaxb-2.3.2 => jakarta-jaxb}/LICENSE.md (83%)
 create mode 100644 doc/licenses/jakarta-jaxb/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-validation-api-2.0.2/README
 delete mode 100644 doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-validation-api-2.1.3/NOTICE
 delete mode 100644 doc/licenses/jakarta-validation-api-2.1.3/README
 delete mode 100644 doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
 rename doc/licenses/{jakarta-validation-api-2.0.2 => jakarta-validation-api}/NOTICE (58%)
 create mode 100644 doc/licenses/jakarta-validation-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/jakarta-ws-rs-api-2.1.6/README
 delete mode 100644 doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt
 rename doc/licenses/{jakarta-annotation-api-1.3.5 => jakarta-ws-rs-api}/LICENSE.md (99%)
 create mode 100644 doc/licenses/jakarta-ws-rs-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/java-jwt-4.0.0/README
 delete mode 100644 doc/licenses/java-jwt-4.0.0/dep-coordinates.txt
 rename doc/licenses/{java-jwt-4.0.0 => java-jwt}/LICENSE (84%)
 create mode 100644 doc/licenses/java-jwt/dep-coordinates.txt
 delete mode 100644 doc/licenses/java-saml-2.9.0/README
 delete mode 100644 doc/licenses/java-saml-2.9.0/dep-coordinates.txt
 rename doc/licenses/{java-saml-2.9.0 => java-saml}/LICENSE (83%)
 create mode 100644 doc/licenses/java-saml/dep-coordinates.txt
 delete mode 100644 doc/licenses/javaee-activation-1.2.0/README
 delete mode 100644 doc/licenses/javaee-activation-1.2.0/dep-coordinates.txt
 rename doc/licenses/{javaee-activation-1.2.0 => javaee-activation}/LICENSE.txt (99%)
 create mode 100644 doc/licenses/javaee-activation/dep-coordinates.txt
 delete mode 100644 doc/licenses/javassist-3.30.2-ga/README
 delete mode 100644 doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt
 create mode 100644 doc/licenses/javassist/LICENSE
 create mode 100644 doc/licenses/javassist/dep-coordinates.txt
 delete mode 100644 doc/licenses/javax.inject-1/README
 delete mode 100644 doc/licenses/javax.inject-1/dep-coordinates.txt
 create mode 100644 doc/licenses/javax.inject/LICENSE
 create mode 100644 doc/licenses/javax.inject/dep-coordinates.txt
 delete mode 100644 doc/licenses/jaxb-api-2.2.12/README
 delete mode 100644 doc/licenses/jaxb-api-2.2.12/dep-coordinates.txt
 delete mode 100644 doc/licenses/jaxb-api-2.3.1/LICENSE.txt
 delete mode 100644 doc/licenses/jaxb-api-2.3.1/README
 delete mode 100644 doc/licenses/jaxb-api-2.3.1/dep-coordinates.txt
 rename doc/licenses/{jaxb-api-2.2.12 => jaxb-api}/LICENSE.txt (99%)
 create mode 100644 doc/licenses/jaxb-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/jcommander-1.82/NOTICE
 delete mode 100644 doc/licenses/jcommander-1.82/README
 delete mode 100644 doc/licenses/jcommander-1.82/dep-coordinates.txt
 create mode 100644 doc/licenses/jcommander/NOTICE
 create mode 100644 doc/licenses/jcommander/dep-coordinates.txt
 delete mode 100644 doc/licenses/jersey-2.46/README
 delete mode 100644 doc/licenses/jersey-2.46/dep-coordinates.txt
 rename doc/licenses/{jersey-2.46 => jersey}/LICENSE.md (99%)
 create mode 100644 doc/licenses/jersey/dep-coordinates.txt
 delete mode 100644 doc/licenses/jetbrains-annotations-13.0/README
 delete mode 100644 doc/licenses/jetbrains-annotations-13.0/dep-coordinates.txt
 create mode 100644 doc/licenses/jetbrains-annotations/LICENSE
 create mode 100644 doc/licenses/jetbrains-annotations/dep-coordinates.txt
 delete mode 100644 doc/licenses/joda-time-2.10.6/NOTICE
 delete mode 100644 doc/licenses/joda-time-2.10.6/README
 delete mode 100644 doc/licenses/joda-time-2.10.6/dep-coordinates.txt
 create mode 100644 doc/licenses/joda-time/NOTICE
 create mode 100644 doc/licenses/joda-time/dep-coordinates.txt
 delete mode 100644 doc/licenses/jose4j-0.9.6/README
 delete mode 100644 doc/licenses/jose4j-0.9.6/dep-coordinates.txt
 rename doc/licenses/{jose4j-0.9.6 => jose4j}/NOTICE (73%)
 create mode 100644 doc/licenses/jose4j/dep-coordinates.txt
 delete mode 100644 doc/licenses/jquery-3.7.1/README
 delete mode 100644 doc/licenses/jquery-3.7.1/dep-coordinates.txt
 rename doc/licenses/{jquery-3.7.1 => jquery}/LICENSE.txt (86%)
 create mode 100644 doc/licenses/jquery/dep-coordinates.txt
 delete mode 100644 doc/licenses/jradius-1.1.5/README
 delete mode 100644 doc/licenses/jradius-1.1.5/dep-coordinates.txt
 rename doc/licenses/{jradius-1.1.5 => jradius}/LICENSE (99%)
 create mode 100644 doc/licenses/jradius/dep-coordinates.txt
 delete mode 100644 doc/licenses/jsr250-api-1.0/README
 delete mode 100644 doc/licenses/jsr250-api-1.0/dep-coordinates.txt
 rename doc/licenses/{jsr250-api-1.0 => jsr250-api}/CDDLv1.0.txt (98%)
 create mode 100644 doc/licenses/jsr250-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/jstz-2.1.1/README
 delete mode 100644 doc/licenses/jstz-2.1.1/dep-coordinates.txt
 rename doc/licenses/{jstz-2.1.1 => jstz}/LICENSE (84%)
 create mode 100644 doc/licenses/jstz/dep-coordinates.txt
 delete mode 100644 doc/licenses/kotlin-1.4.10/NOTICE.txt
 delete mode 100644 doc/licenses/kotlin-1.4.10/README
 delete mode 100644 doc/licenses/kotlin-1.4.10/dep-coordinates.txt
 delete mode 100644 doc/licenses/kotlin-1.9.25/NOTICE.txt
 delete mode 100644 doc/licenses/kotlin-1.9.25/README
 delete mode 100644 doc/licenses/kotlin-1.9.25/dep-coordinates.txt
 create mode 100644 doc/licenses/kotlin/NOTICE.txt
 create mode 100644 doc/licenses/kotlin/dep-coordinates.txt
 delete mode 100644 doc/licenses/kotlinx-serialization-1.9.0/NOTICE.txt
 delete mode 100644 doc/licenses/kotlinx-serialization-1.9.0/README
 delete mode 100644 doc/licenses/kotlinx-serialization-1.9.0/dep-coordinates.txt
 create mode 100644 doc/licenses/kotlinx-serialization/NOTICE.txt
 create mode 100644 doc/licenses/kotlinx-serialization/dep-coordinates.txt
 delete mode 100644 doc/licenses/ksm-sdk-17.1.1/README
 delete mode 100644 doc/licenses/ksm-sdk-17.1.1/dep-coordinates.txt
 rename doc/licenses/{ksm-sdk-17.1.1 => ksm-sdk}/LICENSE (81%)
 create mode 100644 doc/licenses/ksm-sdk/dep-coordinates.txt
 delete mode 100644 doc/licenses/lodash-4.17.21/README
 delete mode 100644 doc/licenses/lodash-4.17.21/dep-coordinates.txt
 rename doc/licenses/{lodash-4.17.21 => lodash}/LICENSE (91%)
 create mode 100644 doc/licenses/lodash/dep-coordinates.txt
 delete mode 100644 doc/licenses/logback-1.3.15/README
 delete mode 100644 doc/licenses/logback-1.3.15/dep-coordinates.txt
 rename doc/licenses/{logback-1.3.15 => logback}/LICENSE.txt (74%)
 create mode 100644 doc/licenses/logback/dep-coordinates.txt
 delete mode 100644 doc/licenses/logging-interceptor-4.9.1/README
 delete mode 100644 doc/licenses/logging-interceptor-4.9.1/dep-coordinates.txt
 rename doc/licenses/{logging-interceptor-4.9.1 => logging-interceptor}/NOTICE (70%)
 create mode 100644 doc/licenses/logging-interceptor/dep-coordinates.txt
 delete mode 100644 doc/licenses/make-plural-3.0.6/README
 delete mode 100644 doc/licenses/make-plural-3.0.6/dep-coordinates.txt
 rename doc/licenses/{make-plural-3.0.6 => make-plural}/LICENSE (79%)
 create mode 100644 doc/licenses/make-plural/dep-coordinates.txt
 delete mode 100644 doc/licenses/messageformat-1.0.2/README
 delete mode 100644 doc/licenses/messageformat-1.0.2/dep-coordinates.txt
 delete mode 100644 doc/licenses/messageformat-parser-1.1.0/README
 delete mode 100644 doc/licenses/messageformat-parser-1.1.0/dep-coordinates.txt
 rename doc/licenses/{messageformat-1.0.2 => messageformat-parser}/LICENSE (84%)
 create mode 100644 doc/licenses/messageformat-parser/dep-coordinates.txt
 rename doc/licenses/{messageformat-parser-1.1.0 => messageformat}/LICENSE (84%)
 create mode 100644 doc/licenses/messageformat/dep-coordinates.txt
 delete mode 100644 doc/licenses/mybatis-3.5.19/README
 delete mode 100644 doc/licenses/mybatis-3.5.19/dep-coordinates.txt
 delete mode 100644 doc/licenses/mybatis-guice-3.18/README
 delete mode 100644 doc/licenses/mybatis-guice-3.18/dep-coordinates.txt
 rename doc/licenses/{mybatis-guice-3.18 => mybatis-guice}/NOTICE (64%)
 create mode 100644 doc/licenses/mybatis-guice/dep-coordinates.txt
 rename doc/licenses/{mybatis-3.5.19 => mybatis}/NOTICE (91%)
 create mode 100644 doc/licenses/mybatis/dep-coordinates.txt
 delete mode 100644 doc/licenses/object-assign-4.1.1/README
 delete mode 100644 doc/licenses/object-assign-4.1.1/dep-coordinates.txt
 rename doc/licenses/{object-assign-4.1.1 => object-assign}/LICENSE (83%)
 create mode 100644 doc/licenses/object-assign/dep-coordinates.txt
 delete mode 100644 doc/licenses/okhttp-4.12.0/README
 delete mode 100644 doc/licenses/okhttp-4.12.0/dep-coordinates.txt
 rename doc/licenses/{okhttp-4.12.0 => okhttp}/NOTICE (76%)
 create mode 100644 doc/licenses/okhttp/dep-coordinates.txt
 delete mode 100644 doc/licenses/okio-3.6.0/README
 delete mode 100644 doc/licenses/okio-3.6.0/dep-coordinates.txt
 rename doc/licenses/{okio-3.6.0 => okio}/NOTICE (77%)
 create mode 100644 doc/licenses/okio/dep-coordinates.txt
 delete mode 100644 doc/licenses/osgi-resource-locator-1.0.3/README
 delete mode 100644 doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt
 rename doc/licenses/{osgi-resource-locator-1.0.3 => osgi-resource-locator}/LICENSE.md (97%)
 create mode 100644 doc/licenses/osgi-resource-locator/dep-coordinates.txt
 delete mode 100644 doc/licenses/pickr-1.8.2/README
 delete mode 100644 doc/licenses/pickr-1.8.2/dep-coordinates.txt
 rename doc/licenses/{pickr-1.8.2 => pickr}/LICENSE (84%)
 create mode 100644 doc/licenses/pickr/dep-coordinates.txt
 delete mode 100644 doc/licenses/process-0.11.10/README
 delete mode 100644 doc/licenses/process-0.11.10/dep-coordinates.txt
 delete mode 100644 doc/licenses/process-nextick-args-2.0.1/README
 delete mode 100644 doc/licenses/process-nextick-args-2.0.1/dep-coordinates.txt
 create mode 100644 doc/licenses/process-nextick-args/dep-coordinates.txt
 rename doc/licenses/{process-nextick-args-2.0.1 => process-nextick-args}/license.md (82%)
 rename doc/licenses/{process-0.11.10 => process}/LICENSE (83%)
 create mode 100644 doc/licenses/process/dep-coordinates.txt
 delete mode 100644 doc/licenses/readable-stream-2.3.7/README
 delete mode 100644 doc/licenses/readable-stream-2.3.7/dep-coordinates.txt
 rename doc/licenses/{readable-stream-2.3.7 => readable-stream}/LICENSE (91%)
 create mode 100644 doc/licenses/readable-stream/dep-coordinates.txt
 delete mode 100644 doc/licenses/reserved-words-0.1.2/README
 delete mode 100644 doc/licenses/reserved-words-0.1.2/dep-coordinates.txt
 rename doc/licenses/{reserved-words-0.1.2 => reserved-words}/LICENSE (84%)
 create mode 100644 doc/licenses/reserved-words/dep-coordinates.txt
 delete mode 100644 doc/licenses/retrofit-2.11.0/README
 delete mode 100644 doc/licenses/retrofit-2.11.0/dep-coordinates.txt
 rename doc/licenses/{retrofit-2.11.0 => retrofit}/NOTICE (76%)
 create mode 100644 doc/licenses/retrofit/dep-coordinates.txt
 delete mode 100644 doc/licenses/safe-buffer-5.1.2/README
 delete mode 100644 doc/licenses/safe-buffer-5.1.2/dep-coordinates.txt
 rename doc/licenses/{safe-buffer-5.1.2 => safe-buffer}/LICENSE (83%)
 create mode 100644 doc/licenses/safe-buffer/dep-coordinates.txt
 delete mode 100644 doc/licenses/setimmediate-1.0.5/README
 delete mode 100644 doc/licenses/setimmediate-1.0.5/dep-coordinates.txt
 rename doc/licenses/{setimmediate-1.0.5 => setimmediate}/LICENSE.txt (82%)
 create mode 100644 doc/licenses/setimmediate/dep-coordinates.txt
 delete mode 100644 doc/licenses/slf4j-api-2.0.17/README
 delete mode 100644 doc/licenses/slf4j-api-2.0.17/dep-coordinates.txt
 rename doc/licenses/{slf4j-api-2.0.17 => slf4j-api}/LICENSE.txt (86%)
 create mode 100644 doc/licenses/slf4j-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/snakeyaml-2.4/README
 delete mode 100644 doc/licenses/snakeyaml-2.4/dep-coordinates.txt
 create mode 100644 doc/licenses/snakeyaml/LICENSE
 create mode 100644 doc/licenses/snakeyaml/dep-coordinates.txt
 delete mode 100644 doc/licenses/spring-framework-3.0.5/README
 delete mode 100644 doc/licenses/spring-framework-3.0.5/dep-coordinates.txt
 create mode 100644 doc/licenses/spring-framework/LICENSE
 create mode 100644 doc/licenses/spring-framework/dep-coordinates.txt
 delete mode 100644 doc/licenses/stream-browserify-2.0.2/README
 delete mode 100644 doc/licenses/stream-browserify-2.0.2/dep-coordinates.txt
 rename doc/licenses/{stream-browserify-2.0.2 => stream-browserify}/LICENSE (84%)
 create mode 100644 doc/licenses/stream-browserify/dep-coordinates.txt
 delete mode 100644 doc/licenses/string_decoder-1.1.1/README
 delete mode 100644 doc/licenses/string_decoder-1.1.1/dep-coordinates.txt
 rename doc/licenses/{string_decoder-1.1.1 => string_decoder}/LICENSE (91%)
 create mode 100644 doc/licenses/string_decoder/dep-coordinates.txt
 delete mode 100644 doc/licenses/timers-browserify-2.0.12/README
 delete mode 100644 doc/licenses/timers-browserify-2.0.12/dep-coordinates.txt
 rename doc/licenses/{timers-browserify-2.0.12 => timers-browserify}/LICENSE.md (85%)
 create mode 100644 doc/licenses/timers-browserify/dep-coordinates.txt
 delete mode 100644 doc/licenses/util-0.11.1/README
 delete mode 100644 doc/licenses/util-0.11.1/dep-coordinates.txt
 delete mode 100644 doc/licenses/util-deprecate-1.0.2/README
 delete mode 100644 doc/licenses/util-deprecate-1.0.2/dep-coordinates.txt
 rename doc/licenses/{util-deprecate-1.0.2 => util-deprecate}/LICENSE (83%)
 create mode 100644 doc/licenses/util-deprecate/dep-coordinates.txt
 rename doc/licenses/{assert-1.5.0 => util}/LICENSE (84%)
 create mode 100644 doc/licenses/util/dep-coordinates.txt
 delete mode 100644 doc/licenses/webpack-4.47.0/README
 delete mode 100644 doc/licenses/webpack-4.47.0/dep-coordinates.txt
 rename doc/licenses/{webpack-4.47.0 => webpack}/LICENSE (85%)
 create mode 100644 doc/licenses/webpack/dep-coordinates.txt
 delete mode 100644 doc/licenses/woodstox-core-5.4.0/README
 delete mode 100644 doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
 create mode 100644 doc/licenses/woodstox-core/LICENSE
 create mode 100644 doc/licenses/woodstox-core/dep-coordinates.txt
 delete mode 100644 doc/licenses/woodstox-stax2-api-4.2/README
 delete mode 100644 doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
 rename doc/licenses/{woodstox-stax2-api-4.2 => woodstox-stax2-api}/LICENSE (85%)
 create mode 100644 doc/licenses/woodstox-stax2-api/dep-coordinates.txt
 delete mode 100644 doc/licenses/xpp3-1.1.4c/README
 rename doc/licenses/{xpp3-1.1.4c => xpp3}/LICENSE.txt (87%)
 rename doc/licenses/{xpp3-1.1.4c => xpp3}/NOTICE (67%)
 rename doc/licenses/{xpp3-1.1.4c => xpp3}/dep-coordinates.txt (82%)
 delete mode 100644 doc/licenses/zxing-3.5.3/NOTICE
 delete mode 100644 doc/licenses/zxing-3.5.3/README
 delete mode 100644 doc/licenses/zxing-3.5.3/dep-coordinates.txt
 rename doc/licenses/{zxing-3.5.3 => zxing}/AUTHORS (97%)
 create mode 100644 doc/licenses/zxing/NOTICE
 create mode 100644 doc/licenses/zxing/dep-coordinates.txt
 delete mode 100644 extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/README
 delete mode 100644 guacamole/src/licenses/bundled/angular-module-shim-0.0.4/README
 rename guacamole/src/licenses/bundled/{angular-module-shim-0.0.4 => angular-module-shim}/LICENSE (80%)
 delete mode 100644 guacamole/src/licenses/bundled/carlito/README
 delete mode 100644 guacamole/src/licenses/bundled/glyptodon-enterprise-player/README

diff --git a/doc/licenses/angular-1.8.3/README b/doc/licenses/angular-1.8.3/README
deleted file mode 100644
index 33c781d4e..000000000
--- a/doc/licenses/angular-1.8.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-AngularJS (https://angularjs.org/)
-----------------------------------
-
-    Version: 1.8.3
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        MIT (bundled/angular-1.8.3/LICENSE)
-
diff --git a/doc/licenses/angular-1.8.3/dep-coordinates.txt b/doc/licenses/angular-1.8.3/dep-coordinates.txt
deleted file mode 100644
index 479f6db01..000000000
--- a/doc/licenses/angular-1.8.3/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-angular-route:1.8.3
-angular:1.8.3
diff --git a/doc/licenses/angular-translate-2.19.1/README b/doc/licenses/angular-translate-2.19.1/README
deleted file mode 100644
index 20d161f0d..000000000
--- a/doc/licenses/angular-translate-2.19.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-angular-translate (https://angular-translate.github.io/)
---------------------------------------------------------
-
-    Version: 2.19.1
-    From: 'Pascal Precht' (https://github.com/PascalPrecht)
-    License(s):
-        MIT (bundled/angular-translate-2.19.1/LICENSE)
-
diff --git a/doc/licenses/angular-translate-2.19.1/dep-coordinates.txt b/doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
deleted file mode 100644
index 5626eebd6..000000000
--- a/doc/licenses/angular-translate-2.19.1/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-angular-translate-interpolation-messageformat:2.19.1
-angular-translate-loader-static-files:2.19.1
-angular-translate:2.19.1
diff --git a/doc/licenses/angular-translate-2.19.1/LICENSE b/doc/licenses/angular-translate/LICENSE
similarity index 83%
rename from doc/licenses/angular-translate-2.19.1/LICENSE
rename to doc/licenses/angular-translate/LICENSE
index 85a38881f..1b0f53a94 100644
--- a/doc/licenses/angular-translate-2.19.1/LICENSE
+++ b/doc/licenses/angular-translate/LICENSE
@@ -1,3 +1,9 @@
+# Name:    angular-translate
+# URL:     https://angular-translate.github.io/
+# From:    'Pascal Precht' (https://github.com/PascalPrecht)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) 2013-2017 The angular-translate team and Pascal Precht
@@ -18,4 +24,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/angular-translate/dep-coordinates.txt b/doc/licenses/angular-translate/dep-coordinates.txt
new file mode 100644
index 000000000..07ee24e83
--- /dev/null
+++ b/doc/licenses/angular-translate/dep-coordinates.txt
@@ -0,0 +1,3 @@
+angular-translate-interpolation-messageformat:*
+angular-translate-loader-static-files:*
+angular-translate:*
diff --git a/doc/licenses/angular-1.8.3/LICENSE b/doc/licenses/angular/LICENSE
similarity index 86%
rename from doc/licenses/angular-1.8.3/LICENSE
rename to doc/licenses/angular/LICENSE
index 9a4ce43c3..e8c19e2fe 100644
--- a/doc/licenses/angular-1.8.3/LICENSE
+++ b/doc/licenses/angular/LICENSE
@@ -1,3 +1,9 @@
+# Name:    AngularJS
+# URL:     https://angularjs.org/
+# From:    'Google Inc.' (http://www.google.com/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License
 
 Copyright (c) 2010-2020 Google LLC. http://angularjs.org
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/angular/dep-coordinates.txt b/doc/licenses/angular/dep-coordinates.txt
new file mode 100644
index 000000000..a73a76f42
--- /dev/null
+++ b/doc/licenses/angular/dep-coordinates.txt
@@ -0,0 +1,2 @@
+angular-route:*
+angular:*
diff --git a/doc/licenses/antlr-2.7.7/README b/doc/licenses/antlr-2.7.7/README
deleted file mode 100644
index da13a8218..000000000
--- a/doc/licenses/antlr-2.7.7/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Antlr v2 (https://www.antlr2.org/)
-----------------------------------
-
-    Version: 2.7.7
-    From: 'Terence Parr' (https://github.com/parrt)
-    License(s):
-        Public Domain (bundled/antlr-2.7.7/LICENSE.txt)
-
diff --git a/doc/licenses/antlr-2.7.7/LICENSE.txt b/doc/licenses/antlr/LICENSE.txt
similarity index 85%
rename from doc/licenses/antlr-2.7.7/LICENSE.txt
rename to doc/licenses/antlr/LICENSE.txt
index d62cc1ab2..dd6a03063 100644
--- a/doc/licenses/antlr-2.7.7/LICENSE.txt
+++ b/doc/licenses/antlr/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    Antlr v2
+# URL:     https://www.antlr2.org/
+# From:    'Terence Parr' (https://github.com/parrt)
+# License: Public Domain 
+#
+# --- BEGIN LICENSE FILE ---
 
 SOFTWARE RIGHTS
 
@@ -29,3 +35,4 @@ The primary ANTLR guy:
 Terence Parr
 parrt@cs.usfca.edu
 parrt@antlr.org
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/antlr-2.7.7/dep-coordinates.txt b/doc/licenses/antlr/dep-coordinates.txt
similarity index 82%
rename from doc/licenses/antlr-2.7.7/dep-coordinates.txt
rename to doc/licenses/antlr/dep-coordinates.txt
index 774271f68..6416eac2d 100644
--- a/doc/licenses/antlr-2.7.7/dep-coordinates.txt
+++ b/doc/licenses/antlr/dep-coordinates.txt
@@ -1 +1 @@
-org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:jar:2.7.7_5
+org.apache.servicemix.bundles:org.apache.servicemix.bundles.antlr:jar:*
diff --git a/doc/licenses/aopalliance-1.0/LICENSE b/doc/licenses/aopalliance-1.0/LICENSE
deleted file mode 100644
index 8e0e3786b..000000000
--- a/doc/licenses/aopalliance-1.0/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-From http://aopalliance.sourceforge.net/:
-
-    LICENCE: all the source code provided by AOP Alliance is Public Domain.
-
diff --git a/doc/licenses/aopalliance-1.0/README b/doc/licenses/aopalliance-1.0/README
deleted file mode 100644
index c201fa858..000000000
--- a/doc/licenses/aopalliance-1.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-AOP Alliance (http://aopalliance.sourceforge.net/)
---------------------------------------------------
-
-    Version: 1.0
-    From: 'AOP Alliance' (http://aopalliance.sourceforge.net/members.html)
-    License(s):
-        Public Domain (bundled/aopalliance-1.0/LICENSE)
-
diff --git a/doc/licenses/aopalliance-1.0/dep-coordinates.txt b/doc/licenses/aopalliance-1.0/dep-coordinates.txt
deleted file mode 100644
index a71b4a4ce..000000000
--- a/doc/licenses/aopalliance-1.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-aopalliance:aopalliance:jar:1.0
diff --git a/doc/licenses/aopalliance/LICENSE b/doc/licenses/aopalliance/LICENSE
new file mode 100644
index 000000000..bfca1d683
--- /dev/null
+++ b/doc/licenses/aopalliance/LICENSE
@@ -0,0 +1,8 @@
+# Name:    AOP Alliance
+# URL:     http://aopalliance.sourceforge.net/
+# From:    'AOP Alliance' (http://aopalliance.sourceforge.net/members.html)
+# License: Public Domain 
+#
+# --- BEGIN LICENSE FILE ---
+LICENCE: all the source code provided by AOP Alliance is Public Domain.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/aopalliance/dep-coordinates.txt b/doc/licenses/aopalliance/dep-coordinates.txt
new file mode 100644
index 000000000..14f2fa986
--- /dev/null
+++ b/doc/licenses/aopalliance/dep-coordinates.txt
@@ -0,0 +1 @@
+aopalliance:aopalliance:jar:*
diff --git a/doc/licenses/apache-commons-1.16.0/NOTICE b/doc/licenses/apache-commons-1.16.0/NOTICE
deleted file mode 100644
index 639cd1fb3..000000000
--- a/doc/licenses/apache-commons-1.16.0/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-1.16.0/README b/doc/licenses/apache-commons-1.16.0/README
deleted file mode 100644
index 3a59af752..000000000
--- a/doc/licenses/apache-commons-1.16.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
------------------------------------------------------------------------
-
-    Version: 1.16.0
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt
deleted file mode 100644
index 9d5153d43..000000000
--- a/doc/licenses/apache-commons-1.16.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-codec:commons-codec:jar:1.16.0
diff --git a/doc/licenses/apache-commons-1.17.1/NOTICE b/doc/licenses/apache-commons-1.17.1/NOTICE
deleted file mode 100644
index e6d6ef34a..000000000
--- a/doc/licenses/apache-commons-1.17.1/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2024 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-1.17.1/README b/doc/licenses/apache-commons-1.17.1/README
deleted file mode 100644
index 7abb268f2..000000000
--- a/doc/licenses/apache-commons-1.17.1/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
------------------------------------------------------------------------
-
-    Version: 1.17.1
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/apache-commons-1.17.1/dep-coordinates.txt b/doc/licenses/apache-commons-1.17.1/dep-coordinates.txt
deleted file mode 100644
index 4cffe479c..000000000
--- a/doc/licenses/apache-commons-1.17.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-codec:commons-codec:jar:1.17.1
diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/NOTICE b/doc/licenses/apache-commons-beanutils-1.7.0/NOTICE
deleted file mode 100644
index 3f59805ce..000000000
--- a/doc/licenses/apache-commons-beanutils-1.7.0/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/README b/doc/licenses/apache-commons-beanutils-1.7.0/README
deleted file mode 100644
index e5397657f..000000000
--- a/doc/licenses/apache-commons-beanutils-1.7.0/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons BeanUtils
-(http://commons.apache.org/proper/commons-beanutils/)
------------------------------------------------------
-
-    Version: 1.7.0
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt b/doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt
deleted file mode 100644
index 3a5903c5c..000000000
--- a/doc/licenses/apache-commons-beanutils-1.7.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-commons-beanutils:commons-beanutils-core:jar:1.7.0
-commons-beanutils:commons-beanutils:jar:1.7.0
diff --git a/doc/licenses/apache-commons-beanutils/NOTICE b/doc/licenses/apache-commons-beanutils/NOTICE
new file mode 100644
index 000000000..981566e22
--- /dev/null
+++ b/doc/licenses/apache-commons-beanutils/NOTICE
@@ -0,0 +1,9 @@
+# Name:    Apache Commons BeanUtils
+# URL:     http://commons.apache.org/proper/commons-beanutils/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-beanutils/dep-coordinates.txt b/doc/licenses/apache-commons-beanutils/dep-coordinates.txt
new file mode 100644
index 000000000..a9de163b5
--- /dev/null
+++ b/doc/licenses/apache-commons-beanutils/dep-coordinates.txt
@@ -0,0 +1,2 @@
+commons-beanutils:commons-beanutils-core:jar:*
+commons-beanutils:commons-beanutils:jar:*
diff --git a/doc/licenses/apache-commons-chain-1.2/NOTICE b/doc/licenses/apache-commons-chain-1.2/NOTICE
deleted file mode 100644
index 5f13f1e83..000000000
--- a/doc/licenses/apache-commons-chain-1.2/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Chain
-Copyright 2003-2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-chain-1.2/README b/doc/licenses/apache-commons-chain-1.2/README
deleted file mode 100644
index 50c81fc54..000000000
--- a/doc/licenses/apache-commons-chain-1.2/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Chain
-(http://commons.apache.org/proper/commons-chain/)
--------------------------------------------------
-
-    Version: 1.2
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt b/doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt
deleted file mode 100644
index c3c7127bf..000000000
--- a/doc/licenses/apache-commons-chain-1.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-chain:commons-chain:jar:1.2
diff --git a/doc/licenses/apache-commons-chain/NOTICE b/doc/licenses/apache-commons-chain/NOTICE
new file mode 100644
index 000000000..8e90afd59
--- /dev/null
+++ b/doc/licenses/apache-commons-chain/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Commons Chain
+# URL:     http://commons.apache.org/proper/commons-chain/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Commons Chain
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-chain/dep-coordinates.txt b/doc/licenses/apache-commons-chain/dep-coordinates.txt
new file mode 100644
index 000000000..4495b0b2d
--- /dev/null
+++ b/doc/licenses/apache-commons-chain/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-chain:commons-chain:jar:*
diff --git a/doc/licenses/apache-commons-codec-1.11/NOTICE b/doc/licenses/apache-commons-codec-1.11/NOTICE
deleted file mode 100644
index 9899d2108..000000000
--- a/doc/licenses/apache-commons-codec-1.11/NOTICE
+++ /dev/null
@@ -1,17 +0,0 @@
-Apache Commons Codec
-Copyright 2002-2020 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
diff --git a/doc/licenses/apache-commons-codec-1.11/README b/doc/licenses/apache-commons-codec-1.11/README
deleted file mode 100644
index 1c9959a73..000000000
--- a/doc/licenses/apache-commons-codec-1.11/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
------------------------------------------------------------------------
-
-    Version: 1.11
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-codec-1.11/dep-coordinates.txt b/doc/licenses/apache-commons-codec-1.11/dep-coordinates.txt
deleted file mode 100644
index 6eaa2d04e..000000000
--- a/doc/licenses/apache-commons-codec-1.11/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-codec:commons-codec:jar:1.11
\ No newline at end of file
diff --git a/doc/licenses/apache-commons-codec/NOTICE b/doc/licenses/apache-commons-codec/NOTICE
new file mode 100644
index 000000000..06de62068
--- /dev/null
+++ b/doc/licenses/apache-commons-codec/NOTICE
@@ -0,0 +1,38 @@
+# Name:    Apache Commons Codec
+# URL:     http://commons.apache.org/proper/commons-codec/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE [1.11] ---
+Apache Commons Codec
+Copyright 2002-2020 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+contains test data from http://aspell.net/test/orig/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
+
+===============================================================================
+
+The content of package org.apache.commons.codec.language.bm has been translated
+from the original php source code available at http://stevemorse.org/phoneticinfo.htm
+with permission from the original authors.
+Original source copyright:
+Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
+# --- END LICENSE FILE [1.11] ---
+# --- BEGIN LICENSE FILE [1.16.0] ---
+Apache Commons Codec
+Copyright 2002-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE [1.16.0] ---
+# --- BEGIN LICENSE FILE [1.17.1] ---
+Apache Commons Codec
+Copyright 2002-2024 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE [1.17.1] ---
diff --git a/doc/licenses/apache-commons-codec/dep-coordinates.txt b/doc/licenses/apache-commons-codec/dep-coordinates.txt
new file mode 100644
index 000000000..0e61c8fb3
--- /dev/null
+++ b/doc/licenses/apache-commons-codec/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-codec:commons-codec:jar:*
\ No newline at end of file
diff --git a/doc/licenses/apache-commons-collections-3.2.2/NOTICE b/doc/licenses/apache-commons-collections-3.2.2/NOTICE
deleted file mode 100644
index 3f59805ce..000000000
--- a/doc/licenses/apache-commons-collections-3.2.2/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-collections-3.2.2/README b/doc/licenses/apache-commons-collections-3.2.2/README
deleted file mode 100644
index 3274230d8..000000000
--- a/doc/licenses/apache-commons-collections-3.2.2/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Collections
-(http://commons.apache.org/proper/commons-collections/)
--------------------------------------------------------
-
-    Version: 3.2.2
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-collections-3.2.2/dep-coordinates.txt b/doc/licenses/apache-commons-collections-3.2.2/dep-coordinates.txt
deleted file mode 100644
index 2daf6e603..000000000
--- a/doc/licenses/apache-commons-collections-3.2.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-collections:commons-collections:jar:3.2.2
diff --git a/doc/licenses/apache-commons-collections-4.4/NOTICE b/doc/licenses/apache-commons-collections-4.4/NOTICE
deleted file mode 100644
index 8b11c65ae..000000000
--- a/doc/licenses/apache-commons-collections-4.4/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Collections
-Copyright 2001-2019 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-collections-4.4/README b/doc/licenses/apache-commons-collections-4.4/README
deleted file mode 100644
index 929d3e339..000000000
--- a/doc/licenses/apache-commons-collections-4.4/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Collections
-(http://commons.apache.org/proper/commons-collections/)
--------------------------------------------------------
-
-    Version: 4.4
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt b/doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt
deleted file mode 100644
index 4e26938a5..000000000
--- a/doc/licenses/apache-commons-collections-4.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons:commons-collections4:jar:4.4
diff --git a/doc/licenses/apache-commons-collections/NOTICE b/doc/licenses/apache-commons-collections/NOTICE
new file mode 100644
index 000000000..4a548261e
--- /dev/null
+++ b/doc/licenses/apache-commons-collections/NOTICE
@@ -0,0 +1,16 @@
+# Name:    Apache Commons Collections
+# URL:     http://commons.apache.org/proper/commons-collections/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE [3.2.2] ---
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE [3.2.2] ---
+# --- BEGIN LICENSE FILE [4.4] ---
+Apache Commons Collections
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE [4.4] ---
diff --git a/doc/licenses/apache-commons-collections/dep-coordinates.txt b/doc/licenses/apache-commons-collections/dep-coordinates.txt
new file mode 100644
index 000000000..3f176c4ab
--- /dev/null
+++ b/doc/licenses/apache-commons-collections/dep-coordinates.txt
@@ -0,0 +1,2 @@
+commons-collections:commons-collections:jar:*
+org.apache.commons:commons-collections4:jar:*
diff --git a/doc/licenses/apache-commons-configuration-1.5/NOTICE b/doc/licenses/apache-commons-configuration-1.5/NOTICE
deleted file mode 100644
index 9a8ddbc32..000000000
--- a/doc/licenses/apache-commons-configuration-1.5/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Configuration
-Copyright 2001-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-configuration-1.5/README b/doc/licenses/apache-commons-configuration-1.5/README
deleted file mode 100644
index 96f1af03b..000000000
--- a/doc/licenses/apache-commons-configuration-1.5/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Configuration
-(http://commons.apache.org/proper/commons-configuration/)
----------------------------------------------------------
-
-    Version: 1.5
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt b/doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt
deleted file mode 100644
index 711e0462e..000000000
--- a/doc/licenses/apache-commons-configuration-1.5/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-configuration:commons-configuration:jar:1.5
diff --git a/doc/licenses/apache-commons-configuration/NOTICE b/doc/licenses/apache-commons-configuration/NOTICE
new file mode 100644
index 000000000..4b67274c3
--- /dev/null
+++ b/doc/licenses/apache-commons-configuration/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Commons Configuration
+# URL:     http://commons.apache.org/proper/commons-configuration/)
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Commons Configuration
+Copyright 2001-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-configuration/dep-coordinates.txt b/doc/licenses/apache-commons-configuration/dep-coordinates.txt
new file mode 100644
index 000000000..b2cc327c6
--- /dev/null
+++ b/doc/licenses/apache-commons-configuration/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-configuration:commons-configuration:jar:*
diff --git a/doc/licenses/apache-commons-digester-1.8/NOTICE b/doc/licenses/apache-commons-digester-1.8/NOTICE
deleted file mode 100644
index c5585462c..000000000
--- a/doc/licenses/apache-commons-digester-1.8/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Jakarta Commons Digester
-Copyright 2001-2006 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-digester-1.8/README b/doc/licenses/apache-commons-digester-1.8/README
deleted file mode 100644
index 9c5e0bee9..000000000
--- a/doc/licenses/apache-commons-digester-1.8/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Digester
-(http://commons.apache.org/proper/commons-digester/)
-----------------------------------------------------
-
-    Version: 1.8
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt b/doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt
deleted file mode 100644
index eed4216bd..000000000
--- a/doc/licenses/apache-commons-digester-1.8/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-digester:commons-digester:jar:1.8
diff --git a/doc/licenses/apache-commons-digester/NOTICE b/doc/licenses/apache-commons-digester/NOTICE
new file mode 100644
index 000000000..678fe5b20
--- /dev/null
+++ b/doc/licenses/apache-commons-digester/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Commons Digester
+# URL:     http://commons.apache.org/proper/commons-digester/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Jakarta Commons Digester
+Copyright 2001-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-digester/dep-coordinates.txt b/doc/licenses/apache-commons-digester/dep-coordinates.txt
new file mode 100644
index 000000000..8e3698d4a
--- /dev/null
+++ b/doc/licenses/apache-commons-digester/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-digester:commons-digester:jar:*
diff --git a/doc/licenses/apache-commons-lang-2.3/NOTICE b/doc/licenses/apache-commons-lang-2.3/NOTICE
deleted file mode 100644
index c02268ff8..000000000
--- a/doc/licenses/apache-commons-lang-2.3/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Jakarta Commons Lang
-Copyright 2001-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-commons-lang-2.3/README b/doc/licenses/apache-commons-lang-2.3/README
deleted file mode 100644
index 98aca677f..000000000
--- a/doc/licenses/apache-commons-lang-2.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Lang (http://commons.apache.org/proper/commons-lang/)
---------------------------------------------------------------------
-
-    Version: 2.3
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt b/doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt
deleted file mode 100644
index 0dd7a3900..000000000
--- a/doc/licenses/apache-commons-lang-2.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-lang:commons-lang:jar:2.3
diff --git a/doc/licenses/apache-commons-lang-3.17.0/NOTICE b/doc/licenses/apache-commons-lang-3.17.0/NOTICE
deleted file mode 100644
index 307ec45cf..000000000
--- a/doc/licenses/apache-commons-lang-3.17.0/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Lang
-Copyright 2001-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-lang-3.17.0/README b/doc/licenses/apache-commons-lang-3.17.0/README
deleted file mode 100644
index a76f1d948..000000000
--- a/doc/licenses/apache-commons-lang-3.17.0/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Commons Lang (http://commons.apache.org/proper/commons-lang/)
---------------------------------------------------------------------
-
-    Version: 3.17.0
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/apache-commons-lang-3.17.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.17.0/dep-coordinates.txt
deleted file mode 100644
index 7f6ac3b8b..000000000
--- a/doc/licenses/apache-commons-lang-3.17.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons:commons-lang3:jar:3.17.0
diff --git a/doc/licenses/apache-commons-lang/NOTICE b/doc/licenses/apache-commons-lang/NOTICE
new file mode 100644
index 000000000..501ff11f3
--- /dev/null
+++ b/doc/licenses/apache-commons-lang/NOTICE
@@ -0,0 +1,19 @@
+# Name:    Apache Commons Lang
+# URL:     http://commons.apache.org/proper/commons-lang/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE [2.3] ---
+Apache Jakarta Commons Lang
+Copyright 2001-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE [2.3] ---
+# --- BEGIN LICENSE FILE [3.17.0] ---
+Apache Commons Lang
+Copyright 2001-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE [3.17.0] ---
diff --git a/doc/licenses/apache-commons-lang/dep-coordinates.txt b/doc/licenses/apache-commons-lang/dep-coordinates.txt
new file mode 100644
index 000000000..9016a3703
--- /dev/null
+++ b/doc/licenses/apache-commons-lang/dep-coordinates.txt
@@ -0,0 +1,2 @@
+commons-lang:commons-lang:jar:*
+org.apache.commons:commons-lang3:jar:*
diff --git a/doc/licenses/apache-commons-logging-1.2/NOTICE b/doc/licenses/apache-commons-logging-1.2/NOTICE
deleted file mode 100644
index 556bd0395..000000000
--- a/doc/licenses/apache-commons-logging-1.2/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Commons Logging
-Copyright 2003-2014 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/doc/licenses/apache-commons-logging-1.2/README b/doc/licenses/apache-commons-logging-1.2/README
deleted file mode 100644
index de1c3c005..000000000
--- a/doc/licenses/apache-commons-logging-1.2/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Apache Commons Logging 
-(http://commons.apache.org/proper/commons-logging/)
----------------------------------------------------
-
-    Version: 1.2
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-logging-1.2/dep-coordinates.txt b/doc/licenses/apache-commons-logging-1.2/dep-coordinates.txt
deleted file mode 100644
index d475f7c5c..000000000
--- a/doc/licenses/apache-commons-logging-1.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-logging:commons-logging:jar:1.2
diff --git a/doc/licenses/apache-commons-logging/NOTICE b/doc/licenses/apache-commons-logging/NOTICE
new file mode 100644
index 000000000..5d9426423
--- /dev/null
+++ b/doc/licenses/apache-commons-logging/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Commons Logging 
+# URL:     http://commons.apache.org/proper/commons-logging/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Commons Logging
+Copyright 2003-2014 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-logging/dep-coordinates.txt b/doc/licenses/apache-commons-logging/dep-coordinates.txt
new file mode 100644
index 000000000..a8796bb5d
--- /dev/null
+++ b/doc/licenses/apache-commons-logging/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-logging:commons-logging:jar:*
diff --git a/doc/licenses/apache-commons-pool-1.5.4/NOTICE b/doc/licenses/apache-commons-pool-1.5.4/NOTICE
deleted file mode 100644
index 27a64ec7a..000000000
--- a/doc/licenses/apache-commons-pool-1.5.4/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Commons Pool
-Copyright 1999-2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
- APACHE COMMONS POOL DERIVATIVE WORKS:
-   
-   The LinkedBlockingDeque implementation is based on an implementation written by
-   Doug Lea with assistance from members of JCP JSR-166 Expert Group and released
-   to the public domain, as explained at
-   http://creativecommons.org/licenses/publicdomain
diff --git a/doc/licenses/apache-commons-pool-1.5.4/README b/doc/licenses/apache-commons-pool-1.5.4/README
deleted file mode 100644
index 54d7fd746..000000000
--- a/doc/licenses/apache-commons-pool-1.5.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Pool (http://commons.apache.org/proper/commons-pool/)
---------------------------------------------------------------------
-
-    Version: 1.5.4
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt b/doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt
deleted file mode 100644
index 6b185bc29..000000000
--- a/doc/licenses/apache-commons-pool-1.5.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-commons-pool:commons-pool:jar:1.5.4
diff --git a/doc/licenses/apache-commons-pool-2.12.0/NOTICE b/doc/licenses/apache-commons-pool-2.12.0/NOTICE
deleted file mode 100644
index 2c90b4379..000000000
--- a/doc/licenses/apache-commons-pool-2.12.0/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Pool
-Copyright 2001-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-pool-2.12.0/README b/doc/licenses/apache-commons-pool-2.12.0/README
deleted file mode 100644
index 18db98e00..000000000
--- a/doc/licenses/apache-commons-pool-2.12.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Commons Pool (http://commons.apache.org/proper/commons-pool/)
---------------------------------------------------------------------
-
-    Version: 2.12.0
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt
deleted file mode 100644
index 07edda244..000000000
--- a/doc/licenses/apache-commons-pool-2.12.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons:commons-pool2:jar:2.12.0
diff --git a/doc/licenses/apache-commons-pool/NOTICE b/doc/licenses/apache-commons-pool/NOTICE
new file mode 100644
index 000000000..4fa44ecd0
--- /dev/null
+++ b/doc/licenses/apache-commons-pool/NOTICE
@@ -0,0 +1,26 @@
+# Name:    Apache Commons Pool
+# URL:     http://commons.apache.org/proper/commons-pool/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE [1.5.4] ---
+Apache Commons Pool
+Copyright 1999-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+ APACHE COMMONS POOL DERIVATIVE WORKS:
+   
+   The LinkedBlockingDeque implementation is based on an implementation written by
+   Doug Lea with assistance from members of JCP JSR-166 Expert Group and released
+   to the public domain, as explained at
+   http://creativecommons.org/licenses/publicdomain
+# --- END LICENSE FILE [1.5.4] ---
+# --- BEGIN LICENSE FILE [2.12.0] ---
+Apache Commons Pool
+Copyright 2001-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE [2.12.0] ---
diff --git a/doc/licenses/apache-commons-pool/dep-coordinates.txt b/doc/licenses/apache-commons-pool/dep-coordinates.txt
new file mode 100644
index 000000000..452f44860
--- /dev/null
+++ b/doc/licenses/apache-commons-pool/dep-coordinates.txt
@@ -0,0 +1,2 @@
+commons-pool:commons-pool:jar:*
+org.apache.commons:commons-pool2:jar:*
diff --git a/doc/licenses/apache-commons-text-1.12.0/NOTICE.txt b/doc/licenses/apache-commons-text-1.12.0/NOTICE.txt
deleted file mode 100644
index a4c26c8b7..000000000
--- a/doc/licenses/apache-commons-text-1.12.0/NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons Text
-Copyright 2014-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/apache-commons-text-1.12.0/README b/doc/licenses/apache-commons-text-1.12.0/README
deleted file mode 100644
index 1353cfb69..000000000
--- a/doc/licenses/apache-commons-text-1.12.0/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Commons Text (https://commons.apache.org/proper/commons-text/)
----------------------------------------------------------------------
-
-    Version: 1.12.0
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt
deleted file mode 100644
index 94c23bce4..000000000
--- a/doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.commons:commons-text:jar:1.12.0
diff --git a/doc/licenses/apache-commons-text/NOTICE.txt b/doc/licenses/apache-commons-text/NOTICE.txt
new file mode 100644
index 000000000..b687d8072
--- /dev/null
+++ b/doc/licenses/apache-commons-text/NOTICE.txt
@@ -0,0 +1,12 @@
+# Name:    Apache Commons Text
+# URL:     https://commons.apache.org/proper/commons-text/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Commons Text
+Copyright 2014-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-commons-text/dep-coordinates.txt b/doc/licenses/apache-commons-text/dep-coordinates.txt
new file mode 100644
index 000000000..763a6b392
--- /dev/null
+++ b/doc/licenses/apache-commons-text/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.commons:commons-text:jar:*
diff --git a/doc/licenses/apache-directory-api/NOTICE b/doc/licenses/apache-directory-api/NOTICE
new file mode 100644
index 000000000..bd0ad5039
--- /dev/null
+++ b/doc/licenses/apache-directory-api/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Directory LDAP API
+# URL:     http://directory.apache.org
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache Directory LDAP API
+Copyright 2003-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-directory-api/dep-coordinates.txt b/doc/licenses/apache-directory-api/dep-coordinates.txt
new file mode 100644
index 000000000..83724aa56
--- /dev/null
+++ b/doc/licenses/apache-directory-api/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.directory.api:api-all:jar:*
diff --git a/doc/licenses/apache-mina-2.2.4/NOTICE b/doc/licenses/apache-mina-2.2.4/NOTICE
deleted file mode 100644
index 8bbb45551..000000000
--- a/doc/licenses/apache-mina-2.2.4/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache MINA
-Copyright 2007-2023 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-mina-2.2.4/README b/doc/licenses/apache-mina-2.2.4/README
deleted file mode 100644
index 5c2d8b31a..000000000
--- a/doc/licenses/apache-mina-2.2.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Mina (https://mina.apache.org/)
---------------------------------------
-
-    Version: 2.2.4
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt
deleted file mode 100644
index f61bc9a2c..000000000
--- a/doc/licenses/apache-mina-2.2.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.mina:mina-core:jar:2.2.4
diff --git a/doc/licenses/apache-mina/NOTICE b/doc/licenses/apache-mina/NOTICE
new file mode 100644
index 000000000..cfcc893d1
--- /dev/null
+++ b/doc/licenses/apache-mina/NOTICE
@@ -0,0 +1,12 @@
+# Name:    Apache Mina
+# URL:     https://mina.apache.org/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Apache MINA
+Copyright 2007-2023 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-mina/dep-coordinates.txt b/doc/licenses/apache-mina/dep-coordinates.txt
new file mode 100644
index 000000000..45940ab50
--- /dev/null
+++ b/doc/licenses/apache-mina/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.mina:mina-core:jar:*
diff --git a/doc/licenses/apache-santuario-2.2.6/README b/doc/licenses/apache-santuario-2.2.6/README
deleted file mode 100644
index 8ccae438d..000000000
--- a/doc/licenses/apache-santuario-2.2.6/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Santuario (https://santuario.apache.org/)
--------------------------------------------------
-
-    Version: 2.2.6
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
deleted file mode 100644
index 0a6929d5b..000000000
--- a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.santuario:xmlsec:jar:2.2.6
diff --git a/doc/licenses/apache-santuario-2.2.6/NOTICE b/doc/licenses/apache-santuario/NOTICE
similarity index 71%
rename from doc/licenses/apache-santuario-2.2.6/NOTICE
rename to doc/licenses/apache-santuario/NOTICE
index 2635c161a..37652853f 100644
--- a/doc/licenses/apache-santuario-2.2.6/NOTICE
+++ b/doc/licenses/apache-santuario/NOTICE
@@ -1,3 +1,9 @@
+# Name:    Apache Santuario
+# URL:     https://santuario.apache.org/
+# From:    'Apache Software Foundation' (https://www.apache.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Apache Santuario - XML Security for Java
 Copyright 1999-2022 The Apache Software Foundation
 
@@ -12,3 +18,4 @@ Commission in the <WebSig> project in the ISIS Programme.
 
 This product contains software that is
 copyright (c) 2021, Oracle and/or its affiliates.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/apache-santuario/dep-coordinates.txt b/doc/licenses/apache-santuario/dep-coordinates.txt
new file mode 100644
index 000000000..4ddfeb8bd
--- /dev/null
+++ b/doc/licenses/apache-santuario/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.santuario:xmlsec:jar:*
diff --git a/doc/licenses/assert-1.5.0/README b/doc/licenses/assert-1.5.0/README
deleted file mode 100644
index 9b986ae73..000000000
--- a/doc/licenses/assert-1.5.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-assert (https://github.com/browserify/commonjs-assert/)
--------------------------------------------------------
-
-    Version: 1.5.0
-    From: 'Joyent, Inc. and other Node contributors'
-    License(s):
-        MIT (bundled/assert-1.5.0/LICENSE)
-
diff --git a/doc/licenses/assert-1.5.0/dep-coordinates.txt b/doc/licenses/assert-1.5.0/dep-coordinates.txt
deleted file mode 100644
index d0bf923ae..000000000
--- a/doc/licenses/assert-1.5.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-assert:1.5.0
diff --git a/doc/licenses/util-0.11.1/LICENSE b/doc/licenses/assert/LICENSE
similarity index 84%
rename from doc/licenses/util-0.11.1/LICENSE
rename to doc/licenses/assert/LICENSE
index e3d4e695a..2c2547ff2 100644
--- a/doc/licenses/util-0.11.1/LICENSE
+++ b/doc/licenses/assert/LICENSE
@@ -1,3 +1,9 @@
+# Name:    assert
+# URL:     https://github.com/browserify/commonjs-assert/
+# From:    'Joyent, Inc. and other Node contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -16,3 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/assert/dep-coordinates.txt b/doc/licenses/assert/dep-coordinates.txt
new file mode 100644
index 000000000..7b3980c76
--- /dev/null
+++ b/doc/licenses/assert/dep-coordinates.txt
@@ -0,0 +1 @@
+assert:*
diff --git a/doc/licenses/base64-js-1.5.1/README b/doc/licenses/base64-js-1.5.1/README
deleted file mode 100644
index 6cacd8fc3..000000000
--- a/doc/licenses/base64-js-1.5.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-base64-js (https://github.com/beatgammit/base64-js)
----------------------------------------------
-
-    Version: 1.5.1
-    From: 'Jameson Little' (https://github.com/beatgammit/)
-    License(s):
-        MIT (bundled/base640-js-1.5.1/LICENSE)
-
diff --git a/doc/licenses/base64-js-1.5.1/dep-coordinates.txt b/doc/licenses/base64-js-1.5.1/dep-coordinates.txt
deleted file mode 100644
index 1d66ee817..000000000
--- a/doc/licenses/base64-js-1.5.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-base64-js:1.5.1
diff --git a/doc/licenses/base64-js-1.5.1/LICENSE b/doc/licenses/base64-js/LICENSE
similarity index 84%
rename from doc/licenses/base64-js-1.5.1/LICENSE
rename to doc/licenses/base64-js/LICENSE
index 9143d4cd6..406111427 100644
--- a/doc/licenses/base64-js-1.5.1/LICENSE
+++ b/doc/licenses/base64-js/LICENSE
@@ -1,3 +1,9 @@
+# Name:    base64-js
+# URL:     https://github.com/beatgammit/base64-js
+# From:    'Jameson Little' (https://github.com/beatgammit/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) 2014 Jameson Little
@@ -20,3 +26,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 Footer
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/base64-js/dep-coordinates.txt b/doc/licenses/base64-js/dep-coordinates.txt
new file mode 100644
index 000000000..c445f2543
--- /dev/null
+++ b/doc/licenses/base64-js/dep-coordinates.txt
@@ -0,0 +1 @@
+base64-js:*
diff --git a/doc/licenses/blob-polyfill-9.0.20240710/README b/doc/licenses/blob-polyfill-9.0.20240710/README
deleted file mode 100644
index e2f565e25..000000000
--- a/doc/licenses/blob-polyfill-9.0.20240710/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Blob.js (https://github.com/eligrey/Blob.js/)
----------------------------------------------
-
-    Version: 9.0.20240710
-    From: 'Eli Grey' (https://github.com/eligrey)
-    License(s):
-        MIT (bundled/blob-polyfill-9.0.20240710/LICENSE.md)
diff --git a/doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt b/doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt
deleted file mode 100644
index c4a3b1b4f..000000000
--- a/doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-blob-polyfill:9.0.20240710
diff --git a/doc/licenses/blob-polyfill-9.0.20240710/LICENSE.md b/doc/licenses/blob-polyfill/LICENSE.md
similarity index 85%
rename from doc/licenses/blob-polyfill-9.0.20240710/LICENSE.md
rename to doc/licenses/blob-polyfill/LICENSE.md
index daae0b08f..90104b470 100644
--- a/doc/licenses/blob-polyfill-9.0.20240710/LICENSE.md
+++ b/doc/licenses/blob-polyfill/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Blob.js
+# URL:     https://github.com/eligrey/Blob.js/
+# From:    'Eli Grey' (https://github.com/eligrey)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright © 2014 [Eli Grey][1].
 
 Permission is hereby granted, free of charge, to any person
@@ -23,3 +29,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 
   [1]: http://eligrey.com
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/blob-polyfill/dep-coordinates.txt b/doc/licenses/blob-polyfill/dep-coordinates.txt
new file mode 100644
index 000000000..48503828a
--- /dev/null
+++ b/doc/licenses/blob-polyfill/dep-coordinates.txt
@@ -0,0 +1 @@
+blob-polyfill:*
diff --git a/doc/licenses/bouncycastle-1.44/LICENSE b/doc/licenses/bouncycastle-1.44/LICENSE
deleted file mode 100644
index 15c29d98a..000000000
--- a/doc/licenses/bouncycastle-1.44/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/doc/licenses/bouncycastle-1.44/README b/doc/licenses/bouncycastle-1.44/README
deleted file mode 100644
index 277ab21b9..000000000
--- a/doc/licenses/bouncycastle-1.44/README
+++ /dev/null
@@ -1,8 +0,0 @@
-BouncyCastle Crypto (https://www.bouncycastle.org/java.html)
-------------------------------------------------------------
-
-    Version: 1.44
-    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
-    License(s):
-        MIT (bundled/bouncycastle-1.44/LICENSE
-
diff --git a/doc/licenses/bouncycastle-1.44/dep-coordinates.txt b/doc/licenses/bouncycastle-1.44/dep-coordinates.txt
deleted file mode 100644
index 707d6d98c..000000000
--- a/doc/licenses/bouncycastle-1.44/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bouncycastle:bcprov-jdk15:jar:1.44
diff --git a/doc/licenses/bouncycastle-1.80/LICENSE b/doc/licenses/bouncycastle-1.80/LICENSE
deleted file mode 100644
index fe843e99a..000000000
--- a/doc/licenses/bouncycastle-1.80/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions: The above copyright
-notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/doc/licenses/bouncycastle-1.80/README b/doc/licenses/bouncycastle-1.80/README
deleted file mode 100644
index 6e9a57a5e..000000000
--- a/doc/licenses/bouncycastle-1.80/README
+++ /dev/null
@@ -1,7 +0,0 @@
-BouncyCastle Crypto (https://www.bouncycastle.org/java.html)
-------------------------------------------------------------
-
-    Version: 1.80
-    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
-    License(s):
-        MIT (bundled/bouncycastle-1.80/LICENSE)
diff --git a/doc/licenses/bouncycastle-1.80/dep-coordinates.txt b/doc/licenses/bouncycastle-1.80/dep-coordinates.txt
deleted file mode 100644
index 9c1d76ec8..000000000
--- a/doc/licenses/bouncycastle-1.80/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-org.bouncycastle:bcpkix-jdk15to18:jar:1.80
-org.bouncycastle:bcprov-jdk15to18:jar:1.80
-org.bouncycastle:bcutil-jdk15to18:jar:1.80
diff --git a/doc/licenses/bouncycastle-fips-2.1.0/README b/doc/licenses/bouncycastle-fips-2.1.0/README
deleted file mode 100644
index 0067750d8..000000000
--- a/doc/licenses/bouncycastle-fips-2.1.0/README
+++ /dev/null
@@ -1,7 +0,0 @@
-BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
------------------------------------------------------------------------
-
-    Version: 2.1.0
-    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
-    License(s):
-        MIT (bundled/bouncycastle-fips-2.1.0/LICENSE)
diff --git a/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt
deleted file mode 100644
index 4481ae6f8..000000000
--- a/doc/licenses/bouncycastle-fips-2.1.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bouncycastle:bc-fips:jar:2.1.0
diff --git a/doc/licenses/bouncycastle-util-fips-2.1.4/LICENSE b/doc/licenses/bouncycastle-fips/LICENSE
similarity index 82%
rename from doc/licenses/bouncycastle-util-fips-2.1.4/LICENSE
rename to doc/licenses/bouncycastle-fips/LICENSE
index 613014285..230ced041 100644
--- a/doc/licenses/bouncycastle-util-fips-2.1.4/LICENSE
+++ b/doc/licenses/bouncycastle-fips/LICENSE
@@ -1,3 +1,9 @@
+# Name:    BouncyCastle FIPS Distribution
+# URL:     https://www.bouncycastle.org/fips-java
+# From:    'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
 (https://www.bouncycastle.org)
 
@@ -18,3 +24,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/bouncycastle-fips/dep-coordinates.txt b/doc/licenses/bouncycastle-fips/dep-coordinates.txt
new file mode 100644
index 000000000..298b4e2cc
--- /dev/null
+++ b/doc/licenses/bouncycastle-fips/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bc-fips:jar:*
diff --git a/doc/licenses/bouncycastle-pkix-fips-2.1.9/README b/doc/licenses/bouncycastle-pkix-fips-2.1.9/README
deleted file mode 100644
index aec503630..000000000
--- a/doc/licenses/bouncycastle-pkix-fips-2.1.9/README
+++ /dev/null
@@ -1,7 +0,0 @@
-BouncyCastle PKIX APIs, FIPS Distribution (https://www.bouncycastle.org/fips-java)
------------------------------------------------------------------------
-
-    Version: 2.1.9
-    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
-    License(s):
-        MIT (bundled/bouncycastle-pkix-fips-2.1.9/LICENSE)
diff --git a/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt
deleted file mode 100644
index 1dcbd9d54..000000000
--- a/doc/licenses/bouncycastle-pkix-fips-2.1.9/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bouncycastle:bcpkix-fips:jar:2.1.9
diff --git a/doc/licenses/bouncycastle-pkix-fips-2.1.9/LICENSE b/doc/licenses/bouncycastle-pkix-fips/LICENSE
similarity index 81%
rename from doc/licenses/bouncycastle-pkix-fips-2.1.9/LICENSE
rename to doc/licenses/bouncycastle-pkix-fips/LICENSE
index a02bc176b..1751282de 100644
--- a/doc/licenses/bouncycastle-pkix-fips-2.1.9/LICENSE
+++ b/doc/licenses/bouncycastle-pkix-fips/LICENSE
@@ -1,3 +1,9 @@
+# Name:    BouncyCastle PKIX APIs, FIPS Distribution
+# URL:     https://www.bouncycastle.org/fips-java
+# From:    'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
 (https://www.bouncycastle.org)
 
@@ -18,3 +24,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/bouncycastle-pkix-fips/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips/dep-coordinates.txt
new file mode 100644
index 000000000..f39fbb3cf
--- /dev/null
+++ b/doc/licenses/bouncycastle-pkix-fips/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bcpkix-fips:jar:*
diff --git a/doc/licenses/bouncycastle-util-fips-2.1.4/README b/doc/licenses/bouncycastle-util-fips-2.1.4/README
deleted file mode 100644
index a4ed209ae..000000000
--- a/doc/licenses/bouncycastle-util-fips-2.1.4/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/fips-java)
------------------------------------------------------------------------
-
-    Version: 2.1.4
-    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
-    License(s):
-        MIT (bundled/bouncycastle-fips-2.1.4/LICENSE)
diff --git a/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt b/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt
deleted file mode 100644
index a7704c124..000000000
--- a/doc/licenses/bouncycastle-util-fips-2.1.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bouncycastle:bcutil-fips:jar:2.1.4
diff --git a/doc/licenses/bouncycastle-fips-2.1.0/LICENSE b/doc/licenses/bouncycastle-util-fips/LICENSE
similarity index 81%
rename from doc/licenses/bouncycastle-fips-2.1.0/LICENSE
rename to doc/licenses/bouncycastle-util-fips/LICENSE
index 613014285..d2961f003 100644
--- a/doc/licenses/bouncycastle-fips-2.1.0/LICENSE
+++ b/doc/licenses/bouncycastle-util-fips/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Bouncy Castle ASN.1 Extension and Utility APIs
+# URL:     https://www.bouncycastle.org/fips-java
+# From:    'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
 (https://www.bouncycastle.org)
 
@@ -18,3 +24,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE. 
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/bouncycastle-util-fips/dep-coordinates.txt b/doc/licenses/bouncycastle-util-fips/dep-coordinates.txt
new file mode 100644
index 000000000..cd1079afc
--- /dev/null
+++ b/doc/licenses/bouncycastle-util-fips/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bcutil-fips:jar:*
diff --git a/doc/licenses/bouncycastle/LICENSE b/doc/licenses/bouncycastle/LICENSE
new file mode 100644
index 000000000..01923774d
--- /dev/null
+++ b/doc/licenses/bouncycastle/LICENSE
@@ -0,0 +1,34 @@
+# Name:    BouncyCastle Crypto
+# URL:     https://www.bouncycastle.org/java.html
+# From:    'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE [1.44] ---
+Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE [1.44] ---
+# --- BEGIN LICENSE FILE ---
+Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions: The above copyright
+notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/bouncycastle/dep-coordinates.txt b/doc/licenses/bouncycastle/dep-coordinates.txt
new file mode 100644
index 000000000..198715643
--- /dev/null
+++ b/doc/licenses/bouncycastle/dep-coordinates.txt
@@ -0,0 +1,4 @@
+org.bouncycastle:bcprov-jdk15:jar:*
+org.bouncycastle:bcpkix-jdk15to18:jar:*
+org.bouncycastle:bcprov-jdk15to18:jar:*
+org.bouncycastle:bcutil-jdk15to18:jar:*
diff --git a/doc/licenses/buffer-4.9.2/README b/doc/licenses/buffer-4.9.2/README
deleted file mode 100644
index 7caad56c9..000000000
--- a/doc/licenses/buffer-4.9.2/README
+++ /dev/null
@@ -1,7 +0,0 @@
-buffer (https://github.com/feross/buffer)
----------------------------------------------
-
-    Version: 4.9.2
-    From: 'Feross Aboukhadijeh' (https://github.com/feross)
-    License(s):
-        MIT (bundled/buffer-4.9.2/LICENSE)
diff --git a/doc/licenses/buffer-4.9.2/dep-coordinates.txt b/doc/licenses/buffer-4.9.2/dep-coordinates.txt
deleted file mode 100644
index 30f193d0a..000000000
--- a/doc/licenses/buffer-4.9.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-buffer:4.9.2
diff --git a/doc/licenses/buffer-4.9.2/LICENSE b/doc/licenses/buffer/LICENSE
similarity index 84%
rename from doc/licenses/buffer-4.9.2/LICENSE
rename to doc/licenses/buffer/LICENSE
index d6bf75dcf..bb8590ee4 100644
--- a/doc/licenses/buffer-4.9.2/LICENSE
+++ b/doc/licenses/buffer/LICENSE
@@ -1,3 +1,9 @@
+# Name:    buffer
+# URL:     https://github.com/feross/buffer
+# From:    'Feross Aboukhadijeh' (https://github.com/feross)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) Feross Aboukhadijeh, and other contributors.
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/buffer/dep-coordinates.txt b/doc/licenses/buffer/dep-coordinates.txt
new file mode 100644
index 000000000..81c8b9ed9
--- /dev/null
+++ b/doc/licenses/buffer/dep-coordinates.txt
@@ -0,0 +1 @@
+buffer:*
diff --git a/doc/licenses/byte-buddy-1.15.4/README b/doc/licenses/byte-buddy-1.15.4/README
deleted file mode 100644
index dd349a4ff..000000000
--- a/doc/licenses/byte-buddy-1.15.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Byte Buddy (https://bytebuddy.net/)
------------------------------------
-
-    Version: 1.15.4
-    From: 'Rafael Winterhalter' (https://github.com/raphw)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/byte-buddy-1.15.4/dep-coordinates.txt b/doc/licenses/byte-buddy-1.15.4/dep-coordinates.txt
deleted file mode 100644
index 968d7444d..000000000
--- a/doc/licenses/byte-buddy-1.15.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-net.bytebuddy:byte-buddy:jar:1.15.4
diff --git a/doc/licenses/byte-buddy-1.15.4/NOTICE b/doc/licenses/byte-buddy/NOTICE
similarity index 74%
rename from doc/licenses/byte-buddy-1.15.4/NOTICE
rename to doc/licenses/byte-buddy/NOTICE
index 929cbc6b1..db9e2094c 100644
--- a/doc/licenses/byte-buddy-1.15.4/NOTICE
+++ b/doc/licenses/byte-buddy/NOTICE
@@ -1,3 +1,9 @@
+# Name:    Byte Buddy
+# URL:     https://bytebuddy.net/
+# From:    'Rafael Winterhalter' (https://github.com/raphw)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2014 - Present Rafael Winterhalter
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,3 +17,4 @@ 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.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/byte-buddy/dep-coordinates.txt b/doc/licenses/byte-buddy/dep-coordinates.txt
new file mode 100644
index 000000000..49317e99b
--- /dev/null
+++ b/doc/licenses/byte-buddy/dep-coordinates.txt
@@ -0,0 +1 @@
+net.bytebuddy:byte-buddy:jar:*
diff --git a/doc/licenses/caffeine-2.9.3/README b/doc/licenses/caffeine-2.9.3/README
deleted file mode 100644
index 5336c72b2..000000000
--- a/doc/licenses/caffeine-2.9.3/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Caffeine (https://github.com/ben-manes/caffeine)
-------------------------------------------------
-
-    Version: 2.9.3
-    From: 'Ben Manes' (https://github.com/ben-manes)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/caffeine-2.9.3/dep-coordinates.txt b/doc/licenses/caffeine-2.9.3/dep-coordinates.txt
deleted file mode 100644
index feda8aa63..000000000
--- a/doc/licenses/caffeine-2.9.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.github.ben-manes.caffeine:caffeine:jar:2.9.3
diff --git a/doc/licenses/caffeine/LICENSE b/doc/licenses/caffeine/LICENSE
new file mode 100644
index 000000000..8d3b79382
--- /dev/null
+++ b/doc/licenses/caffeine/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Caffeine
+# URL:     https://github.com/ben-manes/caffeine
+# From:    'Ben Manes' (https://github.com/ben-manes)
+# License: Apache v2.0
diff --git a/doc/licenses/caffeine/dep-coordinates.txt b/doc/licenses/caffeine/dep-coordinates.txt
new file mode 100644
index 000000000..dfe212b85
--- /dev/null
+++ b/doc/licenses/caffeine/dep-coordinates.txt
@@ -0,0 +1 @@
+com.github.ben-manes.caffeine:caffeine:jar:*
diff --git a/doc/licenses/cas-client-3.6.4/NOTICE b/doc/licenses/cas-client-3.6.4/NOTICE
deleted file mode 100644
index a699597c4..000000000
--- a/doc/licenses/cas-client-3.6.4/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-This project includes:
-  Jasig CAS Client for Java - Core under Apache License Version 2.0
diff --git a/doc/licenses/cas-client-3.6.4/README b/doc/licenses/cas-client-3.6.4/README
deleted file mode 100644
index d89fe5054..000000000
--- a/doc/licenses/cas-client-3.6.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Java Apereo CAS Client (https://www.apereo.org/projects/cas)
-------------------------------------------------------------
-
-    Version: 3.6.4
-    From: 'Apereo Foundation' (https://www.apereo.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/cas-client-3.6.4/dep-coordinates.txt b/doc/licenses/cas-client-3.6.4/dep-coordinates.txt
deleted file mode 100644
index 24e2e6d91..000000000
--- a/doc/licenses/cas-client-3.6.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.jasig.cas.client:cas-client-core:jar:3.6.4
diff --git a/doc/licenses/cas-client/NOTICE b/doc/licenses/cas-client/NOTICE
new file mode 100644
index 000000000..23916f811
--- /dev/null
+++ b/doc/licenses/cas-client/NOTICE
@@ -0,0 +1,9 @@
+# Name:    Java Apereo CAS Client
+# URL:     https://www.apereo.org/projects/cas
+# From:    'Apereo Foundation' (https://www.apereo.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+This project includes:
+  Jasig CAS Client for Java - Core under Apache License Version 2.0
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/cas-client/dep-coordinates.txt b/doc/licenses/cas-client/dep-coordinates.txt
new file mode 100644
index 000000000..de586c898
--- /dev/null
+++ b/doc/licenses/cas-client/dep-coordinates.txt
@@ -0,0 +1 @@
+org.jasig.cas.client:cas-client-core:jar:*
diff --git a/doc/licenses/checker-qual-3.19.0/LICENSE.txt b/doc/licenses/checker-qual-3.19.0/LICENSE.txt
deleted file mode 100644
index 9837c6b69..000000000
--- a/doc/licenses/checker-qual-3.19.0/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Checker Framework qualifiers
-Copyright 2004-present by the Checker Framework developers
-
-MIT License:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/doc/licenses/checker-qual-3.19.0/README b/doc/licenses/checker-qual-3.19.0/README
deleted file mode 100644
index 4a00db7a7..000000000
--- a/doc/licenses/checker-qual-3.19.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Checker Framework qualifiers (https://checkerframework.org/)
-------------------------------------------------------------
-
-    Version: 3.19.0
-    From: 'Checker Framework developers' (https://checkerframework.org/)
-    License(s):
-        MIT (bundled/checker-qual-3.19.0/LICENSE.txt)
-
diff --git a/doc/licenses/checker-qual-3.19.0/dep-coordinates.txt b/doc/licenses/checker-qual-3.19.0/dep-coordinates.txt
deleted file mode 100644
index 322f3959d..000000000
--- a/doc/licenses/checker-qual-3.19.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.checkerframework:checker-qual:jar:3.19.0
diff --git a/doc/licenses/checker-qual-3.37.0/README b/doc/licenses/checker-qual-3.37.0/README
deleted file mode 100644
index 1b4bd80cd..000000000
--- a/doc/licenses/checker-qual-3.37.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Checker Framework qualifiers (https://checkerframework.org/)
-------------------------------------------------------------
-
-    Version: 3.37.0
-    From: 'Checker Framework developers' (https://checkerframework.org/)
-    License(s):
-        MIT (bundled/checker-qual-3.37.0/LICENSE.txt)
-
diff --git a/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt b/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt
deleted file mode 100644
index e6b1b4e78..000000000
--- a/doc/licenses/checker-qual-3.37.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.checkerframework:checker-qual:jar:3.37.0
diff --git a/doc/licenses/checker-qual-3.37.0/LICENSE.txt b/doc/licenses/checker-qual/LICENSE.txt
similarity index 83%
rename from doc/licenses/checker-qual-3.37.0/LICENSE.txt
rename to doc/licenses/checker-qual/LICENSE.txt
index 9837c6b69..f1ad04705 100644
--- a/doc/licenses/checker-qual-3.37.0/LICENSE.txt
+++ b/doc/licenses/checker-qual/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    Checker Framework qualifiers
+# URL:     https://checkerframework.org/
+# From:    'Checker Framework developers' (https://checkerframework.org/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Checker Framework qualifiers
 Copyright 2004-present by the Checker Framework developers
 
@@ -20,3 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/checker-qual/dep-coordinates.txt b/doc/licenses/checker-qual/dep-coordinates.txt
new file mode 100644
index 000000000..546ee6b08
--- /dev/null
+++ b/doc/licenses/checker-qual/dep-coordinates.txt
@@ -0,0 +1 @@
+org.checkerframework:checker-qual:jar:*
diff --git a/doc/licenses/core-util-is-1.0.3/README b/doc/licenses/core-util-is-1.0.3/README
deleted file mode 100644
index 7db659198..000000000
--- a/doc/licenses/core-util-is-1.0.3/README
+++ /dev/null
@@ -1,7 +0,0 @@
-core-util-is (https://github.com/isaacs/core-util-is)
----------------------------------------------
-
-    Version: 1.0.3
-    From: 'Node.js contributors'
-    License(s):
-        MIT (bundled/core-util-is-1.0.3/LICENSE)
diff --git a/doc/licenses/core-util-is-1.0.3/dep-coordinates.txt b/doc/licenses/core-util-is-1.0.3/dep-coordinates.txt
deleted file mode 100644
index f4b1c7a8f..000000000
--- a/doc/licenses/core-util-is-1.0.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-core-util-is:1.0.3
diff --git a/doc/licenses/core-util-is-1.0.3/LICENSE b/doc/licenses/core-util-is/LICENSE
similarity index 85%
rename from doc/licenses/core-util-is-1.0.3/LICENSE
rename to doc/licenses/core-util-is/LICENSE
index d8d7f9437..16bfcaaa9 100644
--- a/doc/licenses/core-util-is-1.0.3/LICENSE
+++ b/doc/licenses/core-util-is/LICENSE
@@ -1,3 +1,9 @@
+# Name:    core-util-is
+# URL:     https://github.com/isaacs/core-util-is
+# From:    'Node.js contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright Node.js contributors. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +23,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/core-util-is/dep-coordinates.txt b/doc/licenses/core-util-is/dep-coordinates.txt
new file mode 100644
index 000000000..988b9f79e
--- /dev/null
+++ b/doc/licenses/core-util-is/dep-coordinates.txt
@@ -0,0 +1 @@
+core-util-is:*
diff --git a/doc/licenses/css-loader-5.2.7/README b/doc/licenses/css-loader-5.2.7/README
deleted file mode 100644
index bcbec19ec..000000000
--- a/doc/licenses/css-loader-5.2.7/README
+++ /dev/null
@@ -1,8 +0,0 @@
-css-loader (https://github.com/webpack-contrib/css-loader)
-----------------------------------------------------------
-
-    Version: 5.2.7
-    From: 'JS Foundation and other contributors'
-    License(s):
-        MIT (bundled/css-loader-5.2.7/LICENSE)
-
diff --git a/doc/licenses/css-loader-5.2.7/dep-coordinates.txt b/doc/licenses/css-loader-5.2.7/dep-coordinates.txt
deleted file mode 100644
index 73a6894ef..000000000
--- a/doc/licenses/css-loader-5.2.7/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-css-loader:5.2.7
diff --git a/doc/licenses/css-loader-5.2.7/LICENSE b/doc/licenses/css-loader/LICENSE
similarity index 84%
rename from doc/licenses/css-loader-5.2.7/LICENSE
rename to doc/licenses/css-loader/LICENSE
index 8c11fc728..dd0b11e39 100644
--- a/doc/licenses/css-loader-5.2.7/LICENSE
+++ b/doc/licenses/css-loader/LICENSE
@@ -1,3 +1,9 @@
+# Name:    css-loader
+# URL:     https://github.com/webpack-contrib/css-loader
+# From:    'JS Foundation and other contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright JS Foundation and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/css-loader/dep-coordinates.txt b/doc/licenses/css-loader/dep-coordinates.txt
new file mode 100644
index 000000000..deebe6aff
--- /dev/null
+++ b/doc/licenses/css-loader/dep-coordinates.txt
@@ -0,0 +1 @@
+css-loader:*
diff --git a/doc/licenses/csv-6.3.9/README b/doc/licenses/csv-6.3.9/README
deleted file mode 100644
index 691f87f67..000000000
--- a/doc/licenses/csv-6.3.9/README
+++ /dev/null
@@ -1,7 +0,0 @@
-node-csv (https://github.com/adaltas/node-csv)
----------------------------------------------
-
-    Version: 6.3.9
-    From: 'Adaltas' (https://github.com/adaltas)
-    License(s):
-        MIT (bundled/csv-6.3.9/LICENSE)
diff --git a/doc/licenses/csv-6.3.9/dep-coordinates.txt b/doc/licenses/csv-6.3.9/dep-coordinates.txt
deleted file mode 100644
index 53c436734..000000000
--- a/doc/licenses/csv-6.3.9/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-csv:6.3.9
-csv-parse:5.5.6
diff --git a/doc/licenses/csv-6.3.9/LICENSE b/doc/licenses/csv/LICENSE
similarity index 84%
rename from doc/licenses/csv-6.3.9/LICENSE
rename to doc/licenses/csv/LICENSE
index 918eaf05a..6f37e2fad 100644
--- a/doc/licenses/csv-6.3.9/LICENSE
+++ b/doc/licenses/csv/LICENSE
@@ -1,3 +1,9 @@
+# Name:    node-csv
+# URL:     https://github.com/adaltas/node-csv
+# From:    'Adaltas' (https://github.com/adaltas)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) 2010 Adaltas
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/csv/dep-coordinates.txt b/doc/licenses/csv/dep-coordinates.txt
new file mode 100644
index 000000000..2a071bf23
--- /dev/null
+++ b/doc/licenses/csv/dep-coordinates.txt
@@ -0,0 +1,2 @@
+csv:*
+csv-parse:*
diff --git a/doc/licenses/d3-path-3.1.0/README b/doc/licenses/d3-path-3.1.0/README
deleted file mode 100644
index 5bbf02a56..000000000
--- a/doc/licenses/d3-path-3.1.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-d3-path (https://github.com/d3/d3-path)
-----------------------------------------------------------
-
-    Version: 3.1.0
-    From: 'Mike Bostock'
-    License(s):
-        BSD 0-clause (bundled/d3-path-3.1.0/LICENSE)
-
diff --git a/doc/licenses/d3-path-3.1.0/dep-coordinates.txt b/doc/licenses/d3-path-3.1.0/dep-coordinates.txt
deleted file mode 100644
index 5159b4e03..000000000
--- a/doc/licenses/d3-path-3.1.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-d3-path:3.1.0
diff --git a/doc/licenses/d3-path-3.1.0/LICENSE b/doc/licenses/d3-path/LICENSE
similarity index 81%
rename from doc/licenses/d3-path-3.1.0/LICENSE
rename to doc/licenses/d3-path/LICENSE
index ed25746bb..d141314d6 100644
--- a/doc/licenses/d3-path-3.1.0/LICENSE
+++ b/doc/licenses/d3-path/LICENSE
@@ -1,3 +1,9 @@
+# Name:    d3-path
+# URL:     https://github.com/d3/d3-path
+# From:    'Mike Bostock'
+# License: BSD 0-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2015-2022 Mike Bostock
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
@@ -11,3 +17,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/d3-path/dep-coordinates.txt b/doc/licenses/d3-path/dep-coordinates.txt
new file mode 100644
index 000000000..e0dfd7724
--- /dev/null
+++ b/doc/licenses/d3-path/dep-coordinates.txt
@@ -0,0 +1 @@
+d3-path:*
diff --git a/doc/licenses/d3-shape-3.2.0/README b/doc/licenses/d3-shape-3.2.0/README
deleted file mode 100644
index f0adda5c5..000000000
--- a/doc/licenses/d3-shape-3.2.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-d3-path (https://github.com/d3/d3-shape)
-----------------------------------------------------------
-
-    Version: 3.2.0
-    From: 'Mike Bostock'
-    License(s):
-        BSD 0-clause (bundled/d3-shape-3.2.0/LICENSE)
-
diff --git a/doc/licenses/d3-shape-3.2.0/dep-coordinates.txt b/doc/licenses/d3-shape-3.2.0/dep-coordinates.txt
deleted file mode 100644
index 10973f489..000000000
--- a/doc/licenses/d3-shape-3.2.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-d3-shape:3.2.0
diff --git a/doc/licenses/d3-shape-3.2.0/LICENSE b/doc/licenses/d3-shape/LICENSE
similarity index 81%
rename from doc/licenses/d3-shape-3.2.0/LICENSE
rename to doc/licenses/d3-shape/LICENSE
index fbe44bdc9..2592715d8 100644
--- a/doc/licenses/d3-shape-3.2.0/LICENSE
+++ b/doc/licenses/d3-shape/LICENSE
@@ -1,3 +1,9 @@
+# Name:    d3-path
+# URL:     https://github.com/d3/d3-shape
+# From:    'Mike Bostock'
+# License: BSD 0-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2010-2022 Mike Bostock
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
@@ -11,3 +17,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/d3-shape/dep-coordinates.txt b/doc/licenses/d3-shape/dep-coordinates.txt
new file mode 100644
index 000000000..204c3e9ca
--- /dev/null
+++ b/doc/licenses/d3-shape/dep-coordinates.txt
@@ -0,0 +1 @@
+d3-shape:*
diff --git a/doc/licenses/datalist-polyfill-1.25.1/README b/doc/licenses/datalist-polyfill-1.25.1/README
deleted file mode 100644
index c26d45dec..000000000
--- a/doc/licenses/datalist-polyfill-1.25.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-datalist-polyfill (https://github.com/mfranzke/datalist-polyfill)
------------------------------------------------------------------
-
-    Version: 1.25.1
-    From: 'Maximilian Franzke' (https://github.com/mfranzke)
-    License(s):
-        MIT (bundled/datalist-polyfill-1.25.1/LICENSE)
-
diff --git a/doc/licenses/datalist-polyfill-1.25.1/dep-coordinates.txt b/doc/licenses/datalist-polyfill-1.25.1/dep-coordinates.txt
deleted file mode 100644
index 40b1114c5..000000000
--- a/doc/licenses/datalist-polyfill-1.25.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-datalist-polyfill:1.25.1
diff --git a/doc/licenses/datalist-polyfill-1.25.1/LICENSE b/doc/licenses/datalist-polyfill/LICENSE
similarity index 82%
rename from doc/licenses/datalist-polyfill-1.25.1/LICENSE
rename to doc/licenses/datalist-polyfill/LICENSE
index 8864d4a39..e8784f5cc 100644
--- a/doc/licenses/datalist-polyfill-1.25.1/LICENSE
+++ b/doc/licenses/datalist-polyfill/LICENSE
@@ -1,3 +1,9 @@
+# Name:    datalist-polyfill
+# URL:     https://github.com/mfranzke/datalist-polyfill
+# From:    'Maximilian Franzke' (https://github.com/mfranzke)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) 2017 
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/datalist-polyfill/dep-coordinates.txt b/doc/licenses/datalist-polyfill/dep-coordinates.txt
new file mode 100644
index 000000000..f82a21e34
--- /dev/null
+++ b/doc/licenses/datalist-polyfill/dep-coordinates.txt
@@ -0,0 +1 @@
+datalist-polyfill:*
diff --git a/doc/licenses/directory-api-2.1.7/NOTICE b/doc/licenses/directory-api-2.1.7/NOTICE
deleted file mode 100644
index 676a182bd..000000000
--- a/doc/licenses/directory-api-2.1.7/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Directory LDAP API
-Copyright 2003-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/directory-api-2.1.7/README b/doc/licenses/directory-api-2.1.7/README
deleted file mode 100644
index 172f0bf28..000000000
--- a/doc/licenses/directory-api-2.1.7/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Directory LDAP API (http://directory.apache.org)
--------------------------------------------------------
-
-    Version: 2.1.6
-    From: 'Apache Software Foundation' (https://www.apache.org/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/directory-api-2.1.7/dep-coordinates.txt b/doc/licenses/directory-api-2.1.7/dep-coordinates.txt
deleted file mode 100644
index 170ac1fa3..000000000
--- a/doc/licenses/directory-api-2.1.7/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.directory.api:api-all:jar:2.1.7
diff --git a/doc/licenses/dom4j-2.1.4/README b/doc/licenses/dom4j-2.1.4/README
deleted file mode 100644
index 15651d051..000000000
--- a/doc/licenses/dom4j-2.1.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-DOM4J (https://dom4j.github.io/)
---------------------------------
-
-    Version: 2.1.4
-    From: 'MetaStuff, Ltd. and DOM4J contributors'
-    License(s):
-        DOM4J License (bundled/dom4j-2.1.4/LICENSE)
-
diff --git a/doc/licenses/dom4j-2.1.4/LICENSE b/doc/licenses/dom4j/LICENSE
similarity index 90%
rename from doc/licenses/dom4j-2.1.4/LICENSE
rename to doc/licenses/dom4j/LICENSE
index 1a02acb14..7cba7fbaf 100644
--- a/doc/licenses/dom4j-2.1.4/LICENSE
+++ b/doc/licenses/dom4j/LICENSE
@@ -1,3 +1,9 @@
+# Name:    DOM4J
+# URL:     https://dom4j.github.io/
+# From:    'MetaStuff, Ltd. and DOM4J contributors'
+# License: DOM4J License 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved.
 
 Redistribution and use of this software and associated documentation
@@ -37,3 +43,4 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/dom4j-2.1.4/dep-coordinates.txt b/doc/licenses/dom4j/dep-coordinates.txt
similarity index 82%
rename from doc/licenses/dom4j-2.1.4/dep-coordinates.txt
rename to doc/licenses/dom4j/dep-coordinates.txt
index 100eff347..19bb29bde 100644
--- a/doc/licenses/dom4j-2.1.4/dep-coordinates.txt
+++ b/doc/licenses/dom4j/dep-coordinates.txt
@@ -1 +1 @@
-org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:2.1.4_1
+org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:jar:*
diff --git a/doc/licenses/duo-universal-sdk-1.3.1/README b/doc/licenses/duo-universal-sdk-1.3.1/README
deleted file mode 100644
index 2e20b107d..000000000
--- a/doc/licenses/duo-universal-sdk-1.3.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Duo Universal SDK for Java (https://duo.com/docs/duoweb)
---------------------------------------------------------
-
-    Version: 1.3.1
-    From: 'Cisco Systems'
-    License(s):
-        Duo License (bundled/duo-universal-sdk-1.3.1/LICENSE)
-
diff --git a/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt b/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt
deleted file mode 100644
index ba42036aa..000000000
--- a/doc/licenses/duo-universal-sdk-1.3.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.duosecurity:duo-universal-sdk:jar:1.3.1
diff --git a/doc/licenses/duo-universal-sdk-1.3.1/LICENSE b/doc/licenses/duo-universal-sdk/LICENSE
similarity index 88%
rename from doc/licenses/duo-universal-sdk-1.3.1/LICENSE
rename to doc/licenses/duo-universal-sdk/LICENSE
index 369fbf813..b06c958c1 100644
--- a/doc/licenses/duo-universal-sdk-1.3.1/LICENSE
+++ b/doc/licenses/duo-universal-sdk/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Duo Universal SDK for Java
+# URL:     https://duo.com/docs/duoweb
+# From:    'Cisco Systems'
+# License: Duo License 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2022 Cisco Systems, Inc. and/or its affiliates
 All rights reserved.
 
@@ -22,4 +28,5 @@ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/duo-universal-sdk/dep-coordinates.txt b/doc/licenses/duo-universal-sdk/dep-coordinates.txt
new file mode 100644
index 000000000..e3da6abc7
--- /dev/null
+++ b/doc/licenses/duo-universal-sdk/dep-coordinates.txt
@@ -0,0 +1 @@
+com.duosecurity:duo-universal-sdk:jar:*
diff --git a/doc/licenses/ehcache-2.4.0/README b/doc/licenses/ehcache-2.4.0/README
deleted file mode 100644
index fe82e1720..000000000
--- a/doc/licenses/ehcache-2.4.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Ehcache (https://www.ehcache.org/)
-----------------------------------
-
-    Version: 2.4.0
-    From: 'Terracotta, Inc.' (https://www.terracotta.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/ehcache-2.4.0/dep-coordinates.txt b/doc/licenses/ehcache-2.4.0/dep-coordinates.txt
deleted file mode 100644
index 2807940b4..000000000
--- a/doc/licenses/ehcache-2.4.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-net.sf.ehcache:ehcache-core:jar:2.4.0
diff --git a/doc/licenses/ehcache/LICENSE b/doc/licenses/ehcache/LICENSE
new file mode 100644
index 000000000..d738b74e0
--- /dev/null
+++ b/doc/licenses/ehcache/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Ehcache
+# URL:     https://www.ehcache.org/
+# From:    'Terracotta, Inc.' (https://www.terracotta.org/)
+# License: Apache v2.0
diff --git a/doc/licenses/ehcache/dep-coordinates.txt b/doc/licenses/ehcache/dep-coordinates.txt
new file mode 100644
index 000000000..1fe66b7cb
--- /dev/null
+++ b/doc/licenses/ehcache/dep-coordinates.txt
@@ -0,0 +1 @@
+net.sf.ehcache:ehcache-core:jar:*
diff --git a/doc/licenses/error-prone-2.10.0/README b/doc/licenses/error-prone-2.10.0/README
deleted file mode 100644
index f286aed3b..000000000
--- a/doc/licenses/error-prone-2.10.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Error Prone (https://errorprone.info/)
---------------------------------------
-
-    Version: 2.10.0
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/error-prone-2.10.0/dep-coordinates.txt b/doc/licenses/error-prone-2.10.0/dep-coordinates.txt
deleted file mode 100644
index 9473dfcab..000000000
--- a/doc/licenses/error-prone-2.10.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.google.errorprone:error_prone_annotations:jar:2.10.0
diff --git a/doc/licenses/error-prone-2.21.1/README b/doc/licenses/error-prone-2.21.1/README
deleted file mode 100644
index 8e1df59bd..000000000
--- a/doc/licenses/error-prone-2.21.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Error Prone (https://errorprone.info/)
---------------------------------------
-
-    Version: 2.21.1
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/error-prone-2.21.1/dep-coordinates.txt b/doc/licenses/error-prone-2.21.1/dep-coordinates.txt
deleted file mode 100644
index d1e82c949..000000000
--- a/doc/licenses/error-prone-2.21.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.google.errorprone:error_prone_annotations:jar:2.21.1
diff --git a/doc/licenses/error-prone/LICENSE b/doc/licenses/error-prone/LICENSE
new file mode 100644
index 000000000..1eaa149b9
--- /dev/null
+++ b/doc/licenses/error-prone/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Error Prone
+# URL:     https://errorprone.info/
+# From:    'Google Inc.' (http://www.google.com/)
+# License: Apache v2.0
diff --git a/doc/licenses/error-prone/dep-coordinates.txt b/doc/licenses/error-prone/dep-coordinates.txt
new file mode 100644
index 000000000..0a27f93ca
--- /dev/null
+++ b/doc/licenses/error-prone/dep-coordinates.txt
@@ -0,0 +1 @@
+com.google.errorprone:error_prone_annotations:jar:*
diff --git a/doc/licenses/events-3.3.0/README b/doc/licenses/events-3.3.0/README
deleted file mode 100644
index b53924d9c..000000000
--- a/doc/licenses/events-3.3.0/README
+++ /dev/null
@@ -1,7 +0,0 @@
-events (https://github.com/browserify/events)
----------------------------------------------
-
-    Version: 3.3.0
-    From: 'Node.js contributors, Joyent, Inc., and other Node contributors'
-    License(s):
-        MIT (bundled/events-3.3.0/LICENSE)
diff --git a/doc/licenses/events-3.3.0/dep-coordinates.txt b/doc/licenses/events-3.3.0/dep-coordinates.txt
deleted file mode 100644
index f644fcc1b..000000000
--- a/doc/licenses/events-3.3.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-events:3.3.0
diff --git a/doc/licenses/events-3.3.0/LICENSE b/doc/licenses/events/LICENSE
similarity index 83%
rename from doc/licenses/events-3.3.0/LICENSE
rename to doc/licenses/events/LICENSE
index 52ed3b0a6..dc1323d26 100644
--- a/doc/licenses/events-3.3.0/LICENSE
+++ b/doc/licenses/events/LICENSE
@@ -1,3 +1,9 @@
+# Name:    events
+# URL:     https://github.com/browserify/events
+# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT
 
 Copyright Joyent, Inc. and other Node contributors.
@@ -20,3 +26,4 @@ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/events/dep-coordinates.txt b/doc/licenses/events/dep-coordinates.txt
new file mode 100644
index 000000000..0e9b849d3
--- /dev/null
+++ b/doc/licenses/events/dep-coordinates.txt
@@ -0,0 +1 @@
+events:*
diff --git a/doc/licenses/file-saver-2.0.5/README b/doc/licenses/file-saver-2.0.5/README
deleted file mode 100644
index 0d933458b..000000000
--- a/doc/licenses/file-saver-2.0.5/README
+++ /dev/null
@@ -1,8 +0,0 @@
-FileSaver.js (https://github.com/eligrey/FileSaver.js)
-------------------------------------------------------
-
-    Version: 2.0.5
-    From: 'Eli Grey' (https://github.com/eligrey)
-    License(s):
-        MIT (bundled/file-saver-2.0.5/LICENSE.md)
-
diff --git a/doc/licenses/file-saver-2.0.5/dep-coordinates.txt b/doc/licenses/file-saver-2.0.5/dep-coordinates.txt
deleted file mode 100644
index c0c2b2fef..000000000
--- a/doc/licenses/file-saver-2.0.5/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-file-saver:2.0.5
diff --git a/doc/licenses/file-saver-2.0.5/LICENSE.md b/doc/licenses/file-saver/LICENSE.md
similarity index 84%
rename from doc/licenses/file-saver-2.0.5/LICENSE.md
rename to doc/licenses/file-saver/LICENSE.md
index 32ef3ca0b..20a0c0db5 100644
--- a/doc/licenses/file-saver-2.0.5/LICENSE.md
+++ b/doc/licenses/file-saver/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    FileSaver.js
+# URL:     https://github.com/eligrey/FileSaver.js
+# From:    'Eli Grey' (https://github.com/eligrey)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License
 
 Copyright © 2016 [Eli Grey][1].
@@ -9,3 +15,4 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
   [1]: http://eligrey.com
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/file-saver/dep-coordinates.txt b/doc/licenses/file-saver/dep-coordinates.txt
new file mode 100644
index 000000000..30784db2a
--- /dev/null
+++ b/doc/licenses/file-saver/dep-coordinates.txt
@@ -0,0 +1 @@
+file-saver:*
diff --git a/doc/licenses/findbugs-jsr305-3.0.2/README b/doc/licenses/findbugs-jsr305-3.0.2/README
deleted file mode 100644
index d9e2f0a9a..000000000
--- a/doc/licenses/findbugs-jsr305-3.0.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JSR-305 Reference Implementation (http://code.google.com/p/jsr-305/)
---------------------------------------------------------------------
-
-    Version: 3.0.2 (originally 0.1-SNAPSHOT, redistributed by FindBugs 3.0.2)
-    From: 'JSR305 expert group' (https://code.google.com/archive/p/jsr-305/)
-    License(s):
-        BSD 3-clause (bundled/findbugs-jsr305-3.0.2/LICENSE)
-
diff --git a/doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt b/doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt
deleted file mode 100644
index 2b53583c3..000000000
--- a/doc/licenses/findbugs-jsr305-3.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.google.code.findbugs:jsr305:jar:3.0.2
diff --git a/doc/licenses/findbugs-jsr305-3.0.2/LICENSE b/doc/licenses/findbugs-jsr305/LICENSE
similarity index 86%
rename from doc/licenses/findbugs-jsr305-3.0.2/LICENSE
rename to doc/licenses/findbugs-jsr305/LICENSE
index 67366813a..b361d573e 100644
--- a/doc/licenses/findbugs-jsr305-3.0.2/LICENSE
+++ b/doc/licenses/findbugs-jsr305/LICENSE
@@ -1,3 +1,9 @@
+# Name:    JSR-305 Reference Implementation
+# URL:     http://code.google.com/p/jsr-305/
+# From:    'JSR305 expert group' (https://code.google.com/archive/p/jsr-305/)
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2007-2009, JSR305 expert group
 All rights reserved.
 
@@ -26,3 +32,4 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/findbugs-jsr305/dep-coordinates.txt b/doc/licenses/findbugs-jsr305/dep-coordinates.txt
new file mode 100644
index 000000000..51ec8795f
--- /dev/null
+++ b/doc/licenses/findbugs-jsr305/dep-coordinates.txt
@@ -0,0 +1 @@
+com.google.code.findbugs:jsr305:jar:*
diff --git a/doc/licenses/fuzzysort-3.0.2/README b/doc/licenses/fuzzysort-3.0.2/README
deleted file mode 100644
index d1f8f2884..000000000
--- a/doc/licenses/fuzzysort-3.0.2/README
+++ /dev/null
@@ -1,7 +0,0 @@
-fuzzysort (https://github.com/farzher/fuzzysort/tree/master)
----------------------------------------------
-
-    Version: 3.0.2
-    From: 'Stephen Kamenar' (https://github.com/farzher)
-    License(s):
-        MIT (bundled/fuzzysort-3.0.2/LICENSE)
diff --git a/doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt b/doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt
deleted file mode 100644
index 0a8c3a08d..000000000
--- a/doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-fuzzysort:3.0.2
diff --git a/doc/licenses/fuzzysort-3.0.2/LICENSE b/doc/licenses/fuzzysort/LICENSE
similarity index 83%
rename from doc/licenses/fuzzysort-3.0.2/LICENSE
rename to doc/licenses/fuzzysort/LICENSE
index a3b9d9d79..ea1d380f7 100644
--- a/doc/licenses/fuzzysort-3.0.2/LICENSE
+++ b/doc/licenses/fuzzysort/LICENSE
@@ -1,3 +1,9 @@
+# Name:    fuzzysort
+# URL:     https://github.com/farzher/fuzzysort/tree/master
+# From:    'Stephen Kamenar' (https://github.com/farzher)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) 2018 Stephen Kamenar
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/fuzzysort/dep-coordinates.txt b/doc/licenses/fuzzysort/dep-coordinates.txt
new file mode 100644
index 000000000..5558e232d
--- /dev/null
+++ b/doc/licenses/fuzzysort/dep-coordinates.txt
@@ -0,0 +1 @@
+fuzzysort:*
diff --git a/doc/licenses/glassfish-hk2-2.6.1/README b/doc/licenses/glassfish-hk2-2.6.1/README
deleted file mode 100644
index 00b42cb0d..000000000
--- a/doc/licenses/glassfish-hk2-2.6.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-GlassFish HK2 (https://eclipse-ee4j.github.io/glassfish-hk2/)
--------------------------------------------------------------
-
-    Version: 2.6.1
-    From: 'Eclipse Foundation' (https://www.eclipse.org/)
-    License(s):
-        EPL v2.0 (bundled/glassfish-hk2-2.6.1/LICENSE.md)
-
diff --git a/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt b/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt
deleted file mode 100644
index 8558a5707..000000000
--- a/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-org.glassfish.hk2.external:aopalliance-repackaged:jar:2.6.1
-org.glassfish.hk2.external:jakarta.inject:jar:2.6.1
-org.glassfish.hk2:guice-bridge:jar:2.6.1
-org.glassfish.hk2:hk2-api:jar:2.6.1
-org.glassfish.hk2:hk2-locator:jar:2.6.1
-org.glassfish.hk2:hk2-utils:jar:2.6.1
diff --git a/doc/licenses/glassfish-hk2-2.6.1/LICENSE.md b/doc/licenses/glassfish-hk2/LICENSE.md
similarity index 97%
rename from doc/licenses/glassfish-hk2-2.6.1/LICENSE.md
rename to doc/licenses/glassfish-hk2/LICENSE.md
index 6667b0612..52c3162c2 100644
--- a/doc/licenses/glassfish-hk2-2.6.1/LICENSE.md
+++ b/doc/licenses/glassfish-hk2/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    GlassFish HK2
+# URL:     https://eclipse-ee4j.github.io/glassfish-hk2/
+# From:    'Eclipse Foundation' (https://www.eclipse.org/)
+# License: EPL v2.0 
+#
+# --- BEGIN LICENSE FILE ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -635,3 +641,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/glassfish-hk2/dep-coordinates.txt b/doc/licenses/glassfish-hk2/dep-coordinates.txt
new file mode 100644
index 000000000..44b0e73c9
--- /dev/null
+++ b/doc/licenses/glassfish-hk2/dep-coordinates.txt
@@ -0,0 +1,6 @@
+org.glassfish.hk2.external:aopalliance-repackaged:jar:*
+org.glassfish.hk2.external:jakarta.inject:jar:*
+org.glassfish.hk2:guice-bridge:jar:*
+org.glassfish.hk2:hk2-api:jar:*
+org.glassfish.hk2:hk2-locator:jar:*
+org.glassfish.hk2:hk2-utils:jar:*
diff --git a/doc/licenses/guava-32.1.3-jre/README b/doc/licenses/guava-32.1.3-jre/README
deleted file mode 100644
index a7ee36e9e..000000000
--- a/doc/licenses/guava-32.1.3-jre/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Guava: Google Core Libraries for Java (https://github.com/google/guava)
------------------------------------------------------------------------
-
-    Version: 32.1.3-jre
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/guava-32.1.3-jre/dep-coordinates.txt b/doc/licenses/guava-32.1.3-jre/dep-coordinates.txt
deleted file mode 100644
index a89f87a49..000000000
--- a/doc/licenses/guava-32.1.3-jre/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-com.google.guava:failureaccess:jar:1.0.1
-com.google.guava:guava:jar:32.1.3-jre
-com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava
diff --git a/doc/licenses/guava/LICENSE b/doc/licenses/guava/LICENSE
new file mode 100644
index 000000000..132b65265
--- /dev/null
+++ b/doc/licenses/guava/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Guava: Google Core Libraries for Java
+# URL:     https://github.com/google/guava
+# From:    'Google Inc.' (http://www.google.com/)
+# License: Apache v2.0
diff --git a/doc/licenses/guava/dep-coordinates.txt b/doc/licenses/guava/dep-coordinates.txt
new file mode 100644
index 000000000..b97cfc79c
--- /dev/null
+++ b/doc/licenses/guava/dep-coordinates.txt
@@ -0,0 +1,3 @@
+com.google.guava:failureaccess:jar:*
+com.google.guava:guava:jar:*
+com.google.guava:listenablefuture:jar:*
diff --git a/doc/licenses/guice-5.1.0/README b/doc/licenses/guice-5.1.0/README
deleted file mode 100644
index 6ba456cc1..000000000
--- a/doc/licenses/guice-5.1.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Google Guice (https://github.com/google/guice)
-----------------------------------------------
-
-    Version: 5.1.0
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/guice-5.1.0/dep-coordinates.txt b/doc/licenses/guice-5.1.0/dep-coordinates.txt
deleted file mode 100644
index f338d379c..000000000
--- a/doc/licenses/guice-5.1.0/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-com.google.inject:guice:jar:5.1.0
-com.google.inject.extensions:guice-assistedinject:jar:5.1.0
-com.google.inject.extensions:guice-servlet:jar:5.1.0
diff --git a/doc/licenses/guice/LICENSE b/doc/licenses/guice/LICENSE
new file mode 100644
index 000000000..d55bac55d
--- /dev/null
+++ b/doc/licenses/guice/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Google Guice
+# URL:     https://github.com/google/guice
+# From:    'Google Inc.' (http://www.google.com/)
+# License: Apache v2.0
diff --git a/doc/licenses/guice/dep-coordinates.txt b/doc/licenses/guice/dep-coordinates.txt
new file mode 100644
index 000000000..1e4ee5d2c
--- /dev/null
+++ b/doc/licenses/guice/dep-coordinates.txt
@@ -0,0 +1,3 @@
+com.google.inject:guice:jar:*
+com.google.inject.extensions:guice-assistedinject:jar:*
+com.google.inject.extensions:guice-servlet:jar:*
diff --git a/doc/licenses/ieee754-1.2.1/README b/doc/licenses/ieee754-1.2.1/README
deleted file mode 100644
index f15f63240..000000000
--- a/doc/licenses/ieee754-1.2.1/README
+++ /dev/null
@@ -1,7 +0,0 @@
-ieee754 (https://github.com/feross/ieee754)
----------------------------------------------
-
-    Version: 1.2.1
-    From: 'Fair Oaks Labs, Inc'
-    License(s):
-        MIT (bundled/ieee754-1.2.1/LICENSE)
diff --git a/doc/licenses/ieee754-1.2.1/dep-coordinates.txt b/doc/licenses/ieee754-1.2.1/dep-coordinates.txt
deleted file mode 100644
index 4fb7d7765..000000000
--- a/doc/licenses/ieee754-1.2.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-ieee754:1.2.1
diff --git a/doc/licenses/ieee754-1.2.1/LICENSE b/doc/licenses/ieee754/LICENSE
similarity index 89%
rename from doc/licenses/ieee754-1.2.1/LICENSE
rename to doc/licenses/ieee754/LICENSE
index 5aac82c78..0dd69e766 100644
--- a/doc/licenses/ieee754-1.2.1/LICENSE
+++ b/doc/licenses/ieee754/LICENSE
@@ -1,3 +1,9 @@
+# Name:    ieee754
+# URL:     https://github.com/feross/ieee754
+# From:    'Fair Oaks Labs, Inc'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2008 Fair Oaks Labs, Inc.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -9,3 +15,4 @@ Redistribution and use in source and binary forms, with or without modification,
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/ieee754/dep-coordinates.txt b/doc/licenses/ieee754/dep-coordinates.txt
new file mode 100644
index 000000000..b4210783b
--- /dev/null
+++ b/doc/licenses/ieee754/dep-coordinates.txt
@@ -0,0 +1 @@
+ieee754:*
diff --git a/doc/licenses/inherits-2.0.3/README b/doc/licenses/inherits-2.0.3/README
deleted file mode 100644
index e2afbf590..000000000
--- a/doc/licenses/inherits-2.0.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-inherits (https://github.com/isaacs/inherits)
----------------------------------------------
-
-    Version: 2.0.3
-    From: 'Isaac Z. Schlueter' (https://github.com/isaacs)
-    License(s):
-        ISC (bundled/inherits-2.0.3/LICENSE)
-
diff --git a/doc/licenses/inherits-2.0.3/dep-coordinates.txt b/doc/licenses/inherits-2.0.3/dep-coordinates.txt
deleted file mode 100644
index e03ab47fe..000000000
--- a/doc/licenses/inherits-2.0.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-inherits:2.0.3
diff --git a/doc/licenses/inherits-2.0.4/LICENSE b/doc/licenses/inherits-2.0.4/LICENSE
deleted file mode 100644
index 052085c43..000000000
--- a/doc/licenses/inherits-2.0.4/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/doc/licenses/inherits-2.0.4/README b/doc/licenses/inherits-2.0.4/README
deleted file mode 100644
index 9d0b40126..000000000
--- a/doc/licenses/inherits-2.0.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-inherits (https://github.com/isaacs/inherits)
----------------------------------------------
-
-    Version: 2.0.4
-    From: 'Isaac Z. Schlueter' (https://github.com/isaacs)
-    License(s):
-        ISC (bundled/inherits-2.0.4/LICENSE)
-
diff --git a/doc/licenses/inherits-2.0.4/dep-coordinates.txt b/doc/licenses/inherits-2.0.4/dep-coordinates.txt
deleted file mode 100644
index 4a17c13e3..000000000
--- a/doc/licenses/inherits-2.0.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-inherits:2.0.4
diff --git a/doc/licenses/inherits-2.0.3/LICENSE b/doc/licenses/inherits/LICENSE
similarity index 78%
rename from doc/licenses/inherits-2.0.3/LICENSE
rename to doc/licenses/inherits/LICENSE
index 052085c43..364e03266 100644
--- a/doc/licenses/inherits-2.0.3/LICENSE
+++ b/doc/licenses/inherits/LICENSE
@@ -1,3 +1,9 @@
+# Name:    inherits
+# URL:     https://github.com/isaacs/inherits
+# From:    'Isaac Z. Schlueter' (https://github.com/isaacs)
+# License: ISC 
+#
+# --- BEGIN LICENSE FILE ---
 The ISC License
 
 Copyright (c) Isaac Z. Schlueter
@@ -13,3 +19,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/inherits/dep-coordinates.txt b/doc/licenses/inherits/dep-coordinates.txt
new file mode 100644
index 000000000..c4d818026
--- /dev/null
+++ b/doc/licenses/inherits/dep-coordinates.txt
@@ -0,0 +1 @@
+inherits:*
diff --git a/doc/licenses/ipaddress-5.5.1/README b/doc/licenses/ipaddress-5.5.1/README
deleted file mode 100644
index cf407388b..000000000
--- a/doc/licenses/ipaddress-5.5.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-IPAddress (https://seancfoley.github.io/IPAddress/)
----------------------------------------------------
-
-    Version: 5.5.1
-    From: 'Sean C Foley' (https://seancfoley.github.io/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/ipaddress-5.5.1/dep-coordinates.txt b/doc/licenses/ipaddress-5.5.1/dep-coordinates.txt
deleted file mode 100644
index 3ddc5be39..000000000
--- a/doc/licenses/ipaddress-5.5.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.github.seancfoley:ipaddress:jar:5.5.1
diff --git a/doc/licenses/ipaddress/LICENSE b/doc/licenses/ipaddress/LICENSE
new file mode 100644
index 000000000..1d90d7282
--- /dev/null
+++ b/doc/licenses/ipaddress/LICENSE
@@ -0,0 +1,4 @@
+# Name:    IPAddress
+# URL:     https://seancfoley.github.io/IPAddress/
+# From:    'Sean C Foley' (https://seancfoley.github.io/)
+# License: Apache v2.0
diff --git a/doc/licenses/ipaddress/dep-coordinates.txt b/doc/licenses/ipaddress/dep-coordinates.txt
new file mode 100644
index 000000000..f691af07d
--- /dev/null
+++ b/doc/licenses/ipaddress/dep-coordinates.txt
@@ -0,0 +1 @@
+com.github.seancfoley:ipaddress:jar:*
diff --git a/doc/licenses/isarray-1.0.0/README b/doc/licenses/isarray-1.0.0/README
deleted file mode 100644
index 3fde38c8c..000000000
--- a/doc/licenses/isarray-1.0.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-isarray (https://github.com/juliangruber/isarray)
----------------------------------------------
-
-    Version: 1.0.0
-    From: 'Julian Gruber' (https://github.com/juliangruber)
-    License(s):
-        MIT (bundled/isarray-1.0.0/LICENSE)
-
diff --git a/doc/licenses/isarray-1.0.0/dep-coordinates.txt b/doc/licenses/isarray-1.0.0/dep-coordinates.txt
deleted file mode 100644
index d444bdbd9..000000000
--- a/doc/licenses/isarray-1.0.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-isarray:1.0.0
diff --git a/doc/licenses/isarray-1.0.0/LICENSE b/doc/licenses/isarray/LICENSE
similarity index 84%
rename from doc/licenses/isarray-1.0.0/LICENSE
rename to doc/licenses/isarray/LICENSE
index de3226673..a9072712b 100644
--- a/doc/licenses/isarray-1.0.0/LICENSE
+++ b/doc/licenses/isarray/LICENSE
@@ -1,3 +1,9 @@
+# Name:    isarray
+# URL:     https://github.com/juliangruber/isarray
+# From:    'Julian Gruber' (https://github.com/juliangruber)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/isarray/dep-coordinates.txt b/doc/licenses/isarray/dep-coordinates.txt
new file mode 100644
index 000000000..1e1860f6c
--- /dev/null
+++ b/doc/licenses/isarray/dep-coordinates.txt
@@ -0,0 +1 @@
+isarray:*
diff --git a/doc/licenses/j2objc-annotations-2.8/README b/doc/licenses/j2objc-annotations-2.8/README
deleted file mode 100644
index 4df8c7a0c..000000000
--- a/doc/licenses/j2objc-annotations-2.8/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Java to Objective-C Annotations (https://github.com/google/j2objc)
-------------------------------------------------------------------
-
-    Version: 2.8
-    From: 'Google Inc.' (http://www.google.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/j2objc-annotations-2.8/dep-coordinates.txt b/doc/licenses/j2objc-annotations-2.8/dep-coordinates.txt
deleted file mode 100644
index 9e961e7c3..000000000
--- a/doc/licenses/j2objc-annotations-2.8/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.google.j2objc:j2objc-annotations:jar:2.8
diff --git a/doc/licenses/j2objc-annotations/LICENSE b/doc/licenses/j2objc-annotations/LICENSE
new file mode 100644
index 000000000..a6840c6ca
--- /dev/null
+++ b/doc/licenses/j2objc-annotations/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Java to Objective-C Annotations
+# URL:     https://github.com/google/j2objc
+# From:    'Google Inc.' (http://www.google.com/)
+# License: Apache v2.0
diff --git a/doc/licenses/j2objc-annotations/dep-coordinates.txt b/doc/licenses/j2objc-annotations/dep-coordinates.txt
new file mode 100644
index 000000000..254bed2db
--- /dev/null
+++ b/doc/licenses/j2objc-annotations/dep-coordinates.txt
@@ -0,0 +1 @@
+com.google.j2objc:j2objc-annotations:jar:*
diff --git a/doc/licenses/jackson-2.19.0/README b/doc/licenses/jackson-2.19.0/README
deleted file mode 100644
index d6b81854b..000000000
--- a/doc/licenses/jackson-2.19.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jackson (https://github.com/FasterXML/jackson)
-----------------------------------------------
-
-    Version: 2.19.0
-    From: 'FasterXML, LLC' (https://github.com/FasterXML)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jackson-2.19.0/dep-coordinates.txt b/doc/licenses/jackson-2.19.0/dep-coordinates.txt
deleted file mode 100644
index 61c1512a9..000000000
--- a/doc/licenses/jackson-2.19.0/dep-coordinates.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-com.fasterxml.jackson.core:jackson-core:jar:2.19.0
-com.fasterxml.jackson.core:jackson-annotations:jar:2.19.0
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.19.0
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.19.0
diff --git a/doc/licenses/jackson-databind-2.19.0/README b/doc/licenses/jackson-databind-2.19.0/README
deleted file mode 100644
index f324643eb..000000000
--- a/doc/licenses/jackson-databind-2.19.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jackson-databind (https://github.com/FasterXML/jackson-databind)
-----------------------------------------------
-
-    Version: 2.19.0
-    From: 'FasterXML, LLC' (https://github.com/FasterXML)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt b/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt
deleted file mode 100644
index 35007aa2d..000000000
--- a/doc/licenses/jackson-databind-2.19.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.jackson.core:jackson-databind:jar:2.19.0
diff --git a/doc/licenses/jackson-databind-2.19.0/NOTICE b/doc/licenses/jackson-databind/NOTICE
similarity index 51%
rename from doc/licenses/jackson-databind-2.19.0/NOTICE
rename to doc/licenses/jackson-databind/NOTICE
index e0b3fa0ed..cbd95b854 100644
--- a/doc/licenses/jackson-databind-2.19.0/NOTICE
+++ b/doc/licenses/jackson-databind/NOTICE
@@ -1,4 +1,11 @@
+# Name:    Jackson-databind
+# URL:     https://github.com/FasterXML/jackson-databind
+# From:    'FasterXML, LLC' (https://github.com/FasterXML)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Jackson is a high-performance, Free/Open Source JSON processing library.
 It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
 been in development since 2007.
 It is currently developed by a community of developers.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jackson-databind/dep-coordinates.txt b/doc/licenses/jackson-databind/dep-coordinates.txt
new file mode 100644
index 000000000..ff1a0d8d1
--- /dev/null
+++ b/doc/licenses/jackson-databind/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.jackson.core:jackson-databind:jar:*
diff --git a/doc/licenses/jackson-2.19.0/NOTICE b/doc/licenses/jackson/NOTICE
similarity index 53%
rename from doc/licenses/jackson-2.19.0/NOTICE
rename to doc/licenses/jackson/NOTICE
index e0b3fa0ed..9a4df260c 100644
--- a/doc/licenses/jackson-2.19.0/NOTICE
+++ b/doc/licenses/jackson/NOTICE
@@ -1,4 +1,11 @@
+# Name:    Jackson
+# URL:     https://github.com/FasterXML/jackson
+# From:    'FasterXML, LLC' (https://github.com/FasterXML)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Jackson is a high-performance, Free/Open Source JSON processing library.
 It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
 been in development since 2007.
 It is currently developed by a community of developers.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jackson/dep-coordinates.txt b/doc/licenses/jackson/dep-coordinates.txt
new file mode 100644
index 000000000..1c2954919
--- /dev/null
+++ b/doc/licenses/jackson/dep-coordinates.txt
@@ -0,0 +1,4 @@
+com.fasterxml.jackson.core:jackson-core:jar:*
+com.fasterxml.jackson.core:jackson-annotations:jar:*
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:*
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:*
diff --git a/doc/licenses/jai-imageio-core-1.4.0/README b/doc/licenses/jai-imageio-core-1.4.0/README
deleted file mode 100644
index 6b0c70116..000000000
--- a/doc/licenses/jai-imageio-core-1.4.0/README
+++ /dev/null
@@ -1,12 +0,0 @@
-Java Advanced Imaging Image I/O (https://github.com/jai-imageio/jai-imageio-core)
----------------------------------------------------------------------------------
-
-    Version: 1.4.0
-    From:
-        'Sun Microsystems, Inc.' (https://www.oracle.com/)
-        'University of Manchester' (https://www.manchester.ac.uk/)
-        'Stian Soiland-Reyes' (https://github.com/stain)
-        'Peter Hull'
-    License(s):
-        BSD 3-clause (bundled/jai-imageio-core-1.4.0/LICENSE.txt)
-
diff --git a/doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt b/doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt
deleted file mode 100644
index b62dccdef..000000000
--- a/doc/licenses/jai-imageio-core-1.4.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.github.jai-imageio:jai-imageio-core:jar:1.4.0
diff --git a/doc/licenses/jai-imageio-core-1.4.0/LICENSE.txt b/doc/licenses/jai-imageio-core/LICENSE.txt
similarity index 81%
rename from doc/licenses/jai-imageio-core-1.4.0/LICENSE.txt
rename to doc/licenses/jai-imageio-core/LICENSE.txt
index 88e09e0d5..444f275ea 100644
--- a/doc/licenses/jai-imageio-core-1.4.0/LICENSE.txt
+++ b/doc/licenses/jai-imageio-core/LICENSE.txt
@@ -1,3 +1,12 @@
+# Name:    Java Advanced Imaging Image I/O
+# URL:     https://github.com/jai-imageio/jai-imageio-core
+# From:    'Sun Microsystems, Inc.' (https://www.oracle.com/)
+# From:    'University of Manchester' (https://www.manchester.ac.uk/)
+# From:    'Stian Soiland-Reyes' (https://github.com/stain)
+# From:    'Peter Hull'
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2005 Sun Microsystems, Inc. 
 Copyright © 2010-2014 University of Manchester
 Copyright © 2010-2015 Stian Soiland-Reyes
@@ -37,3 +46,4 @@ POSSIBILITY OF SUCH DAMAGES.
 You acknowledge that this software is not designed or intended for 
 use in the design, construction, operation or maintenance of any 
 nuclear facility. 
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jai-imageio-core/dep-coordinates.txt b/doc/licenses/jai-imageio-core/dep-coordinates.txt
new file mode 100644
index 000000000..e95c220a2
--- /dev/null
+++ b/doc/licenses/jai-imageio-core/dep-coordinates.txt
@@ -0,0 +1 @@
+com.github.jai-imageio:jai-imageio-core:jar:*
diff --git a/doc/licenses/jakarta-activation-1.2.1/LICENSE.md b/doc/licenses/jakarta-activation-1.2.1/LICENSE.md
deleted file mode 100644
index e0358f972..000000000
--- a/doc/licenses/jakarta-activation-1.2.1/LICENSE.md
+++ /dev/null
@@ -1,29 +0,0 @@
-
-    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-   
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-   
-      - Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-   
-      - Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-   
-      - Neither the name of the Eclipse Foundation, Inc. nor the names of its
-        contributors may be used to endorse or promote products derived
-        from this software without specific prior written permission.
-   
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/doc/licenses/jakarta-activation-1.2.1/README b/doc/licenses/jakarta-activation-1.2.1/README
deleted file mode 100644
index 5541989ef..000000000
--- a/doc/licenses/jakarta-activation-1.2.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta Activation (https://eclipse-ee4j.github.io/jaf/)
---------------------------------------------------------
-
-    Version: 1.2.1
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        BSD 3-clause (bundled/jakarta-activation-1.2.1/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt b/doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt
deleted file mode 100644
index 7eff799cb..000000000
--- a/doc/licenses/jakarta-activation-1.2.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.activation:jakarta.activation-api:jar:1.2.1
diff --git a/doc/licenses/jakarta-activation-1.2.2/README b/doc/licenses/jakarta-activation-1.2.2/README
deleted file mode 100644
index 0320bc71a..000000000
--- a/doc/licenses/jakarta-activation-1.2.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta Activation (https://eclipse-ee4j.github.io/jaf/)
---------------------------------------------------------
-
-    Version: 1.2.2
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        BSD 3-clause (bundled/jakarta-activation-1.2.2/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt b/doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt
deleted file mode 100644
index aabbe3312..000000000
--- a/doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.activation:jakarta.activation-api:jar:1.2.2
diff --git a/doc/licenses/jakarta-activation-1.2.2/LICENSE.md b/doc/licenses/jakarta-activation/LICENSE.md
similarity index 88%
rename from doc/licenses/jakarta-activation-1.2.2/LICENSE.md
rename to doc/licenses/jakarta-activation/LICENSE.md
index e0358f972..51054b88f 100644
--- a/doc/licenses/jakarta-activation-1.2.2/LICENSE.md
+++ b/doc/licenses/jakarta-activation/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Jakarta Activation
+# URL:     https://eclipse-ee4j.github.io/jaf/
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 
     Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
    
@@ -27,3 +33,4 @@
     LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
     NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jakarta-activation/dep-coordinates.txt b/doc/licenses/jakarta-activation/dep-coordinates.txt
new file mode 100644
index 000000000..d1c6c636d
--- /dev/null
+++ b/doc/licenses/jakarta-activation/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.activation:jakarta.activation-api:jar:*
diff --git a/doc/licenses/jakarta-annotation-api-1.3.5/README b/doc/licenses/jakarta-annotation-api-1.3.5/README
deleted file mode 100644
index 0f83cf63d..000000000
--- a/doc/licenses/jakarta-annotation-api-1.3.5/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta Annotations (https://eclipse-ee4j.github.io/common-annotations-api/)
-----------------------------------------------------------------------------
-
-    Version: 1.3.5
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        EPL v2.0 (bundled/jakarta-annotation-api-1.3.5/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt b/doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt
deleted file mode 100644
index 7e5e0d34a..000000000
--- a/doc/licenses/jakarta-annotation-api-1.3.5/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.annotation:jakarta.annotation-api:jar:1.3.5
diff --git a/doc/licenses/jakarta-ws-rs-api-2.1.6/LICENSE.md b/doc/licenses/jakarta-annotation-api/LICENSE.md
similarity index 99%
rename from doc/licenses/jakarta-ws-rs-api-2.1.6/LICENSE.md
rename to doc/licenses/jakarta-annotation-api/LICENSE.md
index 5de3d1b40..401afcae4 100644
--- a/doc/licenses/jakarta-ws-rs-api-2.1.6/LICENSE.md
+++ b/doc/licenses/jakarta-annotation-api/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Jakarta Annotations
+# URL:     https://eclipse-ee4j.github.io/common-annotations-api/
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: EPL v2.0 
+#
+# --- BEGIN LICENSE FILE ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -635,3 +641,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jakarta-annotation-api/dep-coordinates.txt b/doc/licenses/jakarta-annotation-api/dep-coordinates.txt
new file mode 100644
index 000000000..1e1c0392f
--- /dev/null
+++ b/doc/licenses/jakarta-annotation-api/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.annotation:jakarta.annotation-api:jar:*
diff --git a/doc/licenses/jakarta-jaxb-2.3.2/README b/doc/licenses/jakarta-jaxb-2.3.2/README
deleted file mode 100644
index 820851146..000000000
--- a/doc/licenses/jakarta-jaxb-2.3.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta XML Binding (https://eclipse-ee4j.github.io/jaxb-ri/)
--------------------------------------------------------------
-
-    Version: 2.3.2
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        BSD 3-clause (bundled/jakarta-jaxb-2.3.2/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt b/doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt
deleted file mode 100644
index e129ed35d..000000000
--- a/doc/licenses/jakarta-jaxb-2.3.2/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.2
-org.glassfish.jaxb:jaxb-runtime:jar:2.3.2
-org.glassfish.jaxb:txw2:jar:2.3.2
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md b/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md
deleted file mode 100644
index da1c1cea7..000000000
--- a/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  - Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-  - Neither the name of the Eclipse Foundation, Inc. nor the names of its
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/README b/doc/licenses/jakarta-jaxb-2.3.3/README
deleted file mode 100644
index b0d753d1a..000000000
--- a/doc/licenses/jakarta-jaxb-2.3.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta XML Binding (https://eclipse-ee4j.github.io/jaxb-ri/)
--------------------------------------------------------------
-
-    Version: 2.3.3
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        BSD 3-clause (bundled/jakarta-jaxb-2.3.3/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt b/doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt
deleted file mode 100644
index 4880a4569..000000000
--- a/doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3
-org.glassfish.jaxb:jaxb-runtime:jar:2.3.3
-org.glassfish.jaxb:txw2:jar:2.3.3
diff --git a/doc/licenses/jakarta-jaxb-2.3.2/LICENSE.md b/doc/licenses/jakarta-jaxb/LICENSE.md
similarity index 83%
rename from doc/licenses/jakarta-jaxb-2.3.2/LICENSE.md
rename to doc/licenses/jakarta-jaxb/LICENSE.md
index da1c1cea7..7728004d6 100644
--- a/doc/licenses/jakarta-jaxb-2.3.2/LICENSE.md
+++ b/doc/licenses/jakarta-jaxb/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Jakarta XML Binding
+# URL:     https://eclipse-ee4j.github.io/jaxb-ri/
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -25,4 +31,5 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jakarta-jaxb/dep-coordinates.txt b/doc/licenses/jakarta-jaxb/dep-coordinates.txt
new file mode 100644
index 000000000..5ea08715d
--- /dev/null
+++ b/doc/licenses/jakarta-jaxb/dep-coordinates.txt
@@ -0,0 +1,3 @@
+jakarta.xml.bind:jakarta.xml.bind-api:jar:*
+org.glassfish.jaxb:jaxb-runtime:jar:*
+org.glassfish.jaxb:txw2:jar:*
diff --git a/doc/licenses/jakarta-validation-api-2.0.2/README b/doc/licenses/jakarta-validation-api-2.0.2/README
deleted file mode 100644
index 51bf9fd20..000000000
--- a/doc/licenses/jakarta-validation-api-2.0.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta Bean Validation API (https://beanvalidation.org/)
----------------------------------------------------------
-
-    Version: 2.0.2
-    From: 'Red Hat Inc.' (https://www.redhat.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt b/doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt
deleted file mode 100644
index f615ecfa1..000000000
--- a/doc/licenses/jakarta-validation-api-2.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.validation:jakarta.validation-api:jar:2.0.2
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/NOTICE b/doc/licenses/jakarta-validation-api-2.1.3/NOTICE
deleted file mode 100644
index 20468229e..000000000
--- a/doc/licenses/jakarta-validation-api-2.1.3/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-# Notices for Eclipse Jakarta Bean Validation
-
-This content is produced and maintained by the Eclipse Jakarta Bean Validation
-project.
-
-* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation
-
-## Trademarks
-
- Jakarta Bean Validation is a trademark of the Eclipse Foundation.
-
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/README b/doc/licenses/jakarta-validation-api-2.1.3/README
deleted file mode 100644
index ed6d5b910..000000000
--- a/doc/licenses/jakarta-validation-api-2.1.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta Bean Validation API (https://beanvalidation.org/)
----------------------------------------------------------
-
-    Version: 2.1.3
-    From: 'Red Hat Inc.' (https://www.redhat.com/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt b/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
deleted file mode 100644
index b112b9d9c..000000000
--- a/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.validation:jakarta.validation-api:jar:2.1.3
diff --git a/doc/licenses/jakarta-validation-api-2.0.2/NOTICE b/doc/licenses/jakarta-validation-api/NOTICE
similarity index 58%
rename from doc/licenses/jakarta-validation-api-2.0.2/NOTICE
rename to doc/licenses/jakarta-validation-api/NOTICE
index 20468229e..e1a147bf9 100644
--- a/doc/licenses/jakarta-validation-api-2.0.2/NOTICE
+++ b/doc/licenses/jakarta-validation-api/NOTICE
@@ -1,3 +1,9 @@
+# Name:    Jakarta Bean Validation API
+# URL:     https://beanvalidation.org/
+# From:    'Red Hat Inc.' (https://www.redhat.com/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 # Notices for Eclipse Jakarta Bean Validation
 
 This content is produced and maintained by the Eclipse Jakarta Bean Validation
@@ -8,4 +14,4 @@ project.
 ## Trademarks
 
  Jakarta Bean Validation is a trademark of the Eclipse Foundation.
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jakarta-validation-api/dep-coordinates.txt b/doc/licenses/jakarta-validation-api/dep-coordinates.txt
new file mode 100644
index 000000000..17658ff46
--- /dev/null
+++ b/doc/licenses/jakarta-validation-api/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.validation:jakarta.validation-api:jar:*
diff --git a/doc/licenses/jakarta-ws-rs-api-2.1.6/README b/doc/licenses/jakarta-ws-rs-api-2.1.6/README
deleted file mode 100644
index 6abf8c4be..000000000
--- a/doc/licenses/jakarta-ws-rs-api-2.1.6/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jakarta RESTful Web Services (https://github.com/eclipse-ee4j/jaxrs-api/)
--------------------------------------------------------------------------
-
-    Version: 2.1.6
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        EPL v2.0 (bundled/jakarta-ws-rs-api-2.1.6/LICENSE.md)
-
diff --git a/doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt b/doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt
deleted file mode 100644
index 595b48565..000000000
--- a/doc/licenses/jakarta-ws-rs-api-2.1.6/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jakarta.ws.rs:jakarta.ws.rs-api:jar:2.1.6
diff --git a/doc/licenses/jakarta-annotation-api-1.3.5/LICENSE.md b/doc/licenses/jakarta-ws-rs-api/LICENSE.md
similarity index 99%
rename from doc/licenses/jakarta-annotation-api-1.3.5/LICENSE.md
rename to doc/licenses/jakarta-ws-rs-api/LICENSE.md
index 5de3d1b40..9b204c4f0 100644
--- a/doc/licenses/jakarta-annotation-api-1.3.5/LICENSE.md
+++ b/doc/licenses/jakarta-ws-rs-api/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Jakarta RESTful Web Services
+# URL:     https://github.com/eclipse-ee4j/jaxrs-api/
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: EPL v2.0 
+#
+# --- BEGIN LICENSE FILE ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -635,3 +641,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jakarta-ws-rs-api/dep-coordinates.txt b/doc/licenses/jakarta-ws-rs-api/dep-coordinates.txt
new file mode 100644
index 000000000..a81156a07
--- /dev/null
+++ b/doc/licenses/jakarta-ws-rs-api/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.ws.rs:jakarta.ws.rs-api:jar:*
diff --git a/doc/licenses/java-jwt-4.0.0/README b/doc/licenses/java-jwt-4.0.0/README
deleted file mode 100644
index 4e76b4b1d..000000000
--- a/doc/licenses/java-jwt-4.0.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Java JWT (https://github.com/auth0/java-jwt)
---------------------------------------------
-
-    Version: 4.0.0
-    From: 'Auth0 by Okta' (https://www.auth0.com)
-    License(s):
-        MIT (bundled/java-jwt-4.0.0/LICENSE)
-
diff --git a/doc/licenses/java-jwt-4.0.0/dep-coordinates.txt b/doc/licenses/java-jwt-4.0.0/dep-coordinates.txt
deleted file mode 100644
index 9f6f9c10a..000000000
--- a/doc/licenses/java-jwt-4.0.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.auth0:java-jwt:jar:4.0.0
diff --git a/doc/licenses/java-jwt-4.0.0/LICENSE b/doc/licenses/java-jwt/LICENSE
similarity index 84%
rename from doc/licenses/java-jwt-4.0.0/LICENSE
rename to doc/licenses/java-jwt/LICENSE
index 4a7a13ada..93f4a002b 100644
--- a/doc/licenses/java-jwt-4.0.0/LICENSE
+++ b/doc/licenses/java-jwt/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Java JWT
+# URL:     https://github.com/auth0/java-jwt
+# From:    'Auth0 by Okta' (https://www.auth0.com)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
  
 Copyright (c) 2015 Auth0, Inc. <support@auth0.com> (http://auth0.com)
@@ -18,4 +24,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/java-jwt/dep-coordinates.txt b/doc/licenses/java-jwt/dep-coordinates.txt
new file mode 100644
index 000000000..9bd52c82f
--- /dev/null
+++ b/doc/licenses/java-jwt/dep-coordinates.txt
@@ -0,0 +1 @@
+com.auth0:java-jwt:jar:*
diff --git a/doc/licenses/java-saml-2.9.0/README b/doc/licenses/java-saml-2.9.0/README
deleted file mode 100644
index bd815ac64..000000000
--- a/doc/licenses/java-saml-2.9.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Onelogin Java SAML Client (https://github.com/onelogin/java-saml)
-------------------------------------------------------------------------
-
-    Version: 2.9.0
-    From: 'OneLogin' (https://www.onelogin.com)
-    License(s):
-        MIT License (bundled/java-saml-2.9.0/LICENSE)
-
diff --git a/doc/licenses/java-saml-2.9.0/dep-coordinates.txt b/doc/licenses/java-saml-2.9.0/dep-coordinates.txt
deleted file mode 100644
index 244258766..000000000
--- a/doc/licenses/java-saml-2.9.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-com.onelogin:java-saml-core:jar:2.9.0
-com.onelogin:java-saml:jar:2.9.0
diff --git a/doc/licenses/java-saml-2.9.0/LICENSE b/doc/licenses/java-saml/LICENSE
similarity index 83%
rename from doc/licenses/java-saml-2.9.0/LICENSE
rename to doc/licenses/java-saml/LICENSE
index 578413f8e..7ce3c77d3 100644
--- a/doc/licenses/java-saml-2.9.0/LICENSE
+++ b/doc/licenses/java-saml/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Onelogin Java SAML Client
+# URL:     https://github.com/onelogin/java-saml
+# From:    'OneLogin' (https://www.onelogin.com)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2010-2016 OneLogin, Inc.
 
 Permission is hereby granted, free of charge, to any person
@@ -20,3 +26,4 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/java-saml/dep-coordinates.txt b/doc/licenses/java-saml/dep-coordinates.txt
new file mode 100644
index 000000000..76fdc07b8
--- /dev/null
+++ b/doc/licenses/java-saml/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.onelogin:java-saml-core:jar:*
+com.onelogin:java-saml:jar:*
diff --git a/doc/licenses/javaee-activation-1.2.0/README b/doc/licenses/javaee-activation-1.2.0/README
deleted file mode 100644
index 996821f31..000000000
--- a/doc/licenses/javaee-activation-1.2.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JavaBeans Activation Framework (https://github.com/javaee/activation)
-------------------------------u--------------------------------------
-
-    Version: 1.2.0
-    From: 'Oracle and/or its affiliates'
-    License(s):
-        CDDL v1.1 (bundled/javaee-activation-1.2.0/LICENSE.txt)
-
diff --git a/doc/licenses/javaee-activation-1.2.0/dep-coordinates.txt b/doc/licenses/javaee-activation-1.2.0/dep-coordinates.txt
deleted file mode 100644
index fc9dd2222..000000000
--- a/doc/licenses/javaee-activation-1.2.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-javax.activation:javax.activation-api:jar:1.2.0
diff --git a/doc/licenses/javaee-activation-1.2.0/LICENSE.txt b/doc/licenses/javaee-activation/LICENSE.txt
similarity index 99%
rename from doc/licenses/javaee-activation-1.2.0/LICENSE.txt
rename to doc/licenses/javaee-activation/LICENSE.txt
index 5ad62c442..8142c6837 100644
--- a/doc/licenses/javaee-activation-1.2.0/LICENSE.txt
+++ b/doc/licenses/javaee-activation/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    JavaBeans Activation Framework
+# URL:     https://github.com/javaee/activation
+# From:    'Oracle and/or its affiliates'
+# License: CDDL v1.1 
+#
+# --- BEGIN LICENSE FILE ---
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
 
 1. Definitions.
@@ -757,3 +763,4 @@ based on this library.  If you modify this library, you may extend this
 exception to your version of the library, but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement
 from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/javaee-activation/dep-coordinates.txt b/doc/licenses/javaee-activation/dep-coordinates.txt
new file mode 100644
index 000000000..fa25f552f
--- /dev/null
+++ b/doc/licenses/javaee-activation/dep-coordinates.txt
@@ -0,0 +1 @@
+javax.activation:javax.activation-api:jar:*
diff --git a/doc/licenses/javassist-3.30.2-ga/README b/doc/licenses/javassist-3.30.2-ga/README
deleted file mode 100644
index ace93d95f..000000000
--- a/doc/licenses/javassist-3.30.2-ga/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Javassist (https://www.javassist.org/)
---------------------------------------
-
-    Version: 3.30.2-GA
-    From: 'Shigeru Chiba' (https://github.com/chibash)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt b/doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt
deleted file mode 100644
index eaeede288..000000000
--- a/doc/licenses/javassist-3.30.2-ga/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.javassist:javassist:jar:3.30.2-GA
diff --git a/doc/licenses/javassist/LICENSE b/doc/licenses/javassist/LICENSE
new file mode 100644
index 000000000..49290a931
--- /dev/null
+++ b/doc/licenses/javassist/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Javassist
+# URL:     https://www.javassist.org/
+# From:    'Shigeru Chiba' (https://github.com/chibash)
+# License: Apache v2.0
diff --git a/doc/licenses/javassist/dep-coordinates.txt b/doc/licenses/javassist/dep-coordinates.txt
new file mode 100644
index 000000000..7dfd1eac3
--- /dev/null
+++ b/doc/licenses/javassist/dep-coordinates.txt
@@ -0,0 +1 @@
+org.javassist:javassist:jar:*
diff --git a/doc/licenses/javax.inject-1/README b/doc/licenses/javax.inject-1/README
deleted file mode 100644
index 716a58e97..000000000
--- a/doc/licenses/javax.inject-1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/)
-----------------------------------------------------------------------------
-
-    Version: 1
-    From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/javax.inject-1/dep-coordinates.txt b/doc/licenses/javax.inject-1/dep-coordinates.txt
deleted file mode 100644
index e99938e48..000000000
--- a/doc/licenses/javax.inject-1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-javax.inject:javax.inject:jar:1
diff --git a/doc/licenses/javax.inject/LICENSE b/doc/licenses/javax.inject/LICENSE
new file mode 100644
index 000000000..e7154e15f
--- /dev/null
+++ b/doc/licenses/javax.inject/LICENSE
@@ -0,0 +1,4 @@
+# Name:    JSR-330 / Dependency Injection for Java
+# URL:     http://code.google.com/p/atinject/
+# From:    'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330)
+# License: Apache v2.0
diff --git a/doc/licenses/javax.inject/dep-coordinates.txt b/doc/licenses/javax.inject/dep-coordinates.txt
new file mode 100644
index 000000000..22df545fe
--- /dev/null
+++ b/doc/licenses/javax.inject/dep-coordinates.txt
@@ -0,0 +1 @@
+javax.inject:javax.inject:jar:*
diff --git a/doc/licenses/jaxb-api-2.2.12/README b/doc/licenses/jaxb-api-2.2.12/README
deleted file mode 100644
index 334484216..000000000
--- a/doc/licenses/jaxb-api-2.2.12/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JAXB API / XML Processing (https://github.com/javaee/jaxb-spec)
----------------------------------------------------------------
-
-    Version: 2.2.12
-    From: 'Oracle' (http://www.oracle.com)
-    License(s):
-        CDDL v1.1 (bundled/jaxb-api-2.2.12/LICENSE.txt)
-
diff --git a/doc/licenses/jaxb-api-2.2.12/dep-coordinates.txt b/doc/licenses/jaxb-api-2.2.12/dep-coordinates.txt
deleted file mode 100644
index 0abdb0300..000000000
--- a/doc/licenses/jaxb-api-2.2.12/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-javax.xml.bind:jaxb-api:jar:2.2.12
diff --git a/doc/licenses/jaxb-api-2.3.1/LICENSE.txt b/doc/licenses/jaxb-api-2.3.1/LICENSE.txt
deleted file mode 100644
index 833a843cf..000000000
--- a/doc/licenses/jaxb-api-2.3.1/LICENSE.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
-
-1. Definitions.
-
-     1.1. "Contributor" means each individual or entity that creates or contributes to the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-     1.3. "Covered Software" means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-     1.4. "Executable" means the Covered Software in any form other than Source Code.
-
-     1.5. "Initial Developer" means the individual or entity that first makes Original Software available under this License.
-
-     1.6. "Larger Work" means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-     1.7. "License" means this document.
-
-     1.8. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means the Source Code and Executable form of any of the following:
-
-     A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-     B. Any new file that contains any part of the Original Software or previous Modification; or
-
-     C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-     1.10. "Original Software" means the Source Code and Executable form of computer software code that is originally released under this License.
-
-     1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-     1.12. "Source Code" means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-     1.13. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-     2.1. The Initial Developer Grant.
-
-     Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-     (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-
-     (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-
-     (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-
-     (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
-
-     2.2. Contributor Grant.
-
-     Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-     (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-
-     (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
-     (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-
-     (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Availability of Source Code.
-
-     Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-     3.2. Modifications.
-
-     The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-     3.3. Required Notices.
-
-     You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-     3.4. Application of Additional Terms.
-
-     You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-     3.5. Distribution of Executable Versions.
-
-     You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-     3.6. Larger Works.
-
-     You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-     4.1. New Versions.
-
-     Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-     4.2. Effect of New Versions.
-
-     You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-
-     4.3. Modified Versions.
-
-     When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-     6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-     6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as "Participant") alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-     6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-
-     6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-     The Covered Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and "commercial computer software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-----------
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
-
-
-
-
-The GNU General Public License (GPL) Version 2, June 1991
-
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
-
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
-
-The precise terms and conditions for copying, distribution and modification follow.
-
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
-
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-   a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
-
-   b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
-
-   c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
-
-   a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-   b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-   c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
-
-   One line to give the program's name and a brief idea of what it does.
-
-   Copyright (C)
-
-   This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
-
-   Gnomovision version 69, Copyright (C) year name of author
-   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
-
-   Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-   signature of Ty Coon, 1 April 1989
-   Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-
-Certain source files distributed by Oracle are subject to the following clarification and special exception to the GPL Version 2, but only where Oracle has expressly included in the particular source file's header the words "Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the License file that accompanied this code."
-
-Linking this library statically or dynamically with other modules is making a combined work based on this library.  Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
-
-As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.  An independent module is a module which is not derived from or based on this library.  If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.
diff --git a/doc/licenses/jaxb-api-2.3.1/README b/doc/licenses/jaxb-api-2.3.1/README
deleted file mode 100644
index 2836aa8b1..000000000
--- a/doc/licenses/jaxb-api-2.3.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JAXB API / XML Processing (https://github.com/javaee/jaxb-spec)
----------------------------------------------------------------
-
-    Version: 2.3.1
-    From: 'Oracle' (http://www.oracle.com)
-    License(s):
-        CDDL v1.1 (bundled/jaxb-api-2.3.1/LICENSE.txt)
-
diff --git a/doc/licenses/jaxb-api-2.3.1/dep-coordinates.txt b/doc/licenses/jaxb-api-2.3.1/dep-coordinates.txt
deleted file mode 100644
index 2c23cad0a..000000000
--- a/doc/licenses/jaxb-api-2.3.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-javax.xml.bind:jaxb-api:jar:2.3.1
diff --git a/doc/licenses/jaxb-api-2.2.12/LICENSE.txt b/doc/licenses/jaxb-api/LICENSE.txt
similarity index 99%
rename from doc/licenses/jaxb-api-2.2.12/LICENSE.txt
rename to doc/licenses/jaxb-api/LICENSE.txt
index 833a843cf..760ca8e4c 100644
--- a/doc/licenses/jaxb-api-2.2.12/LICENSE.txt
+++ b/doc/licenses/jaxb-api/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    JAXB API / XML Processing
+# URL:     https://github.com/javaee/jaxb-spec
+# From:    'Oracle' (http://www.oracle.com)
+# License: CDDL v1.1 
+#
+# --- BEGIN LICENSE FILE ---
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
 
 1. Definitions.
@@ -272,3 +278,4 @@ Certain source files distributed by Oracle are subject to the following clarific
 Linking this library statically or dynamically with other modules is making a combined work based on this library.  Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
 
 As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.  An independent module is a module which is not derived from or based on this library.  If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jaxb-api/dep-coordinates.txt b/doc/licenses/jaxb-api/dep-coordinates.txt
new file mode 100644
index 000000000..4e18fce1c
--- /dev/null
+++ b/doc/licenses/jaxb-api/dep-coordinates.txt
@@ -0,0 +1 @@
+javax.xml.bind:jaxb-api:jar:*
diff --git a/doc/licenses/jcommander-1.82/NOTICE b/doc/licenses/jcommander-1.82/NOTICE
deleted file mode 100644
index c4d1f51df..000000000
--- a/doc/licenses/jcommander-1.82/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-Copyright 2010 Cedric Beust <cedric@beust.com>
diff --git a/doc/licenses/jcommander-1.82/README b/doc/licenses/jcommander-1.82/README
deleted file mode 100644
index ca3752906..000000000
--- a/doc/licenses/jcommander-1.82/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JCommander (https://jcommander.org/)
-------------------------------------
-
-    Version: 1.82
-    From: 'Cédric Beust' (https://github.com/cbeust)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jcommander-1.82/dep-coordinates.txt b/doc/licenses/jcommander-1.82/dep-coordinates.txt
deleted file mode 100644
index c10c9b7df..000000000
--- a/doc/licenses/jcommander-1.82/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.beust:jcommander:jar:1.82
diff --git a/doc/licenses/jcommander/NOTICE b/doc/licenses/jcommander/NOTICE
new file mode 100644
index 000000000..04091e14c
--- /dev/null
+++ b/doc/licenses/jcommander/NOTICE
@@ -0,0 +1,8 @@
+# Name:    JCommander
+# URL:     https://jcommander.org/
+# From:    'Cédric Beust' (https://github.com/cbeust)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Copyright 2010 Cedric Beust <cedric@beust.com>
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jcommander/dep-coordinates.txt b/doc/licenses/jcommander/dep-coordinates.txt
new file mode 100644
index 000000000..9400b9f1a
--- /dev/null
+++ b/doc/licenses/jcommander/dep-coordinates.txt
@@ -0,0 +1 @@
+com.beust:jcommander:jar:*
diff --git a/doc/licenses/jersey-2.46/README b/doc/licenses/jersey-2.46/README
deleted file mode 100644
index b42a5dbaa..000000000
--- a/doc/licenses/jersey-2.46/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Jersey (https://jersey.java.net/)
----------------------------------
-
-    Version: 2.46
-    From: 'Eclipse Foundation' (https://www.eclipse.org/)
-    License(s):
-        EPL v2.0 (bundled/jersey-2.46/LICENSE.md)
-
diff --git a/doc/licenses/jersey-2.46/dep-coordinates.txt b/doc/licenses/jersey-2.46/dep-coordinates.txt
deleted file mode 100644
index 67aecd075..000000000
--- a/doc/licenses/jersey-2.46/dep-coordinates.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-org.glassfish.jersey.containers:jersey-container-servlet-core:jar:2.46
-org.glassfish.jersey.core:jersey-common:jar:2.46
-org.glassfish.jersey.core:jersey-server:jar:2.46
-org.glassfish.jersey.core:jersey-client:jar:2.46
-org.glassfish.jersey.inject:jersey-hk2:jar:2.46
-org.glassfish.jersey.media:jersey-media-json-jackson:jar:2.46
-org.glassfish.jersey.ext:jersey-entity-filtering:jar:2.46
diff --git a/doc/licenses/jersey-2.46/LICENSE.md b/doc/licenses/jersey/LICENSE.md
similarity index 99%
rename from doc/licenses/jersey-2.46/LICENSE.md
rename to doc/licenses/jersey/LICENSE.md
index 345fc37cc..81eaa0b10 100644
--- a/doc/licenses/jersey-2.46/LICENSE.md
+++ b/doc/licenses/jersey/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    Jersey
+# URL:     https://jersey.java.net/
+# From:    'Eclipse Foundation' (https://www.eclipse.org/)
+# License: EPL v2.0 
+#
+# --- BEGIN LICENSE FILE ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -635,3 +641,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jersey/dep-coordinates.txt b/doc/licenses/jersey/dep-coordinates.txt
new file mode 100644
index 000000000..e8d0d9273
--- /dev/null
+++ b/doc/licenses/jersey/dep-coordinates.txt
@@ -0,0 +1,7 @@
+org.glassfish.jersey.containers:jersey-container-servlet-core:jar:*
+org.glassfish.jersey.core:jersey-common:jar:*
+org.glassfish.jersey.core:jersey-server:jar:*
+org.glassfish.jersey.core:jersey-client:jar:*
+org.glassfish.jersey.inject:jersey-hk2:jar:*
+org.glassfish.jersey.media:jersey-media-json-jackson:jar:*
+org.glassfish.jersey.ext:jersey-entity-filtering:jar:*
diff --git a/doc/licenses/jetbrains-annotations-13.0/README b/doc/licenses/jetbrains-annotations-13.0/README
deleted file mode 100644
index e09618cab..000000000
--- a/doc/licenses/jetbrains-annotations-13.0/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Annotations for JVM-based languages
-(https://github.com/JetBrains/java-annotations)
------------------------------------------------
-
-    Version: 13.0
-    From: 'JetBrains s.r.o.' (http://www.jetbrains.com)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jetbrains-annotations-13.0/dep-coordinates.txt b/doc/licenses/jetbrains-annotations-13.0/dep-coordinates.txt
deleted file mode 100644
index bb558cd6c..000000000
--- a/doc/licenses/jetbrains-annotations-13.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains:annotations:jar:13.0
diff --git a/doc/licenses/jetbrains-annotations/LICENSE b/doc/licenses/jetbrains-annotations/LICENSE
new file mode 100644
index 000000000..869636c89
--- /dev/null
+++ b/doc/licenses/jetbrains-annotations/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Annotations for JVM-based languages
+# URL:     https://github.com/JetBrains/java-annotations
+# From:    'JetBrains s.r.o.' (http://www.jetbrains.com)
+# License: Apache v2.0
diff --git a/doc/licenses/jetbrains-annotations/dep-coordinates.txt b/doc/licenses/jetbrains-annotations/dep-coordinates.txt
new file mode 100644
index 000000000..984b46c13
--- /dev/null
+++ b/doc/licenses/jetbrains-annotations/dep-coordinates.txt
@@ -0,0 +1 @@
+org.jetbrains:annotations:jar:*
diff --git a/doc/licenses/joda-time-2.10.6/NOTICE b/doc/licenses/joda-time-2.10.6/NOTICE
deleted file mode 100644
index b8f54d7b2..000000000
--- a/doc/licenses/joda-time-2.10.6/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-This product includes software developed by
-Joda.org (https://www.joda.org/).
diff --git a/doc/licenses/joda-time-2.10.6/README b/doc/licenses/joda-time-2.10.6/README
deleted file mode 100644
index a10eaf616..000000000
--- a/doc/licenses/joda-time-2.10.6/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Joda-Time (https://www.joda.org/joda-time/)
-----------------------------------------------
-
-    Version: 2.10.6
-    From: 'Joda.org' (https://www.joda.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/joda-time-2.10.6/dep-coordinates.txt b/doc/licenses/joda-time-2.10.6/dep-coordinates.txt
deleted file mode 100644
index a210c5c6d..000000000
--- a/doc/licenses/joda-time-2.10.6/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-joda-time:joda-time:jar:2.10.6
diff --git a/doc/licenses/joda-time/NOTICE b/doc/licenses/joda-time/NOTICE
new file mode 100644
index 000000000..79518491b
--- /dev/null
+++ b/doc/licenses/joda-time/NOTICE
@@ -0,0 +1,9 @@
+# Name:    Joda-Time
+# URL:     https://www.joda.org/joda-time/
+# From:    'Joda.org' (https://www.joda.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+This product includes software developed by
+Joda.org (https://www.joda.org/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/joda-time/dep-coordinates.txt b/doc/licenses/joda-time/dep-coordinates.txt
new file mode 100644
index 000000000..bf18f3e36
--- /dev/null
+++ b/doc/licenses/joda-time/dep-coordinates.txt
@@ -0,0 +1 @@
+joda-time:joda-time:jar:*
diff --git a/doc/licenses/jose4j-0.9.6/README b/doc/licenses/jose4j-0.9.6/README
deleted file mode 100644
index d3e549cb5..000000000
--- a/doc/licenses/jose4j-0.9.6/README
+++ /dev/null
@@ -1,8 +0,0 @@
-jose.4.j (https://bitbucket.org/b_c/jose4j/)
---------------------------------------------
-
-    Version: 0.9.6
-    From: 'Brian Campbell' (https://bitbucket.org/b_c/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/jose4j-0.9.6/dep-coordinates.txt b/doc/licenses/jose4j-0.9.6/dep-coordinates.txt
deleted file mode 100644
index eca1c8a22..000000000
--- a/doc/licenses/jose4j-0.9.6/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.bitbucket.b_c:jose4j:jar:0.9.6
diff --git a/doc/licenses/jose4j-0.9.6/NOTICE b/doc/licenses/jose4j/NOTICE
similarity index 73%
rename from doc/licenses/jose4j-0.9.6/NOTICE
rename to doc/licenses/jose4j/NOTICE
index 57e9303e3..9d25c7792 100644
--- a/doc/licenses/jose4j-0.9.6/NOTICE
+++ b/doc/licenses/jose4j/NOTICE
@@ -1,3 +1,9 @@
+# Name:    jose.4.j
+# URL:     https://bitbucket.org/b_c/jose4j/
+# From:    'Brian Campbell' (https://bitbucket.org/b_c/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 jose4j
 Copyright 2012-2024 Brian Campbell
 
@@ -11,4 +17,4 @@ Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
 
 JSON processing in this software was derived from the JSON.simple toolkit.
 https://code.google.com/p/json-simple/
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jose4j/dep-coordinates.txt b/doc/licenses/jose4j/dep-coordinates.txt
new file mode 100644
index 000000000..c881f93b4
--- /dev/null
+++ b/doc/licenses/jose4j/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bitbucket.b_c:jose4j:jar:*
diff --git a/doc/licenses/jquery-3.7.1/README b/doc/licenses/jquery-3.7.1/README
deleted file mode 100644
index 5e5cec423..000000000
--- a/doc/licenses/jquery-3.7.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-jQuery (http://jquery.com/)
----------------------------
-
-    Version: 3.7.1
-    From: 'OpenJS Foundation' (https://openjsf.org/)
-    License(s):
-        MIT (bundled/jquery-3.7.1/LICENSE.txt)
-
diff --git a/doc/licenses/jquery-3.7.1/dep-coordinates.txt b/doc/licenses/jquery-3.7.1/dep-coordinates.txt
deleted file mode 100644
index 12b56f771..000000000
--- a/doc/licenses/jquery-3.7.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jquery:3.7.1
diff --git a/doc/licenses/jquery-3.7.1/LICENSE.txt b/doc/licenses/jquery/LICENSE.txt
similarity index 86%
rename from doc/licenses/jquery-3.7.1/LICENSE.txt
rename to doc/licenses/jquery/LICENSE.txt
index f642c3f7a..a8393c48b 100644
--- a/doc/licenses/jquery-3.7.1/LICENSE.txt
+++ b/doc/licenses/jquery/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    jQuery
+# URL:     http://jquery.com/
+# From:    'OpenJS Foundation' (https://openjsf.org/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jquery/dep-coordinates.txt b/doc/licenses/jquery/dep-coordinates.txt
new file mode 100644
index 000000000..8a1ba942b
--- /dev/null
+++ b/doc/licenses/jquery/dep-coordinates.txt
@@ -0,0 +1 @@
+jquery:*
diff --git a/doc/licenses/jradius-1.1.5/README b/doc/licenses/jradius-1.1.5/README
deleted file mode 100644
index 4d520963c..000000000
--- a/doc/licenses/jradius-1.1.5/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JRadius (https://github.com/coova/jradius)
-------------------------------------------
-
-    Version: 1.1.5
-    From: 'Coova Technologies, LLC' (https://coova.github.io)
-    License(s):
-        LGPL-2.1 (bundled/jradius-1.1.5/LICENSE)
-
diff --git a/doc/licenses/jradius-1.1.5/dep-coordinates.txt b/doc/licenses/jradius-1.1.5/dep-coordinates.txt
deleted file mode 100644
index 8beebb19e..000000000
--- a/doc/licenses/jradius-1.1.5/dep-coordinates.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-net.jradius:jradius-core:jar:1.1.5
-net.jradius:jradius-dictionary:jar:1.1.5
-net.jradius:jradius-extended:jar:1.1.5
diff --git a/doc/licenses/jradius-1.1.5/LICENSE b/doc/licenses/jradius/LICENSE
similarity index 99%
rename from doc/licenses/jradius-1.1.5/LICENSE
rename to doc/licenses/jradius/LICENSE
index ff1be90e2..5dc95689d 100644
--- a/doc/licenses/jradius-1.1.5/LICENSE
+++ b/doc/licenses/jradius/LICENSE
@@ -1,3 +1,9 @@
+# Name:    JRadius
+# URL:     https://github.com/coova/jradius
+# From:    'Coova Technologies, LLC' (https://coova.github.io)
+# License: LGPL v2.1 
+#
+# --- BEGIN LICENSE FILE ---
 ==========================================================================
 
 Coova JRadius License:
@@ -543,3 +549,4 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jradius/dep-coordinates.txt b/doc/licenses/jradius/dep-coordinates.txt
new file mode 100644
index 000000000..8269872bd
--- /dev/null
+++ b/doc/licenses/jradius/dep-coordinates.txt
@@ -0,0 +1,3 @@
+net.jradius:jradius-core:jar:*
+net.jradius:jradius-dictionary:jar:*
+net.jradius:jradius-extended:jar:*
diff --git a/doc/licenses/jsr250-api-1.0/README b/doc/licenses/jsr250-api-1.0/README
deleted file mode 100644
index a939af51e..000000000
--- a/doc/licenses/jsr250-api-1.0/README
+++ /dev/null
@@ -1,9 +0,0 @@
-JSR-250 Reference Implementation
-(https://jcp.org/aboutJava/communityprocess/final/jsr250/index.html)
---------------------------------------------------------------------
-
-    Version: 1.0
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        CDDL v1.0 (bundled/jsr250-api-1.0/CDDLv1.0.txt)
-
diff --git a/doc/licenses/jsr250-api-1.0/dep-coordinates.txt b/doc/licenses/jsr250-api-1.0/dep-coordinates.txt
deleted file mode 100644
index 0fce8f948..000000000
--- a/doc/licenses/jsr250-api-1.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-javax.annotation:jsr250-api:jar:1.0
diff --git a/doc/licenses/jsr250-api-1.0/CDDLv1.0.txt b/doc/licenses/jsr250-api/CDDLv1.0.txt
similarity index 98%
rename from doc/licenses/jsr250-api-1.0/CDDLv1.0.txt
rename to doc/licenses/jsr250-api/CDDLv1.0.txt
index 5f3844e85..793662dbc 100644
--- a/doc/licenses/jsr250-api-1.0/CDDLv1.0.txt
+++ b/doc/licenses/jsr250-api/CDDLv1.0.txt
@@ -1,3 +1,9 @@
+# Name:    JSR-250 Reference Implementation
+# URL:     https://jcp.org/aboutJava/communityprocess/final/jsr250/index.html
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: CDDL v1.0 
+#
+# --- BEGIN LICENSE FILE ---
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 
 1. Definitions.
@@ -114,6 +120,4 @@ As between Initial Developer and the Contributors, each party is responsible for
 
 NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
 The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. 
-
-
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jsr250-api/dep-coordinates.txt b/doc/licenses/jsr250-api/dep-coordinates.txt
new file mode 100644
index 000000000..e49b8704a
--- /dev/null
+++ b/doc/licenses/jsr250-api/dep-coordinates.txt
@@ -0,0 +1 @@
+javax.annotation:jsr250-api:jar:*
diff --git a/doc/licenses/jstz-2.1.1/README b/doc/licenses/jstz-2.1.1/README
deleted file mode 100644
index 09acbdec2..000000000
--- a/doc/licenses/jstz-2.1.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-JSTZ (https://github.com/iansinnott/jstz)
------------------------------------------
-
-    Version: 2.1.1
-    From: 'Jon Nylander' (https://github.com/pellepim)
-    License(s):
-        MIT (bundled/jstz-2.1.1/LICENSE)
-
diff --git a/doc/licenses/jstz-2.1.1/dep-coordinates.txt b/doc/licenses/jstz-2.1.1/dep-coordinates.txt
deleted file mode 100644
index 27701768c..000000000
--- a/doc/licenses/jstz-2.1.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-jstz:2.1.1
diff --git a/doc/licenses/jstz-2.1.1/LICENSE b/doc/licenses/jstz/LICENSE
similarity index 84%
rename from doc/licenses/jstz-2.1.1/LICENSE
rename to doc/licenses/jstz/LICENSE
index c48af16c6..7f5490d0c 100644
--- a/doc/licenses/jstz-2.1.1/LICENSE
+++ b/doc/licenses/jstz/LICENSE
@@ -1,3 +1,9 @@
+# Name:    JSTZ
+# URL:     https://github.com/iansinnott/jstz
+# From:    'Jon Nylander' (https://github.com/pellepim)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License 
 
 Copyright (c) 2012 Jon Nylander, project maintained at 
@@ -19,4 +25,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/jstz/dep-coordinates.txt b/doc/licenses/jstz/dep-coordinates.txt
new file mode 100644
index 000000000..9da27c528
--- /dev/null
+++ b/doc/licenses/jstz/dep-coordinates.txt
@@ -0,0 +1 @@
+jstz:*
diff --git a/doc/licenses/kotlin-1.4.10/NOTICE.txt b/doc/licenses/kotlin-1.4.10/NOTICE.txt
deleted file mode 100644
index 0f3e7c29d..000000000
--- a/doc/licenses/kotlin-1.4.10/NOTICE.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Kotlin Compiler
-Copyright 2010-2023 JetBrains s.r.o and respective authors and developers
diff --git a/doc/licenses/kotlin-1.4.10/README b/doc/licenses/kotlin-1.4.10/README
deleted file mode 100644
index a89a5ceea..000000000
--- a/doc/licenses/kotlin-1.4.10/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Kotlin (https://kotlinlang.org/)
---------------------------------
-
-    Version: 1.4.10
-    From: 'JetBrains s.r.o and respective authors and developers'
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/kotlin-1.4.10/dep-coordinates.txt b/doc/licenses/kotlin-1.4.10/dep-coordinates.txt
deleted file mode 100644
index 9eedc33fe..000000000
--- a/doc/licenses/kotlin-1.4.10/dep-coordinates.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-org.jetbrains.kotlin:kotlin-reflect:jar:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib:jar:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.4.10
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.4.10
diff --git a/doc/licenses/kotlin-1.9.25/NOTICE.txt b/doc/licenses/kotlin-1.9.25/NOTICE.txt
deleted file mode 100644
index 0f3e7c29d..000000000
--- a/doc/licenses/kotlin-1.9.25/NOTICE.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Kotlin Compiler
-Copyright 2010-2023 JetBrains s.r.o and respective authors and developers
diff --git a/doc/licenses/kotlin-1.9.25/README b/doc/licenses/kotlin-1.9.25/README
deleted file mode 100644
index 53a448a1a..000000000
--- a/doc/licenses/kotlin-1.9.25/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Kotlin (https://kotlinlang.org/)
---------------------------------
-
-    Version: 1.9.25
-    From: 'JetBrains s.r.o and respective authors and developers'
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/kotlin-1.9.25/dep-coordinates.txt b/doc/licenses/kotlin-1.9.25/dep-coordinates.txt
deleted file mode 100644
index d8221f907..000000000
--- a/doc/licenses/kotlin-1.9.25/dep-coordinates.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-org.jetbrains.kotlin:kotlin-reflect:jar:1.9.25
-org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.25
-org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.25
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.25
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.25
diff --git a/doc/licenses/kotlin/NOTICE.txt b/doc/licenses/kotlin/NOTICE.txt
new file mode 100644
index 000000000..050913f7b
--- /dev/null
+++ b/doc/licenses/kotlin/NOTICE.txt
@@ -0,0 +1,9 @@
+# Name:    Kotlin
+# URL:     https://kotlinlang.org/
+# From:    'JetBrains s.r.o and respective authors and developers'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Kotlin Compiler
+Copyright 2010-2023 JetBrains s.r.o and respective authors and developers
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/kotlin/dep-coordinates.txt b/doc/licenses/kotlin/dep-coordinates.txt
new file mode 100644
index 000000000..ca7afcbf5
--- /dev/null
+++ b/doc/licenses/kotlin/dep-coordinates.txt
@@ -0,0 +1,5 @@
+org.jetbrains.kotlin:kotlin-reflect:jar:*
+org.jetbrains.kotlin:kotlin-stdlib:jar:*
+org.jetbrains.kotlin:kotlin-stdlib-common:jar:*
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:*
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:*
diff --git a/doc/licenses/kotlinx-serialization-1.9.0/NOTICE.txt b/doc/licenses/kotlinx-serialization-1.9.0/NOTICE.txt
deleted file mode 100644
index 4560ea0ab..000000000
--- a/doc/licenses/kotlinx-serialization-1.9.0/NOTICE.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-kotlinx.serialization library.
-Copyright 2017-2023 JetBrains s.r.o and respective authors and developers
diff --git a/doc/licenses/kotlinx-serialization-1.9.0/README b/doc/licenses/kotlinx-serialization-1.9.0/README
deleted file mode 100644
index 2a0b0e982..000000000
--- a/doc/licenses/kotlinx-serialization-1.9.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization)
-----------------------------------------------------------------------
-
-    Version: 1.9.0
-    From: 'JetBrains s.r.o and respective authors and developers'
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/kotlinx-serialization-1.9.0/dep-coordinates.txt b/doc/licenses/kotlinx-serialization-1.9.0/dep-coordinates.txt
deleted file mode 100644
index 47ab20fe0..000000000
--- a/doc/licenses/kotlinx-serialization-1.9.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.9.0
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.9.0
diff --git a/doc/licenses/kotlinx-serialization/NOTICE.txt b/doc/licenses/kotlinx-serialization/NOTICE.txt
new file mode 100644
index 000000000..66d7415be
--- /dev/null
+++ b/doc/licenses/kotlinx-serialization/NOTICE.txt
@@ -0,0 +1,9 @@
+# Name:    Kotlin Serialization
+# URL:     https://github.com/Kotlin/kotlinx.serialization
+# From:    'JetBrains s.r.o and respective authors and developers'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+kotlinx.serialization library.
+Copyright 2017-2023 JetBrains s.r.o and respective authors and developers
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/kotlinx-serialization/dep-coordinates.txt b/doc/licenses/kotlinx-serialization/dep-coordinates.txt
new file mode 100644
index 000000000..b6d9aca35
--- /dev/null
+++ b/doc/licenses/kotlinx-serialization/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:*
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:*
diff --git a/doc/licenses/ksm-sdk-17.1.1/README b/doc/licenses/ksm-sdk-17.1.1/README
deleted file mode 100644
index ec676ea47..000000000
--- a/doc/licenses/ksm-sdk-17.1.1/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Keeper Secrets Manager Java SDK
-(https://github.com/Keeper-Security/secrets-manager)
-----------------------------------------------------
-
-    Version: 17.1.1
-    From: 'Keeper Security' (https://www.keepersecurity.com/)
-    License(s):
-        MIT (bundled/ksm-sdk-17.1.1/LICENSE)
-
diff --git a/doc/licenses/ksm-sdk-17.1.1/dep-coordinates.txt b/doc/licenses/ksm-sdk-17.1.1/dep-coordinates.txt
deleted file mode 100644
index ec260cdf4..000000000
--- a/doc/licenses/ksm-sdk-17.1.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.keepersecurity.secrets-manager:core:jar:17.1.1
diff --git a/doc/licenses/ksm-sdk-17.1.1/LICENSE b/doc/licenses/ksm-sdk/LICENSE
similarity index 81%
rename from doc/licenses/ksm-sdk-17.1.1/LICENSE
rename to doc/licenses/ksm-sdk/LICENSE
index b63322a17..2eebd4070 100644
--- a/doc/licenses/ksm-sdk-17.1.1/LICENSE
+++ b/doc/licenses/ksm-sdk/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Keeper Secrets Manager Java SDK
+# URL:     https://github.com/Keeper-Security/secrets-manager
+# From:    'Keeper Security' (https://www.keepersecurity.com/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) 2021 Keeper Security
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/ksm-sdk/dep-coordinates.txt b/doc/licenses/ksm-sdk/dep-coordinates.txt
new file mode 100644
index 000000000..0aae3c80b
--- /dev/null
+++ b/doc/licenses/ksm-sdk/dep-coordinates.txt
@@ -0,0 +1 @@
+com.keepersecurity.secrets-manager:core:jar:*
diff --git a/doc/licenses/lodash-4.17.21/README b/doc/licenses/lodash-4.17.21/README
deleted file mode 100644
index b37772599..000000000
--- a/doc/licenses/lodash-4.17.21/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Lodash (https://lodash.com/)
-----------------------------
-
-    Version: 4.17.21
-    From: 'OpenJS Foundation' (https://openjsf.org/)
-    License(s):
-        MIT (bundled/lodash-4.17.21/LICENSE)
-
diff --git a/doc/licenses/lodash-4.17.21/dep-coordinates.txt b/doc/licenses/lodash-4.17.21/dep-coordinates.txt
deleted file mode 100644
index 4f9188066..000000000
--- a/doc/licenses/lodash-4.17.21/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-lodash:4.17.21
diff --git a/doc/licenses/lodash-4.17.21/LICENSE b/doc/licenses/lodash/LICENSE
similarity index 91%
rename from doc/licenses/lodash-4.17.21/LICENSE
rename to doc/licenses/lodash/LICENSE
index 77c42f140..0fa9d5695 100644
--- a/doc/licenses/lodash-4.17.21/LICENSE
+++ b/doc/licenses/lodash/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Lodash
+# URL:     https://lodash.com/
+# From:    'OpenJS Foundation' (https://openjsf.org/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
 
 Based on Underscore.js, copyright Jeremy Ashkenas,
@@ -45,3 +51,4 @@ Files located in the node_modules and vendor directories are externally
 maintained libraries used by this software which have their own
 licenses; we recommend you read them, as their terms may differ from the
 terms above.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/lodash/dep-coordinates.txt b/doc/licenses/lodash/dep-coordinates.txt
new file mode 100644
index 000000000..8a370993a
--- /dev/null
+++ b/doc/licenses/lodash/dep-coordinates.txt
@@ -0,0 +1 @@
+lodash:*
diff --git a/doc/licenses/logback-1.3.15/README b/doc/licenses/logback-1.3.15/README
deleted file mode 100644
index 15c246374..000000000
--- a/doc/licenses/logback-1.3.15/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Logback (http://logback.qos.ch/)
---------------------------------
-
-    Version: 1.3.15
-    From: 'QOS.ch Sàrl' (http://qos.ch/)
-    License(s):
-        EPL v1.0 (bundled/logback-1.3.15/LICENSE.txt)
-
diff --git a/doc/licenses/logback-1.3.15/dep-coordinates.txt b/doc/licenses/logback-1.3.15/dep-coordinates.txt
deleted file mode 100644
index 6afe7bd87..000000000
--- a/doc/licenses/logback-1.3.15/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-ch.qos.logback:logback-classic:jar:1.3.15
-ch.qos.logback:logback-core:jar:1.3.15
diff --git a/doc/licenses/logback-1.3.15/LICENSE.txt b/doc/licenses/logback/LICENSE.txt
similarity index 74%
rename from doc/licenses/logback-1.3.15/LICENSE.txt
rename to doc/licenses/logback/LICENSE.txt
index ae6eeacaa..95fb659ae 100644
--- a/doc/licenses/logback-1.3.15/LICENSE.txt
+++ b/doc/licenses/logback/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    Logback
+# URL:     http://logback.qos.ch/
+# From:    'QOS.ch Sàrl' (http://qos.ch/)
+# License: EPL v1.0 
+#
+# --- BEGIN LICENSE FILE ---
 Logback LICENSE
 ---------------
 
@@ -14,4 +20,4 @@ under the terms of the GNU Lesser General Public License version 2.1
 as published by the Free Software Foundation.
 
 ** ECLIPSE PUBLIC LICENSE v1.0 CHOSEN. **
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/logback/dep-coordinates.txt b/doc/licenses/logback/dep-coordinates.txt
new file mode 100644
index 000000000..77346a3f4
--- /dev/null
+++ b/doc/licenses/logback/dep-coordinates.txt
@@ -0,0 +1,2 @@
+ch.qos.logback:logback-classic:jar:*
+ch.qos.logback:logback-core:jar:*
diff --git a/doc/licenses/logging-interceptor-4.9.1/README b/doc/licenses/logging-interceptor-4.9.1/README
deleted file mode 100644
index e6c30ced5..000000000
--- a/doc/licenses/logging-interceptor-4.9.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-OkHttp Logging Interceptor (https://square.github.io/okhttp/)
--------------------------------------------------------------
-
-    Version: 4.9.1
-    From: 'Square Inc'
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/logging-interceptor-4.9.1/dep-coordinates.txt b/doc/licenses/logging-interceptor-4.9.1/dep-coordinates.txt
deleted file mode 100644
index aeab28247..000000000
--- a/doc/licenses/logging-interceptor-4.9.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.squareup.okhttp3:logging-interceptor:jar:4.9.1
\ No newline at end of file
diff --git a/doc/licenses/logging-interceptor-4.9.1/NOTICE b/doc/licenses/logging-interceptor/NOTICE
similarity index 70%
rename from doc/licenses/logging-interceptor-4.9.1/NOTICE
rename to doc/licenses/logging-interceptor/NOTICE
index d8bff2eef..c2d4df4c2 100644
--- a/doc/licenses/logging-interceptor-4.9.1/NOTICE
+++ b/doc/licenses/logging-interceptor/NOTICE
@@ -1,3 +1,9 @@
+# Name:    OkHttp Logging Interceptor
+# URL:     https://square.github.io/okhttp/
+# From:    'Square Inc'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2019 Square, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -10,4 +16,5 @@ 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.
\ No newline at end of file
+limitations under the License.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/logging-interceptor/dep-coordinates.txt b/doc/licenses/logging-interceptor/dep-coordinates.txt
new file mode 100644
index 000000000..b0c95a032
--- /dev/null
+++ b/doc/licenses/logging-interceptor/dep-coordinates.txt
@@ -0,0 +1 @@
+com.squareup.okhttp3:logging-interceptor:jar:*
\ No newline at end of file
diff --git a/doc/licenses/make-plural-3.0.6/README b/doc/licenses/make-plural-3.0.6/README
deleted file mode 100644
index a4ddda5f1..000000000
--- a/doc/licenses/make-plural-3.0.6/README
+++ /dev/null
@@ -1,8 +0,0 @@
-make-plural (https://github.com/eemeli/make-plural)
----------------------------------------------------
-
-    Version: 3.0.6
-    From: 'Eemeli Aro' (https://github.com/eemeli)
-    License(s):
-        ISC (bundled/make-plural-3.0.6/LICENSE)
-
diff --git a/doc/licenses/make-plural-3.0.6/dep-coordinates.txt b/doc/licenses/make-plural-3.0.6/dep-coordinates.txt
deleted file mode 100644
index 600565046..000000000
--- a/doc/licenses/make-plural-3.0.6/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-make-plural:3.0.6
diff --git a/doc/licenses/make-plural-3.0.6/LICENSE b/doc/licenses/make-plural/LICENSE
similarity index 79%
rename from doc/licenses/make-plural-3.0.6/LICENSE
rename to doc/licenses/make-plural/LICENSE
index aca3d36a1..cf5b0001e 100644
--- a/doc/licenses/make-plural-3.0.6/LICENSE
+++ b/doc/licenses/make-plural/LICENSE
@@ -1,3 +1,9 @@
+# Name:    make-plural
+# URL:     https://github.com/eemeli/make-plural
+# From:    'Eemeli Aro' (https://github.com/eemeli)
+# License: ISC 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2014-2016 by Eemeli Aro <eemeli@gmail.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -11,3 +17,4 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/make-plural/dep-coordinates.txt b/doc/licenses/make-plural/dep-coordinates.txt
new file mode 100644
index 000000000..543ebda34
--- /dev/null
+++ b/doc/licenses/make-plural/dep-coordinates.txt
@@ -0,0 +1 @@
+make-plural:*
diff --git a/doc/licenses/messageformat-1.0.2/README b/doc/licenses/messageformat-1.0.2/README
deleted file mode 100644
index 9a9653f5e..000000000
--- a/doc/licenses/messageformat-1.0.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-messageformat ( (https://messageformat.github.io/)
---------------------------------------------------
-
-    Version: 1.0.2
-    From: 'Alex Sexton, Eemeli Aro, and Contributors'
-    License(s):
-        MIT (bundled/messageformat-1.0.2/LICENSE)
-
diff --git a/doc/licenses/messageformat-1.0.2/dep-coordinates.txt b/doc/licenses/messageformat-1.0.2/dep-coordinates.txt
deleted file mode 100644
index 09367ea0d..000000000
--- a/doc/licenses/messageformat-1.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-messageformat:1.0.2
diff --git a/doc/licenses/messageformat-parser-1.1.0/README b/doc/licenses/messageformat-parser-1.1.0/README
deleted file mode 100644
index bc9d12906..000000000
--- a/doc/licenses/messageformat-parser-1.1.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-messageformat-parser (https://messageformat.github.io/)
--------------------------------------------------------
-
-    Version: 1.1.0
-    From: 'Alex Sexton, Eemeli Aro, and Contributors'
-    License(s):
-        MIT (bundled/messageformat-parser-1.1.0/LICENSE)
-
diff --git a/doc/licenses/messageformat-parser-1.1.0/dep-coordinates.txt b/doc/licenses/messageformat-parser-1.1.0/dep-coordinates.txt
deleted file mode 100644
index c323029b3..000000000
--- a/doc/licenses/messageformat-parser-1.1.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-messageformat-parser:1.1.0
diff --git a/doc/licenses/messageformat-1.0.2/LICENSE b/doc/licenses/messageformat-parser/LICENSE
similarity index 84%
rename from doc/licenses/messageformat-1.0.2/LICENSE
rename to doc/licenses/messageformat-parser/LICENSE
index 6b9ea5b2e..96e2e9156 100644
--- a/doc/licenses/messageformat-1.0.2/LICENSE
+++ b/doc/licenses/messageformat-parser/LICENSE
@@ -1,3 +1,9 @@
+# Name:    messageformat-parser
+# URL:     https://messageformat.github.io/
+# From:    'Alex Sexton, Eemeli Aro, and Contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2012-2016 Alex Sexton, Eemeli Aro, and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/messageformat-parser/dep-coordinates.txt b/doc/licenses/messageformat-parser/dep-coordinates.txt
new file mode 100644
index 000000000..459ad86f3
--- /dev/null
+++ b/doc/licenses/messageformat-parser/dep-coordinates.txt
@@ -0,0 +1 @@
+messageformat-parser:*
diff --git a/doc/licenses/messageformat-parser-1.1.0/LICENSE b/doc/licenses/messageformat/LICENSE
similarity index 84%
rename from doc/licenses/messageformat-parser-1.1.0/LICENSE
rename to doc/licenses/messageformat/LICENSE
index 6b9ea5b2e..d5e062b97 100644
--- a/doc/licenses/messageformat-parser-1.1.0/LICENSE
+++ b/doc/licenses/messageformat/LICENSE
@@ -1,3 +1,9 @@
+# Name:    messageformat (
+# URL:     https://messageformat.github.io/
+# From:    'Alex Sexton, Eemeli Aro, and Contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2012-2016 Alex Sexton, Eemeli Aro, and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/messageformat/dep-coordinates.txt b/doc/licenses/messageformat/dep-coordinates.txt
new file mode 100644
index 000000000..72d820c31
--- /dev/null
+++ b/doc/licenses/messageformat/dep-coordinates.txt
@@ -0,0 +1 @@
+messageformat:*
diff --git a/doc/licenses/mybatis-3.5.19/README b/doc/licenses/mybatis-3.5.19/README
deleted file mode 100644
index e40f1f31e..000000000
--- a/doc/licenses/mybatis-3.5.19/README
+++ /dev/null
@@ -1,8 +0,0 @@
-MyBatis (http://www.mybatis.org/mybatis-3/)
--------------------------------------------
-
-    Version: 3.5.19
-    From: 'MyBatis' (http://www.mybatis.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/mybatis-3.5.19/dep-coordinates.txt b/doc/licenses/mybatis-3.5.19/dep-coordinates.txt
deleted file mode 100644
index 96066040f..000000000
--- a/doc/licenses/mybatis-3.5.19/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.mybatis:mybatis:jar:3.5.19
diff --git a/doc/licenses/mybatis-guice-3.18/README b/doc/licenses/mybatis-guice-3.18/README
deleted file mode 100644
index 9cc0c0ad4..000000000
--- a/doc/licenses/mybatis-guice-3.18/README
+++ /dev/null
@@ -1,8 +0,0 @@
-MyBatis-Guice (http://www.mybatis.org/guice/)
----------------------------------------------
-
-    Version: 3.18
-    From: 'MyBatis' (http://www.mybatis.org/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/mybatis-guice-3.18/dep-coordinates.txt b/doc/licenses/mybatis-guice-3.18/dep-coordinates.txt
deleted file mode 100644
index dbe919368..000000000
--- a/doc/licenses/mybatis-guice-3.18/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.mybatis:mybatis-guice:jar:3.18
diff --git a/doc/licenses/mybatis-guice-3.18/NOTICE b/doc/licenses/mybatis-guice/NOTICE
similarity index 64%
rename from doc/licenses/mybatis-guice-3.18/NOTICE
rename to doc/licenses/mybatis-guice/NOTICE
index 328bb03af..d37b4bb97 100644
--- a/doc/licenses/mybatis-guice-3.18/NOTICE
+++ b/doc/licenses/mybatis-guice/NOTICE
@@ -1,3 +1,9 @@
+# Name:    MyBatis-Guice
+# URL:     http://www.mybatis.org/guice/
+# From:    'MyBatis' (http://www.mybatis.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 MyBatis-Guice
 Copyright 2010-2013
 
@@ -12,4 +18,4 @@ iBATIS
 
 Google Guice
    Copyright 2010 The Apache Software Foundation
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/mybatis-guice/dep-coordinates.txt b/doc/licenses/mybatis-guice/dep-coordinates.txt
new file mode 100644
index 000000000..b0f58bcdc
--- /dev/null
+++ b/doc/licenses/mybatis-guice/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis-guice:jar:*
diff --git a/doc/licenses/mybatis-3.5.19/NOTICE b/doc/licenses/mybatis/NOTICE
similarity index 91%
rename from doc/licenses/mybatis-3.5.19/NOTICE
rename to doc/licenses/mybatis/NOTICE
index 35d17fd22..a8114c7ad 100644
--- a/doc/licenses/mybatis-3.5.19/NOTICE
+++ b/doc/licenses/mybatis/NOTICE
@@ -1,3 +1,9 @@
+# Name:    MyBatis
+# URL:     http://www.mybatis.org/mybatis-3/
+# From:    'MyBatis' (http://www.mybatis.org/)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 iBATIS
    This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
@@ -42,4 +48,4 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
    Adam Gent (https://gist.github.com/3650165)
 
    Copyright 2010 Adam Gent
-
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/mybatis/dep-coordinates.txt b/doc/licenses/mybatis/dep-coordinates.txt
new file mode 100644
index 000000000..cf19f4583
--- /dev/null
+++ b/doc/licenses/mybatis/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis:jar:*
diff --git a/doc/licenses/object-assign-4.1.1/README b/doc/licenses/object-assign-4.1.1/README
deleted file mode 100644
index 1ec09f632..000000000
--- a/doc/licenses/object-assign-4.1.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-object-assign (https://github.com/sindresorhus/object-assign/)
---------------------------------------------------------------
-
-    Version: 4.1.1
-    From: 'Sindre Sorhus' (https://github.com/sindresorhus)
-    License(s):
-        MIT (bundled/open-assign-4.1.1/LICENSE)
-
diff --git a/doc/licenses/object-assign-4.1.1/dep-coordinates.txt b/doc/licenses/object-assign-4.1.1/dep-coordinates.txt
deleted file mode 100644
index 4924590cd..000000000
--- a/doc/licenses/object-assign-4.1.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-object-assign:4.1.1
diff --git a/doc/licenses/object-assign-4.1.1/LICENSE b/doc/licenses/object-assign/LICENSE
similarity index 83%
rename from doc/licenses/object-assign-4.1.1/LICENSE
rename to doc/licenses/object-assign/LICENSE
index 654d0bfe9..b0226e762 100644
--- a/doc/licenses/object-assign-4.1.1/LICENSE
+++ b/doc/licenses/object-assign/LICENSE
@@ -1,3 +1,9 @@
+# Name:    object-assign
+# URL:     https://github.com/sindresorhus/object-assign/
+# From:    'Sindre Sorhus' (https://github.com/sindresorhus)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/object-assign/dep-coordinates.txt b/doc/licenses/object-assign/dep-coordinates.txt
new file mode 100644
index 000000000..4d9760ac1
--- /dev/null
+++ b/doc/licenses/object-assign/dep-coordinates.txt
@@ -0,0 +1 @@
+object-assign:*
diff --git a/doc/licenses/okhttp-4.12.0/README b/doc/licenses/okhttp-4.12.0/README
deleted file mode 100644
index 54aee2549..000000000
--- a/doc/licenses/okhttp-4.12.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-OkHttp (https://square.github.io/okhttp/)
------------------------------------------
-
-    Version: 4.12.0
-    From: 'Square Inc'
-    License(s):
-        Apache 2.0
-
diff --git a/doc/licenses/okhttp-4.12.0/dep-coordinates.txt b/doc/licenses/okhttp-4.12.0/dep-coordinates.txt
deleted file mode 100644
index 8aeb660e8..000000000
--- a/doc/licenses/okhttp-4.12.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-com.squareup.okhttp3:okhttp:jar:4.12.0
-com.squareup.okhttp3:logging-interceptor:jar:4.12.0
diff --git a/doc/licenses/okhttp-4.12.0/NOTICE b/doc/licenses/okhttp/NOTICE
similarity index 76%
rename from doc/licenses/okhttp-4.12.0/NOTICE
rename to doc/licenses/okhttp/NOTICE
index 7ab6fba62..d8fd49b8b 100644
--- a/doc/licenses/okhttp-4.12.0/NOTICE
+++ b/doc/licenses/okhttp/NOTICE
@@ -1,3 +1,9 @@
+# Name:    OkHttp
+# URL:     https://square.github.io/okhttp/
+# From:    'Square Inc'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2021 Square, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,3 +17,4 @@ 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.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/okhttp/dep-coordinates.txt b/doc/licenses/okhttp/dep-coordinates.txt
new file mode 100644
index 000000000..2df9bd322
--- /dev/null
+++ b/doc/licenses/okhttp/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.squareup.okhttp3:okhttp:jar:*
+com.squareup.okhttp3:logging-interceptor:jar:*
diff --git a/doc/licenses/okio-3.6.0/README b/doc/licenses/okio-3.6.0/README
deleted file mode 100644
index 23b519783..000000000
--- a/doc/licenses/okio-3.6.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Okio (https://square.github.io/okio/)
--------------------------------------
-
-    Version: 3.6.0
-    From: 'Square Inc'
-    License(s):
-        Apache 2.0
-
diff --git a/doc/licenses/okio-3.6.0/dep-coordinates.txt b/doc/licenses/okio-3.6.0/dep-coordinates.txt
deleted file mode 100644
index b785b2613..000000000
--- a/doc/licenses/okio-3.6.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-com.squareup.okio:okio:jar:3.6.0
-com.squareup.okio:okio-jvm:jar:3.6.0
diff --git a/doc/licenses/okio-3.6.0/NOTICE b/doc/licenses/okio/NOTICE
similarity index 77%
rename from doc/licenses/okio-3.6.0/NOTICE
rename to doc/licenses/okio/NOTICE
index 9004e5d83..0a32244f9 100644
--- a/doc/licenses/okio-3.6.0/NOTICE
+++ b/doc/licenses/okio/NOTICE
@@ -1,3 +1,9 @@
+# Name:    Okio
+# URL:     https://square.github.io/okio/
+# From:    'Square Inc'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2020 Square, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,3 +17,4 @@ 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.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/okio/dep-coordinates.txt b/doc/licenses/okio/dep-coordinates.txt
new file mode 100644
index 000000000..dadd1ec1f
--- /dev/null
+++ b/doc/licenses/okio/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.squareup.okio:okio:jar:*
+com.squareup.okio:okio-jvm:jar:*
diff --git a/doc/licenses/osgi-resource-locator-1.0.3/README b/doc/licenses/osgi-resource-locator-1.0.3/README
deleted file mode 100644
index f4e2694f3..000000000
--- a/doc/licenses/osgi-resource-locator-1.0.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-HK2 OSGi resource locator (https://github.com/eclipse-ee4j/glassfish-hk2-extra)
--------------------------------------------------------------------------------
-
-    Version: 1.0.3
-    From: 'Oracle Corporation' (http://www.oracle.com/)
-    License(s):
-        EPL v2.0 (bundled/osgi-resource-locator-1.0.3/LICENSE.md)
-
diff --git a/doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt b/doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt
deleted file mode 100644
index b8a60a55c..000000000
--- a/doc/licenses/osgi-resource-locator-1.0.3/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.glassfish.hk2:osgi-resource-locator:jar:1.0.3
diff --git a/doc/licenses/osgi-resource-locator-1.0.3/LICENSE.md b/doc/licenses/osgi-resource-locator/LICENSE.md
similarity index 97%
rename from doc/licenses/osgi-resource-locator-1.0.3/LICENSE.md
rename to doc/licenses/osgi-resource-locator/LICENSE.md
index 4f38d0934..0f39745e0 100644
--- a/doc/licenses/osgi-resource-locator-1.0.3/LICENSE.md
+++ b/doc/licenses/osgi-resource-locator/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    HK2 OSGi resource locator
+# URL:     https://github.com/eclipse-ee4j/glassfish-hk2-extra
+# From:    'Oracle Corporation' (http://www.oracle.com/)
+# License: EPL v2.0 
+#
+# --- BEGIN LICENSE FILE ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -635,3 +641,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/osgi-resource-locator/dep-coordinates.txt b/doc/licenses/osgi-resource-locator/dep-coordinates.txt
new file mode 100644
index 000000000..6a2dc43ff
--- /dev/null
+++ b/doc/licenses/osgi-resource-locator/dep-coordinates.txt
@@ -0,0 +1 @@
+org.glassfish.hk2:osgi-resource-locator:jar:*
diff --git a/doc/licenses/pickr-1.8.2/README b/doc/licenses/pickr-1.8.2/README
deleted file mode 100644
index 009387d76..000000000
--- a/doc/licenses/pickr-1.8.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Pickr (https://simonwep.github.io/pickr/)
------------------------------------------
-
-    Version: 1.8.2
-    From: 'Simon Reinisch' (https://github.com/Simonwep/)
-    License(s):
-        MIT (bundled/pickr-1.8.2/LICENSE)
-
diff --git a/doc/licenses/pickr-1.8.2/dep-coordinates.txt b/doc/licenses/pickr-1.8.2/dep-coordinates.txt
deleted file mode 100644
index aea9a778c..000000000
--- a/doc/licenses/pickr-1.8.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-@simonwep/pickr:1.8.2
diff --git a/doc/licenses/pickr-1.8.2/LICENSE b/doc/licenses/pickr/LICENSE
similarity index 84%
rename from doc/licenses/pickr-1.8.2/LICENSE
rename to doc/licenses/pickr/LICENSE
index 0f97438a9..95dadd63f 100644
--- a/doc/licenses/pickr-1.8.2/LICENSE
+++ b/doc/licenses/pickr/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Pickr
+# URL:     https://simonwep.github.io/pickr/
+# From:    'Simon Reinisch' (https://github.com/Simonwep/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) 2018 - 2021 Simon Reinisch
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/pickr/dep-coordinates.txt b/doc/licenses/pickr/dep-coordinates.txt
new file mode 100644
index 000000000..255ebbbc5
--- /dev/null
+++ b/doc/licenses/pickr/dep-coordinates.txt
@@ -0,0 +1 @@
+@simonwep/pickr:*
diff --git a/doc/licenses/process-0.11.10/README b/doc/licenses/process-0.11.10/README
deleted file mode 100644
index 450a92495..000000000
--- a/doc/licenses/process-0.11.10/README
+++ /dev/null
@@ -1,8 +0,0 @@
-process (https://github.com/defunctzombie/node-process/)
---------------------------------------------------------
-
-    Version: 0.11.10
-    From: 'Roman Shtylman' (https://github.com/defunctzombie)
-    License(s):
-        MIT (bundled/process-0.11.10/LICENSE)
-
diff --git a/doc/licenses/process-0.11.10/dep-coordinates.txt b/doc/licenses/process-0.11.10/dep-coordinates.txt
deleted file mode 100644
index 0fff96774..000000000
--- a/doc/licenses/process-0.11.10/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-process:0.11.10
diff --git a/doc/licenses/process-nextick-args-2.0.1/README b/doc/licenses/process-nextick-args-2.0.1/README
deleted file mode 100644
index 84417dcce..000000000
--- a/doc/licenses/process-nextick-args-2.0.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-process-nextick-args (https://github.com/calvinmetcalf/process-nextick-args)
----------------------------------------------
-
-    Version: 2.0.1
-    From: 'Calvin Metcalf' (https://github.com/calvinmetcalf)
-    License(s):
-        MIT (bundled/process-nextick-args-2.0.1/license.md)
-
diff --git a/doc/licenses/process-nextick-args-2.0.1/dep-coordinates.txt b/doc/licenses/process-nextick-args-2.0.1/dep-coordinates.txt
deleted file mode 100644
index 7c68c4b48..000000000
--- a/doc/licenses/process-nextick-args-2.0.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-process-nextick-args:2.0.1
diff --git a/doc/licenses/process-nextick-args/dep-coordinates.txt b/doc/licenses/process-nextick-args/dep-coordinates.txt
new file mode 100644
index 000000000..f4c7239e9
--- /dev/null
+++ b/doc/licenses/process-nextick-args/dep-coordinates.txt
@@ -0,0 +1 @@
+process-nextick-args:*
diff --git a/doc/licenses/process-nextick-args-2.0.1/license.md b/doc/licenses/process-nextick-args/license.md
similarity index 82%
rename from doc/licenses/process-nextick-args-2.0.1/license.md
rename to doc/licenses/process-nextick-args/license.md
index c67e3532b..761ee4286 100644
--- a/doc/licenses/process-nextick-args-2.0.1/license.md
+++ b/doc/licenses/process-nextick-args/license.md
@@ -1,3 +1,9 @@
+# Name:    process-nextick-args
+# URL:     https://github.com/calvinmetcalf/process-nextick-args
+# From:    'Calvin Metcalf' (https://github.com/calvinmetcalf)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 # Copyright (c) 2015 Calvin Metcalf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +23,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.**
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/process-0.11.10/LICENSE b/doc/licenses/process/LICENSE
similarity index 83%
rename from doc/licenses/process-0.11.10/LICENSE
rename to doc/licenses/process/LICENSE
index b8c1246cf..521586024 100644
--- a/doc/licenses/process-0.11.10/LICENSE
+++ b/doc/licenses/process/LICENSE
@@ -1,3 +1,9 @@
+# Name:    process
+# URL:     https://github.com/defunctzombie/node-process/
+# From:    'Roman Shtylman' (https://github.com/defunctzombie)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 (The MIT License)
 
 Copyright (c) 2013 Roman Shtylman <shtylman@gmail.com>
@@ -20,3 +26,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/process/dep-coordinates.txt b/doc/licenses/process/dep-coordinates.txt
new file mode 100644
index 000000000..cc3897cd1
--- /dev/null
+++ b/doc/licenses/process/dep-coordinates.txt
@@ -0,0 +1 @@
+process:*
diff --git a/doc/licenses/readable-stream-2.3.7/README b/doc/licenses/readable-stream-2.3.7/README
deleted file mode 100644
index 6e09569c1..000000000
--- a/doc/licenses/readable-stream-2.3.7/README
+++ /dev/null
@@ -1,8 +0,0 @@
-readable-stream (https://github.com/nodejs/readable-stream)
----------------------------------------------
-
-    Version: 2.3.7
-    From: 'Node.js contributors, Joyent, Inc., and other Node contributors'
-    License(s):
-        MIT (bundled/readable-stream-2.3.7/LICENSE)
-
diff --git a/doc/licenses/readable-stream-2.3.7/dep-coordinates.txt b/doc/licenses/readable-stream-2.3.7/dep-coordinates.txt
deleted file mode 100644
index f645a21bb..000000000
--- a/doc/licenses/readable-stream-2.3.7/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-readable-stream:2.3.7
diff --git a/doc/licenses/readable-stream-2.3.7/LICENSE b/doc/licenses/readable-stream/LICENSE
similarity index 91%
rename from doc/licenses/readable-stream-2.3.7/LICENSE
rename to doc/licenses/readable-stream/LICENSE
index 2873b3b2e..5d4d3ebb0 100644
--- a/doc/licenses/readable-stream-2.3.7/LICENSE
+++ b/doc/licenses/readable-stream/LICENSE
@@ -1,3 +1,9 @@
+# Name:    readable-stream
+# URL:     https://github.com/nodejs/readable-stream
+# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Node.js is licensed for use as follows:
 
 """
@@ -45,3 +51,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 """
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/readable-stream/dep-coordinates.txt b/doc/licenses/readable-stream/dep-coordinates.txt
new file mode 100644
index 000000000..47c1abf10
--- /dev/null
+++ b/doc/licenses/readable-stream/dep-coordinates.txt
@@ -0,0 +1 @@
+readable-stream:*
diff --git a/doc/licenses/reserved-words-0.1.2/README b/doc/licenses/reserved-words-0.1.2/README
deleted file mode 100644
index 34eb13d12..000000000
--- a/doc/licenses/reserved-words-0.1.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-reserved-words (https://github.com/qfox/reserved-words/)
---------------------------------------------------------
-
-    Version: 0.1.2
-    From: 'Alexej Yaroshevich and other contributors'
-    License(s):
-        MIT (bundled/reserved-words-0.1.2/LICENSE)
-
diff --git a/doc/licenses/reserved-words-0.1.2/dep-coordinates.txt b/doc/licenses/reserved-words-0.1.2/dep-coordinates.txt
deleted file mode 100644
index aa36d4985..000000000
--- a/doc/licenses/reserved-words-0.1.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-reserved-words:0.1.2
diff --git a/doc/licenses/reserved-words-0.1.2/LICENSE b/doc/licenses/reserved-words/LICENSE
similarity index 84%
rename from doc/licenses/reserved-words-0.1.2/LICENSE
rename to doc/licenses/reserved-words/LICENSE
index dcf4fc843..6d5a535a9 100644
--- a/doc/licenses/reserved-words-0.1.2/LICENSE
+++ b/doc/licenses/reserved-words/LICENSE
@@ -1,3 +1,9 @@
+# Name:    reserved-words
+# URL:     https://github.com/qfox/reserved-words/
+# From:    'Alexej Yaroshevich and other contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright 2015 Alexej Yaroshevich and other contributors
@@ -20,3 +26,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/reserved-words/dep-coordinates.txt b/doc/licenses/reserved-words/dep-coordinates.txt
new file mode 100644
index 000000000..163108812
--- /dev/null
+++ b/doc/licenses/reserved-words/dep-coordinates.txt
@@ -0,0 +1 @@
+reserved-words:*
diff --git a/doc/licenses/retrofit-2.11.0/README b/doc/licenses/retrofit-2.11.0/README
deleted file mode 100644
index f677937ef..000000000
--- a/doc/licenses/retrofit-2.11.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Retrofit (https://square.github.io/retrofit/)
----------------------------------------------
-
-    Version: 2.11.0
-    From: 'Square Inc'
-    License(s):
-        Apache 2.0
-
diff --git a/doc/licenses/retrofit-2.11.0/dep-coordinates.txt b/doc/licenses/retrofit-2.11.0/dep-coordinates.txt
deleted file mode 100644
index b638d7491..000000000
--- a/doc/licenses/retrofit-2.11.0/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-com.squareup.retrofit2:retrofit:jar:2.11.0
-com.squareup.retrofit2:converter-jackson:jar:2.11.0
diff --git a/doc/licenses/retrofit-2.11.0/NOTICE b/doc/licenses/retrofit/NOTICE
similarity index 76%
rename from doc/licenses/retrofit-2.11.0/NOTICE
rename to doc/licenses/retrofit/NOTICE
index 0bf6b9f8e..ae0dee684 100644
--- a/doc/licenses/retrofit-2.11.0/NOTICE
+++ b/doc/licenses/retrofit/NOTICE
@@ -1,3 +1,9 @@
+# Name:    Retrofit
+# URL:     https://square.github.io/retrofit/
+# From:    'Square Inc'
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2013 Square, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,3 +17,4 @@ 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.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/retrofit/dep-coordinates.txt b/doc/licenses/retrofit/dep-coordinates.txt
new file mode 100644
index 000000000..6334c8a52
--- /dev/null
+++ b/doc/licenses/retrofit/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.squareup.retrofit2:retrofit:jar:*
+com.squareup.retrofit2:converter-jackson:jar:*
diff --git a/doc/licenses/safe-buffer-5.1.2/README b/doc/licenses/safe-buffer-5.1.2/README
deleted file mode 100644
index 26cf5dc2f..000000000
--- a/doc/licenses/safe-buffer-5.1.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-safe-buffer (https://github.com/feross/safe-buffer)
----------------------------------------------
-
-    Version: 5.1.2
-    From: 'Feross Aboukhadijeh' (https://github.com/feross)
-    License(s):
-        MIT (bundled/safe-buffer-5.1.2/LICENSE)
-
diff --git a/doc/licenses/safe-buffer-5.1.2/dep-coordinates.txt b/doc/licenses/safe-buffer-5.1.2/dep-coordinates.txt
deleted file mode 100644
index 594ab08c8..000000000
--- a/doc/licenses/safe-buffer-5.1.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-safe-buffer:5.1.2
diff --git a/doc/licenses/safe-buffer-5.1.2/LICENSE b/doc/licenses/safe-buffer/LICENSE
similarity index 83%
rename from doc/licenses/safe-buffer-5.1.2/LICENSE
rename to doc/licenses/safe-buffer/LICENSE
index 0c068ceec..8533ed779 100644
--- a/doc/licenses/safe-buffer-5.1.2/LICENSE
+++ b/doc/licenses/safe-buffer/LICENSE
@@ -1,3 +1,9 @@
+# Name:    safe-buffer
+# URL:     https://github.com/feross/safe-buffer
+# From:    'Feross Aboukhadijeh' (https://github.com/feross)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) Feross Aboukhadijeh
@@ -19,3 +25,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/safe-buffer/dep-coordinates.txt b/doc/licenses/safe-buffer/dep-coordinates.txt
new file mode 100644
index 000000000..cc40c73e8
--- /dev/null
+++ b/doc/licenses/safe-buffer/dep-coordinates.txt
@@ -0,0 +1 @@
+safe-buffer:*
diff --git a/doc/licenses/setimmediate-1.0.5/README b/doc/licenses/setimmediate-1.0.5/README
deleted file mode 100644
index 8bd3389be..000000000
--- a/doc/licenses/setimmediate-1.0.5/README
+++ /dev/null
@@ -1,8 +0,0 @@
-setImmediate.js (https://github.com/YuzuJS/setImmediate)
----------------------------------------------
-
-    Version: 1.0.5
-    From: 'Yuzu (by Barnes & Noble Education)' (https://github.com/YuzuJS)
-    License(s):
-        MIT (bundled/setimmediate-1.0.5/LICENSE.txt)
-
diff --git a/doc/licenses/setimmediate-1.0.5/dep-coordinates.txt b/doc/licenses/setimmediate-1.0.5/dep-coordinates.txt
deleted file mode 100644
index d2111b4e0..000000000
--- a/doc/licenses/setimmediate-1.0.5/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-setimmediate:1.0.5
diff --git a/doc/licenses/setimmediate-1.0.5/LICENSE.txt b/doc/licenses/setimmediate/LICENSE.txt
similarity index 82%
rename from doc/licenses/setimmediate-1.0.5/LICENSE.txt
rename to doc/licenses/setimmediate/LICENSE.txt
index 32b20de6a..19cceaffb 100644
--- a/doc/licenses/setimmediate-1.0.5/LICENSE.txt
+++ b/doc/licenses/setimmediate/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    setImmediate.js
+# URL:     https://github.com/YuzuJS/setImmediate
+# From:    'Yuzu (by Barnes & Noble Education)' (https://github.com/YuzuJS)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2012 Barnesandnoble.com, llc, Donavon West, and Domenic Denicola
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/setimmediate/dep-coordinates.txt b/doc/licenses/setimmediate/dep-coordinates.txt
new file mode 100644
index 000000000..43d2c2222
--- /dev/null
+++ b/doc/licenses/setimmediate/dep-coordinates.txt
@@ -0,0 +1 @@
+setimmediate:*
diff --git a/doc/licenses/slf4j-api-2.0.17/README b/doc/licenses/slf4j-api-2.0.17/README
deleted file mode 100644
index db260595f..000000000
--- a/doc/licenses/slf4j-api-2.0.17/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Simple Logging Facade for Java (http://slf4j.org/)
---------------------------------------------------
-
-    Version: 2.0.17
-    From: 'QOS.ch Sàrl' (http://qos.ch/)
-    License(s):
-        MIT (bundled/slf4j-api-2.0.17/LICENSE.txt)
-
diff --git a/doc/licenses/slf4j-api-2.0.17/dep-coordinates.txt b/doc/licenses/slf4j-api-2.0.17/dep-coordinates.txt
deleted file mode 100644
index cc3ad97c2..000000000
--- a/doc/licenses/slf4j-api-2.0.17/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-org.slf4j:jul-to-slf4j:jar:2.0.17
-org.slf4j:slf4j-api:jar:2.0.17
diff --git a/doc/licenses/slf4j-api-2.0.17/LICENSE.txt b/doc/licenses/slf4j-api/LICENSE.txt
similarity index 86%
rename from doc/licenses/slf4j-api-2.0.17/LICENSE.txt
rename to doc/licenses/slf4j-api/LICENSE.txt
index a4b1bf9cb..e09f334b2 100644
--- a/doc/licenses/slf4j-api-2.0.17/LICENSE.txt
+++ b/doc/licenses/slf4j-api/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    Simple Logging Facade for Java
+# URL:     http://slf4j.org/
+# From:    'QOS.ch Sàrl' (http://qos.ch/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2004-2024 QOS.ch Sarl (Switzerland)
 All rights reserved.
 
@@ -19,3 +25,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/slf4j-api/dep-coordinates.txt b/doc/licenses/slf4j-api/dep-coordinates.txt
new file mode 100644
index 000000000..fb0fac8a9
--- /dev/null
+++ b/doc/licenses/slf4j-api/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.slf4j:jul-to-slf4j:jar:*
+org.slf4j:slf4j-api:jar:*
diff --git a/doc/licenses/snakeyaml-2.4/README b/doc/licenses/snakeyaml-2.4/README
deleted file mode 100644
index 7ed8a7009..000000000
--- a/doc/licenses/snakeyaml-2.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/
------------------------------------------------------
-
-    Version: 2.4
-    From: 'Andrey Somov' (https://bitbucket.org/asomov/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/snakeyaml-2.4/dep-coordinates.txt b/doc/licenses/snakeyaml-2.4/dep-coordinates.txt
deleted file mode 100644
index 68c718a0d..000000000
--- a/doc/licenses/snakeyaml-2.4/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.yaml:snakeyaml:jar:2.4
diff --git a/doc/licenses/snakeyaml/LICENSE b/doc/licenses/snakeyaml/LICENSE
new file mode 100644
index 000000000..b96a62ffa
--- /dev/null
+++ b/doc/licenses/snakeyaml/LICENSE
@@ -0,0 +1,4 @@
+# Name:    SnakeYAML 
+# URL:     https://bitbucket.org/snakeyaml/snakeyaml
+# From:    'Andrey Somov' (https://bitbucket.org/asomov/)
+# License: Apache v2.0
diff --git a/doc/licenses/snakeyaml/dep-coordinates.txt b/doc/licenses/snakeyaml/dep-coordinates.txt
new file mode 100644
index 000000000..366412f00
--- /dev/null
+++ b/doc/licenses/snakeyaml/dep-coordinates.txt
@@ -0,0 +1 @@
+org.yaml:snakeyaml:jar:*
diff --git a/doc/licenses/spring-framework-3.0.5/README b/doc/licenses/spring-framework-3.0.5/README
deleted file mode 100644
index a7c18475e..000000000
--- a/doc/licenses/spring-framework-3.0.5/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Spring Framework (https://spring.io/projects/spring-framework)
---------------------------------------------------------------
-
-    Version: 3.0.5
-    From: 'Spring' (https://spring.io/)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/spring-framework-3.0.5/dep-coordinates.txt b/doc/licenses/spring-framework-3.0.5/dep-coordinates.txt
deleted file mode 100644
index 51b29f132..000000000
--- a/doc/licenses/spring-framework-3.0.5/dep-coordinates.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-org.springframework:spring-aop:jar:3.0.5.RELEASE
-org.springframework:spring-asm:jar:3.0.5.RELEASE
-org.springframework:spring-beans:jar:3.0.5.RELEASE
-org.springframework:spring-context:jar:3.0.5.RELEASE
-org.springframework:spring-core:jar:3.0.5.RELEASE
-org.springframework:spring-expression:jar:3.0.5.RELEASE
diff --git a/doc/licenses/spring-framework/LICENSE b/doc/licenses/spring-framework/LICENSE
new file mode 100644
index 000000000..c3edbf4dc
--- /dev/null
+++ b/doc/licenses/spring-framework/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Spring Framework
+# URL:     https://spring.io/projects/spring-framework
+# From:    'Spring' (https://spring.io/)
+# License: Apache v2.0
diff --git a/doc/licenses/spring-framework/dep-coordinates.txt b/doc/licenses/spring-framework/dep-coordinates.txt
new file mode 100644
index 000000000..2e107e990
--- /dev/null
+++ b/doc/licenses/spring-framework/dep-coordinates.txt
@@ -0,0 +1,6 @@
+org.springframework:spring-aop:jar:*
+org.springframework:spring-asm:jar:*
+org.springframework:spring-beans:jar:*
+org.springframework:spring-context:jar:*
+org.springframework:spring-core:jar:*
+org.springframework:spring-expression:jar:*
diff --git a/doc/licenses/stream-browserify-2.0.2/README b/doc/licenses/stream-browserify-2.0.2/README
deleted file mode 100644
index 4116876af..000000000
--- a/doc/licenses/stream-browserify-2.0.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-stream-browserify (https://github.com/browserify/stream-browserify)
----------------------------------------------
-
-    Version: 2.0.2
-    From: 'James Halliday'
-    License(s):
-        MIT (bundled/stream-browserify-2.0.2/LICENSE)
-
diff --git a/doc/licenses/stream-browserify-2.0.2/dep-coordinates.txt b/doc/licenses/stream-browserify-2.0.2/dep-coordinates.txt
deleted file mode 100644
index 7bc88e94d..000000000
--- a/doc/licenses/stream-browserify-2.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-stream-browserify:2.0.2
diff --git a/doc/licenses/stream-browserify-2.0.2/LICENSE b/doc/licenses/stream-browserify/LICENSE
similarity index 84%
rename from doc/licenses/stream-browserify-2.0.2/LICENSE
rename to doc/licenses/stream-browserify/LICENSE
index 3e7d0c01e..585b8ddd0 100644
--- a/doc/licenses/stream-browserify-2.0.2/LICENSE
+++ b/doc/licenses/stream-browserify/LICENSE
@@ -1,3 +1,9 @@
+# Name:    stream-browserify
+# URL:     https://github.com/browserify/stream-browserify
+# From:    'James Halliday'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 MIT License
 
 Copyright (c) James Halliday
@@ -18,3 +24,4 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/stream-browserify/dep-coordinates.txt b/doc/licenses/stream-browserify/dep-coordinates.txt
new file mode 100644
index 000000000..4f19a63d5
--- /dev/null
+++ b/doc/licenses/stream-browserify/dep-coordinates.txt
@@ -0,0 +1 @@
+stream-browserify:*
diff --git a/doc/licenses/string_decoder-1.1.1/README b/doc/licenses/string_decoder-1.1.1/README
deleted file mode 100644
index 48ee14c03..000000000
--- a/doc/licenses/string_decoder-1.1.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-string_decoder (https://github.com/nodejs/string_decoder)
----------------------------------------------
-
-    Version: 1.1.1
-    From: 'Node.js contributors, Joyent, Inc., and other Node contributors'
-    License(s):
-        MIT (bundled/string_decoder-1.1.1/LICENSE)
-
diff --git a/doc/licenses/string_decoder-1.1.1/dep-coordinates.txt b/doc/licenses/string_decoder-1.1.1/dep-coordinates.txt
deleted file mode 100644
index bbdc75db5..000000000
--- a/doc/licenses/string_decoder-1.1.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-string_decoder:1.1.1
diff --git a/doc/licenses/string_decoder-1.1.1/LICENSE b/doc/licenses/string_decoder/LICENSE
similarity index 91%
rename from doc/licenses/string_decoder-1.1.1/LICENSE
rename to doc/licenses/string_decoder/LICENSE
index 2873b3b2e..f40ea6abc 100644
--- a/doc/licenses/string_decoder-1.1.1/LICENSE
+++ b/doc/licenses/string_decoder/LICENSE
@@ -1,3 +1,9 @@
+# Name:    string_decoder
+# URL:     https://github.com/nodejs/string_decoder
+# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Node.js is licensed for use as follows:
 
 """
@@ -45,3 +51,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
 """
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/string_decoder/dep-coordinates.txt b/doc/licenses/string_decoder/dep-coordinates.txt
new file mode 100644
index 000000000..767cbb353
--- /dev/null
+++ b/doc/licenses/string_decoder/dep-coordinates.txt
@@ -0,0 +1 @@
+string_decoder:*
diff --git a/doc/licenses/timers-browserify-2.0.12/README b/doc/licenses/timers-browserify-2.0.12/README
deleted file mode 100644
index 9ed389891..000000000
--- a/doc/licenses/timers-browserify-2.0.12/README
+++ /dev/null
@@ -1,8 +0,0 @@
-timers-browserify (https://github.com/browserify/timers-browserify)
----------------------------------------------
-
-    Version: 2.0.12
-    From: 'J. Ryan Stinnett' (https://github.com/jryans)
-    License(s):
-        MIT (bundled/timers-browserify-2.0.12/LICENSE.md)
-
diff --git a/doc/licenses/timers-browserify-2.0.12/dep-coordinates.txt b/doc/licenses/timers-browserify-2.0.12/dep-coordinates.txt
deleted file mode 100644
index b1dfbee66..000000000
--- a/doc/licenses/timers-browserify-2.0.12/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-timers-browserify:2.0.12
diff --git a/doc/licenses/timers-browserify-2.0.12/LICENSE.md b/doc/licenses/timers-browserify/LICENSE.md
similarity index 85%
rename from doc/licenses/timers-browserify-2.0.12/LICENSE.md
rename to doc/licenses/timers-browserify/LICENSE.md
index f2bdf520a..23d9f7a97 100644
--- a/doc/licenses/timers-browserify-2.0.12/LICENSE.md
+++ b/doc/licenses/timers-browserify/LICENSE.md
@@ -1,3 +1,9 @@
+# Name:    timers-browserify
+# URL:     https://github.com/browserify/timers-browserify
+# From:    'J. Ryan Stinnett' (https://github.com/jryans)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 # timers-browserify
 
 This project uses the [MIT](http://jryans.mit-license.org/) license:
@@ -21,3 +27,4 @@ This project uses the [MIT](http://jryans.mit-license.org/) license:
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
     DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/timers-browserify/dep-coordinates.txt b/doc/licenses/timers-browserify/dep-coordinates.txt
new file mode 100644
index 000000000..f27dc9e18
--- /dev/null
+++ b/doc/licenses/timers-browserify/dep-coordinates.txt
@@ -0,0 +1 @@
+timers-browserify:*
diff --git a/doc/licenses/util-0.11.1/README b/doc/licenses/util-0.11.1/README
deleted file mode 100644
index be8215945..000000000
--- a/doc/licenses/util-0.11.1/README
+++ /dev/null
@@ -1,8 +0,0 @@
-util (https://github.com/browserify/node-util)
-----------------------------------------------
-
-    Version: 0.11.1
-    From: 'Joyent, Inc. and other Node contributors'
-    License(s):
-        MIT (bundled/util-0.11.1/LICENSE)
-
diff --git a/doc/licenses/util-0.11.1/dep-coordinates.txt b/doc/licenses/util-0.11.1/dep-coordinates.txt
deleted file mode 100644
index 376908f45..000000000
--- a/doc/licenses/util-0.11.1/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-util:0.11.1
diff --git a/doc/licenses/util-deprecate-1.0.2/README b/doc/licenses/util-deprecate-1.0.2/README
deleted file mode 100644
index 93844707b..000000000
--- a/doc/licenses/util-deprecate-1.0.2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-util-deprecate (https://github.com/TooTallNate/util-deprecate)
----------------------------------------------
-
-    Version: 1.0.2
-    From: 'Nathan Rajlich' (https://github.com/TooTallNate)
-    License(s):
-        MIT (bundled/util-deprecate-1.0.2/LICENSE)
-
diff --git a/doc/licenses/util-deprecate-1.0.2/dep-coordinates.txt b/doc/licenses/util-deprecate-1.0.2/dep-coordinates.txt
deleted file mode 100644
index f8c30242a..000000000
--- a/doc/licenses/util-deprecate-1.0.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-util-deprecate:1.0.2
diff --git a/doc/licenses/util-deprecate-1.0.2/LICENSE b/doc/licenses/util-deprecate/LICENSE
similarity index 83%
rename from doc/licenses/util-deprecate-1.0.2/LICENSE
rename to doc/licenses/util-deprecate/LICENSE
index 6a60e8c22..37c6128d2 100644
--- a/doc/licenses/util-deprecate-1.0.2/LICENSE
+++ b/doc/licenses/util-deprecate/LICENSE
@@ -1,3 +1,9 @@
+# Name:    util-deprecate
+# URL:     https://github.com/TooTallNate/util-deprecate
+# From:    'Nathan Rajlich' (https://github.com/TooTallNate)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 (The MIT License)
 
 Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
@@ -22,3 +28,4 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/util-deprecate/dep-coordinates.txt b/doc/licenses/util-deprecate/dep-coordinates.txt
new file mode 100644
index 000000000..cddba60fe
--- /dev/null
+++ b/doc/licenses/util-deprecate/dep-coordinates.txt
@@ -0,0 +1 @@
+util-deprecate:*
diff --git a/doc/licenses/assert-1.5.0/LICENSE b/doc/licenses/util/LICENSE
similarity index 84%
rename from doc/licenses/assert-1.5.0/LICENSE
rename to doc/licenses/util/LICENSE
index e3d4e695a..08165867e 100644
--- a/doc/licenses/assert-1.5.0/LICENSE
+++ b/doc/licenses/util/LICENSE
@@ -1,3 +1,9 @@
+# Name:    util
+# URL:     https://github.com/browserify/node-util
+# From:    'Joyent, Inc. and other Node contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -16,3 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/util/dep-coordinates.txt b/doc/licenses/util/dep-coordinates.txt
new file mode 100644
index 000000000..a2ec7c497
--- /dev/null
+++ b/doc/licenses/util/dep-coordinates.txt
@@ -0,0 +1 @@
+util:*
diff --git a/doc/licenses/webpack-4.47.0/README b/doc/licenses/webpack-4.47.0/README
deleted file mode 100644
index 1420e33ba..000000000
--- a/doc/licenses/webpack-4.47.0/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Webpack (https://webpack.js.org/)
----------------------------------
-
-    Version: 4.47.0
-    From: 'JS Foundation and other contributors'
-    License(s):
-        MIT (bundled/webpack-4.47.0/LICENSE)
-
diff --git a/doc/licenses/webpack-4.47.0/dep-coordinates.txt b/doc/licenses/webpack-4.47.0/dep-coordinates.txt
deleted file mode 100644
index 59c0515b0..000000000
--- a/doc/licenses/webpack-4.47.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-webpack:4.47.0
diff --git a/doc/licenses/webpack-4.47.0/LICENSE b/doc/licenses/webpack/LICENSE
similarity index 85%
rename from doc/licenses/webpack-4.47.0/LICENSE
rename to doc/licenses/webpack/LICENSE
index 8c11fc728..780627071 100644
--- a/doc/licenses/webpack-4.47.0/LICENSE
+++ b/doc/licenses/webpack/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Webpack
+# URL:     https://webpack.js.org/
+# From:    'JS Foundation and other contributors'
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright JS Foundation and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -18,3 +24,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/webpack/dep-coordinates.txt b/doc/licenses/webpack/dep-coordinates.txt
new file mode 100644
index 000000000..eb523f41e
--- /dev/null
+++ b/doc/licenses/webpack/dep-coordinates.txt
@@ -0,0 +1 @@
+webpack:*
diff --git a/doc/licenses/woodstox-core-5.4.0/README b/doc/licenses/woodstox-core-5.4.0/README
deleted file mode 100644
index ad07e9829..000000000
--- a/doc/licenses/woodstox-core-5.4.0/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Woodstox Core (https://github.com/FasterXML/woodstox)
-------------------------------------------------------
-
-    Version: 5.4.0
-    From: 'FasterXML, LLC' (http://fasterxml.com/)
-    License(s):
-        Apache v2.0
diff --git a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
deleted file mode 100644
index e879f958a..000000000
--- a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.woodstox:woodstox-core:jar:5.4.0
diff --git a/doc/licenses/woodstox-core/LICENSE b/doc/licenses/woodstox-core/LICENSE
new file mode 100644
index 000000000..1326fc721
--- /dev/null
+++ b/doc/licenses/woodstox-core/LICENSE
@@ -0,0 +1,4 @@
+# Name:    Woodstox Core
+# URL:     https://github.com/FasterXML/woodstox
+# From:    'FasterXML, LLC' (http://fasterxml.com/)
+# License: Apache v2.0
diff --git a/doc/licenses/woodstox-core/dep-coordinates.txt b/doc/licenses/woodstox-core/dep-coordinates.txt
new file mode 100644
index 000000000..99266a1c1
--- /dev/null
+++ b/doc/licenses/woodstox-core/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:*
diff --git a/doc/licenses/woodstox-stax2-api-4.2/README b/doc/licenses/woodstox-stax2-api-4.2/README
deleted file mode 100644
index b2936e350..000000000
--- a/doc/licenses/woodstox-stax2-api-4.2/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
-------------------------------------------------------------
-
-    Version: 4.2
-    From: 'FasterXML, LLC' (http://fasterxml.com/)
-    License(s):
-        BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
diff --git a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
deleted file mode 100644
index c7bbc763f..000000000
--- a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-org.codehaus.woodstox:stax2-api:jar:4.2
diff --git a/doc/licenses/woodstox-stax2-api-4.2/LICENSE b/doc/licenses/woodstox-stax2-api/LICENSE
similarity index 85%
rename from doc/licenses/woodstox-stax2-api-4.2/LICENSE
rename to doc/licenses/woodstox-stax2-api/LICENSE
index c7a901abf..a3efa3ef5 100644
--- a/doc/licenses/woodstox-stax2-api-4.2/LICENSE
+++ b/doc/licenses/woodstox-stax2-api/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Woodstox Stax2-API
+# URL:     https://github.com/FasterXML/stax2-api
+# From:    'FasterXML, LLC' (http://fasterxml.com/)
+# License: BSD Simplified 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright 2010 FasterXML, LLC
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -20,3 +26,4 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
 ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/woodstox-stax2-api/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api/dep-coordinates.txt
new file mode 100644
index 000000000..9c398f09e
--- /dev/null
+++ b/doc/licenses/woodstox-stax2-api/dep-coordinates.txt
@@ -0,0 +1 @@
+org.codehaus.woodstox:stax2-api:jar:*
diff --git a/doc/licenses/xpp3-1.1.4c/README b/doc/licenses/xpp3-1.1.4c/README
deleted file mode 100644
index 96b77259c..000000000
--- a/doc/licenses/xpp3-1.1.4c/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Xml Pull Parser 3rd Edition
-(http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html)
----------------------------------------------------------------
-
-    Version: 1.1.4c
-    From: 'Indiana University Extreme! Lab' (http://www.extreme.indiana.edu/)
-    License(s):
-        Indiana University Extreme! Lab License (bundled/xpp3-1.1.4c/LICENSE.txt)
-
diff --git a/doc/licenses/xpp3-1.1.4c/LICENSE.txt b/doc/licenses/xpp3/LICENSE.txt
similarity index 87%
rename from doc/licenses/xpp3-1.1.4c/LICENSE.txt
rename to doc/licenses/xpp3/LICENSE.txt
index d84c14b3d..1f252762d 100644
--- a/doc/licenses/xpp3-1.1.4c/LICENSE.txt
+++ b/doc/licenses/xpp3/LICENSE.txt
@@ -1,3 +1,9 @@
+# Name:    Xml Pull Parser 3rd Edition
+# URL:     http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
+# From:    'Indiana University Extreme! Lab' (http://www.extreme.indiana.edu/)
+# License: Indiana University Extreme! Lab License 
+#
+# --- BEGIN LICENSE FILE ---
 Indiana University Extreme! Lab Software License
 
 Version 1.1.1
@@ -44,3 +50,4 @@ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/xpp3-1.1.4c/NOTICE b/doc/licenses/xpp3/NOTICE
similarity index 67%
rename from doc/licenses/xpp3-1.1.4c/NOTICE
rename to doc/licenses/xpp3/NOTICE
index 467f8d952..d464eb1a4 100644
--- a/doc/licenses/xpp3-1.1.4c/NOTICE
+++ b/doc/licenses/xpp3/NOTICE
@@ -1,2 +1,4 @@
+# --- BEGIN LICENSE FILE ---
 This product includes software developed by the Indiana University
 Extreme! Lab (http://www.extreme.indiana.edu/).
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/xpp3-1.1.4c/dep-coordinates.txt b/doc/licenses/xpp3/dep-coordinates.txt
similarity index 82%
rename from doc/licenses/xpp3-1.1.4c/dep-coordinates.txt
rename to doc/licenses/xpp3/dep-coordinates.txt
index 8e1237c98..a9d27c8aa 100644
--- a/doc/licenses/xpp3-1.1.4c/dep-coordinates.txt
+++ b/doc/licenses/xpp3/dep-coordinates.txt
@@ -1 +1 @@
-org.apache.servicemix.bundles:org.apache.servicemix.bundles.xpp3:jar:1.1.4c_7
+org.apache.servicemix.bundles:org.apache.servicemix.bundles.xpp3:jar:*
diff --git a/doc/licenses/zxing-3.5.3/NOTICE b/doc/licenses/zxing-3.5.3/NOTICE
deleted file mode 100644
index 0a372e306..000000000
--- a/doc/licenses/zxing-3.5.3/NOTICE
+++ /dev/null
@@ -1,7 +0,0 @@
-Barcode4J
-Copyright 2002-2010 Jeremias Märki
-Copyright 2005-2006 Dietmar Bürkle
-
-Portions of this software were contributed under section 5 of the
-Apache License. Contributors are listed under:
-http://barcode4j.sourceforge.net/contributors.html
diff --git a/doc/licenses/zxing-3.5.3/README b/doc/licenses/zxing-3.5.3/README
deleted file mode 100644
index 87a0bbcf8..000000000
--- a/doc/licenses/zxing-3.5.3/README
+++ /dev/null
@@ -1,8 +0,0 @@
-ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
-----------------------------------------------------------------
-
-    Version: 3.5.3
-    From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
-    License(s):
-        Apache v2.0
-
diff --git a/doc/licenses/zxing-3.5.3/dep-coordinates.txt b/doc/licenses/zxing-3.5.3/dep-coordinates.txt
deleted file mode 100644
index 48d52b1b9..000000000
--- a/doc/licenses/zxing-3.5.3/dep-coordinates.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-com.google.zxing:core:jar:3.5.3
-com.google.zxing:javase:jar:3.5.3
diff --git a/doc/licenses/zxing-3.5.3/AUTHORS b/doc/licenses/zxing/AUTHORS
similarity index 97%
rename from doc/licenses/zxing-3.5.3/AUTHORS
rename to doc/licenses/zxing/AUTHORS
index 85099ebfb..01d2d05a2 100644
--- a/doc/licenses/zxing-3.5.3/AUTHORS
+++ b/doc/licenses/zxing/AUTHORS
@@ -1,3 +1,4 @@
+# --- BEGIN LICENSE FILE ---
 This project consists of contributions from several people, recognized here for convenience,
 in alphabetical order.
 
@@ -133,3 +134,4 @@ Yakov Okshtein (Google)
 Yao Wei
 Younes CHTIOUI
 Yunhao Tian
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/zxing/NOTICE b/doc/licenses/zxing/NOTICE
new file mode 100644
index 000000000..5077a3732
--- /dev/null
+++ b/doc/licenses/zxing/NOTICE
@@ -0,0 +1,14 @@
+# Name:    ZXing Barcode Scanning Library
+# URL:     https://github.com/zxing/zxing/
+# From:    'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-${DEP_VERSION}/AUTHORS)
+# License: Apache v2.0
+#
+# --- BEGIN LICENSE FILE ---
+Barcode4J
+Copyright 2002-2010 Jeremias Märki
+Copyright 2005-2006 Dietmar Bürkle
+
+Portions of this software were contributed under section 5 of the
+Apache License. Contributors are listed under:
+http://barcode4j.sourceforge.net/contributors.html
+# --- END LICENSE FILE ---
diff --git a/doc/licenses/zxing/dep-coordinates.txt b/doc/licenses/zxing/dep-coordinates.txt
new file mode 100644
index 000000000..bff252101
--- /dev/null
+++ b/doc/licenses/zxing/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.google.zxing:core:jar:*
+com.google.zxing:javase:jar:*
diff --git a/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/README b/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/README
deleted file mode 100644
index a59c77739..000000000
--- a/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/README
+++ /dev/null
@@ -1,8 +0,0 @@
-TOTP Reference Implementation (https://tools.ietf.org/id/draft-mraihi-totp-timebased-07.html#Section-Reference-Impl)
--------------------------------------------------------------------------------
-
-    Verson: 07
-    From: 'IETF Trust' (http://trustee.ietf.org/license-info)
-    License(s):
-        BSD 3-clause (bundled/totp-reference-impl-07/license.txt)
-
diff --git a/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/license.txt b/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/license.txt
index bb1afcd2c..1bbdb4a62 100644
--- a/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/license.txt
+++ b/extensions/guacamole-auth-totp/src/licenses/bundled/totp-reference-impl-07/license.txt
@@ -1,3 +1,10 @@
+# Name:    TOTP Reference Implementation
+# URL:     https://tools.ietf.org/id/draft-mraihi-totp-timebased-07.html#Section-Reference-Impl
+# Version: 07
+# From:    'IETF Trust' (http://trustee.ietf.org/license-info)
+# License: BSD 3-clause 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2011 IETF Trust and the persons identified as authors
 of the code. All rights reserved.
 
@@ -25,4 +32,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+# --- END LICENSE FILE ---
diff --git a/guacamole/src/licenses/bundled/angular-module-shim-0.0.4/README b/guacamole/src/licenses/bundled/angular-module-shim-0.0.4/README
deleted file mode 100644
index 24f2b277b..000000000
--- a/guacamole/src/licenses/bundled/angular-module-shim-0.0.4/README
+++ /dev/null
@@ -1,8 +0,0 @@
-angular-module-shim (https://github.com/jedrichards/angular-module-shim)
-------------------------------------------------------------------------
-
-    Version: 0.0.4
-    From: 'Jed Richards' (https://github.com/jedrichards)
-    License(s):
-        MIT (bundled/angular-module-shim-0.0.4/LICENSE)
-
diff --git a/guacamole/src/licenses/bundled/angular-module-shim-0.0.4/LICENSE b/guacamole/src/licenses/bundled/angular-module-shim/LICENSE
similarity index 80%
rename from guacamole/src/licenses/bundled/angular-module-shim-0.0.4/LICENSE
rename to guacamole/src/licenses/bundled/angular-module-shim/LICENSE
index 806ee6e34..a405dc8b7 100644
--- a/guacamole/src/licenses/bundled/angular-module-shim-0.0.4/LICENSE
+++ b/guacamole/src/licenses/bundled/angular-module-shim/LICENSE
@@ -1,3 +1,10 @@
+# Name:    angular-module-shim
+# URL:     https://github.com/jedrichards/angular-module-shim
+# Version: 0.0.4
+# From:    'Jed Richards' (https://github.com/jedrichards)
+# License: MIT 
+#
+# --- BEGIN LICENSE FILE ---
 The MIT License (MIT)
 
 Copyright (c) 2014 Jed Richards
@@ -18,4 +25,5 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/guacamole/src/licenses/bundled/carlito/LICENSE b/guacamole/src/licenses/bundled/carlito/LICENSE
index e999b3183..31482a0e1 100644
--- a/guacamole/src/licenses/bundled/carlito/LICENSE
+++ b/guacamole/src/licenses/bundled/carlito/LICENSE
@@ -1,3 +1,9 @@
+# Name:    Carlito
+# URL:     http://code.google.com/p/chromium/issues/detail?id=280557
+# From:    'tyPoland Lukasz Dziedzic' (http://www.lukaszdziedzic.eu/)
+# License: SIL Open Font 
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (c) 2010-2013 by tyPoland Lukasz Dziedzic with Reserved Font Name "Carlito".
 
 This Font Software is licensed under the SIL Open Font License,
@@ -92,4 +98,4 @@ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
 DEALINGS IN THE FONT SOFTWARE.
-
+# --- END LICENSE FILE ---
diff --git a/guacamole/src/licenses/bundled/carlito/README b/guacamole/src/licenses/bundled/carlito/README
deleted file mode 100644
index 5e82a3185..000000000
--- a/guacamole/src/licenses/bundled/carlito/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Carlito (http://code.google.com/p/chromium/issues/detail?id=280557)
--------------------------------------------------------------------
-
-    Version: N/A
-    From: 'tyPoland Lukasz Dziedzic' (http://www.lukaszdziedzic.eu/)
-    License(s):
-        SIL Open Font (bundled/carlito/LICENSE)
-
diff --git a/guacamole/src/licenses/bundled/glyptodon-enterprise-player/LICENSE b/guacamole/src/licenses/bundled/glyptodon-enterprise-player/LICENSE
index 69e97671e..c92b8f1af 100644
--- a/guacamole/src/licenses/bundled/glyptodon-enterprise-player/LICENSE
+++ b/guacamole/src/licenses/bundled/glyptodon-enterprise-player/LICENSE
@@ -1,3 +1,10 @@
+# Name:    Session Recording Player for Glyptodon Enterprise
+# URL:     https://github.com/glyptodon/glyptodon-enterprise-player
+# Version: 1.1.0-1
+# From:    'Glyptodon, Inc.' (https://glyptodon.com/)
+# License: MIT
+#
+# --- BEGIN LICENSE FILE ---
 Copyright (C) 2019 Glyptodon, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +24,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+# --- END LICENSE FILE ---
diff --git a/guacamole/src/licenses/bundled/glyptodon-enterprise-player/README b/guacamole/src/licenses/bundled/glyptodon-enterprise-player/README
deleted file mode 100644
index c9cef3005..000000000
--- a/guacamole/src/licenses/bundled/glyptodon-enterprise-player/README
+++ /dev/null
@@ -1,9 +0,0 @@
-Session Recording Player for Glyptodon Enterprise
-(https://github.com/glyptodon/glyptodon-enterprise-player)
-----------------------------------------------------------
-
-    Version: 1.1.0-1
-    From: 'Glyptodon, Inc.' (https://glyptodon.com/)
-    License(s):
-        MIT (bundled/glyptodon-enterprise-player/LICENSE)
-

From e6a28dcd331be74c9804fd9de23e51ee29a5770f Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 4 Feb 2026 16:23:50 -0800
Subject: [PATCH 3/4] GUACAMOLE-2139: Add automatic retrieval of license
 information where absent. Remove unused license info.

---
 doc/licenses/angular-translate/LICENSE        |    5 +-
 doc/licenses/angular/LICENSE                  |    5 +-
 doc/licenses/apache-commons-beanutils/NOTICE  |    8 +-
 doc/licenses/apache-commons-chain/NOTICE      |    5 +-
 doc/licenses/apache-commons-codec/NOTICE      |   31 +-
 .../apache-commons-collections/NOTICE         |   15 +-
 .../apache-commons-configuration/NOTICE       |    7 +-
 doc/licenses/apache-commons-digester/NOTICE   |    5 +-
 doc/licenses/apache-commons-lang/NOTICE       |   17 +-
 doc/licenses/apache-commons-logging/NOTICE    |    7 +-
 doc/licenses/apache-commons-pool/NOTICE       |   24 +-
 doc/licenses/apache-commons-text/NOTICE.txt   |    8 +-
 doc/licenses/apache-directory-api/NOTICE      |    7 +-
 doc/licenses/apache-mina/NOTICE               |    5 +-
 doc/licenses/apache-santuario/NOTICE          |    7 +-
 doc/licenses/assert/LICENSE                   |    5 +-
 doc/licenses/base64-js/LICENSE                |    6 +-
 doc/licenses/blob-polyfill/LICENSE.md         |   11 +-
 doc/licenses/bouncycastle/LICENSE             |    9 -
 doc/licenses/buffer/LICENSE                   |    5 +-
 doc/licenses/cas-client/NOTICE                |    6 +-
 doc/licenses/checker-qual/LICENSE.txt         |   29 +-
 doc/licenses/clean-license-files.sh           |   55 +
 doc/licenses/core-util-is/LICENSE             |   26 -
 doc/licenses/core-util-is/dep-coordinates.txt |    1 -
 doc/licenses/css-loader/LICENSE               |    5 +-
 doc/licenses/csv/LICENSE                      |    6 +-
 doc/licenses/d3-path/LICENSE                  |    5 +-
 doc/licenses/d3-shape/LICENSE                 |    5 +-
 doc/licenses/datalist-polyfill/LICENSE        |    5 +-
 doc/licenses/dom4j/LICENSE                    |    5 +-
 doc/licenses/duo-universal-sdk/LICENSE        |    5 +-
 doc/licenses/events/LICENSE                   |   29 -
 doc/licenses/events/dep-coordinates.txt       |    1 -
 doc/licenses/fuzzysort/LICENSE                |    5 +-
 doc/licenses/generate-license-files.sh        |   48 +
 doc/licenses/glassfish-hk2/LICENSE.md         | 1279 ++++++++--------
 doc/licenses/glassfish-hk2/NOTICE.md          |   22 +
 doc/licenses/ieee754/LICENSE                  |    5 +-
 doc/licenses/inherits/LICENSE                 |    5 +-
 doc/licenses/isarray/LICENSE                  |   22 +-
 doc/licenses/jackson-databind/NOTICE          |   17 +-
 doc/licenses/jackson/NOTICE                   |   28 +-
 doc/licenses/jai-imageio-core/LICENSE.txt     |    5 +-
 doc/licenses/jakarta-activation/LICENSE.md    |   36 +-
 .../jakarta-annotation-api/LICENSE.md         |    9 +-
 doc/licenses/jakarta-annotation-api/NOTICE.md |   22 +
 doc/licenses/jakarta-jaxb/LICENSE.md          |    5 +-
 doc/licenses/jakarta-jaxb/NOTICE.md           |   23 +
 doc/licenses/jakarta-validation-api/NOTICE    |    9 +-
 doc/licenses/jakarta-ws-rs-api/LICENSE.md     |   10 +-
 doc/licenses/jakarta-ws-rs-api/NOTICE.md      |   24 +
 doc/licenses/java-jwt/LICENSE                 |    6 +-
 doc/licenses/java-saml/LICENSE                |    5 +-
 doc/licenses/javaee-activation/LICENSE.txt    |    5 +-
 doc/licenses/jaxb-api/LICENSE.txt             |  282 +++-
 doc/licenses/jcommander/NOTICE                |    6 +-
 doc/licenses/jersey/LICENSE.md                |    9 +-
 doc/licenses/jersey/NOTICE.md                 |   11 +
 doc/licenses/joda-time/NOTICE                 |    5 +-
 doc/licenses/jose4j/NOTICE                    |    7 +-
 doc/licenses/jquery/LICENSE.txt               |    5 +-
 doc/licenses/jradius/LICENSE                  |    5 +-
 doc/licenses/jstz/LICENSE                     |    5 +-
 doc/licenses/kotlin/NOTICE.txt                |    9 +-
 doc/licenses/kotlinx-serialization/NOTICE.txt |    9 +-
 doc/licenses/ksm-sdk/LICENSE                  |    5 +-
 doc/licenses/lodash/LICENSE                   |    5 +-
 doc/licenses/logback/LICENSE.txt              |    9 +-
 doc/licenses/logging-interceptor/NOTICE       |   20 -
 .../logging-interceptor/dep-coordinates.txt   |    1 -
 doc/licenses/make-plural/LICENSE              |    7 +-
 doc/licenses/messageformat-parser/LICENSE     |    5 +-
 doc/licenses/messageformat/LICENSE            |    7 +-
 doc/licenses/mybatis-guice/NOTICE             |    5 +-
 doc/licenses/mybatis/NOTICE                   |   13 +-
 doc/licenses/object-assign/LICENSE            |    5 +-
 doc/licenses/osgi-resource-locator/LICENSE.md | 1280 +++++++++--------
 doc/licenses/osgi-resource-locator/NOTICE.md  |   23 +
 doc/licenses/pickr/LICENSE                    |    5 +-
 .../process-nextick-args/dep-coordinates.txt  |    1 -
 doc/licenses/process-nextick-args/license.md  |   26 -
 doc/licenses/process/LICENSE                  |    5 +-
 doc/licenses/readable-stream/LICENSE          |   54 -
 .../readable-stream/dep-coordinates.txt       |    1 -
 doc/licenses/reserved-words/LICENSE           |    6 +-
 doc/licenses/safe-buffer/LICENSE              |   28 -
 doc/licenses/safe-buffer/dep-coordinates.txt  |    1 -
 doc/licenses/setimmediate/LICENSE.txt         |   27 -
 doc/licenses/setimmediate/dep-coordinates.txt |    1 -
 doc/licenses/slf4j-api/LICENSE.txt            |    7 +-
 doc/licenses/stream-browserify/LICENSE        |   27 -
 .../stream-browserify/dep-coordinates.txt     |    1 -
 doc/licenses/string_decoder/LICENSE           |   54 -
 .../string_decoder/dep-coordinates.txt        |    1 -
 doc/licenses/timers-browserify/LICENSE.md     |   30 -
 .../timers-browserify/dep-coordinates.txt     |    1 -
 doc/licenses/util-deprecate/LICENSE           |   31 -
 .../util-deprecate/dep-coordinates.txt        |    1 -
 doc/licenses/util/LICENSE                     |    5 +-
 doc/licenses/webpack/LICENSE                  |    5 +-
 doc/licenses/woodstox-stax2-api/LICENSE       |    8 +-
 doc/licenses/zxing/AUTHORS                    |    6 +-
 doc/licenses/zxing/NOTICE                     |    7 +-
 104 files changed, 2170 insertions(+), 1872 deletions(-)
 create mode 100755 doc/licenses/clean-license-files.sh
 delete mode 100644 doc/licenses/core-util-is/LICENSE
 delete mode 100644 doc/licenses/core-util-is/dep-coordinates.txt
 delete mode 100644 doc/licenses/events/LICENSE
 delete mode 100644 doc/licenses/events/dep-coordinates.txt
 create mode 100644 doc/licenses/glassfish-hk2/NOTICE.md
 create mode 100644 doc/licenses/jakarta-annotation-api/NOTICE.md
 create mode 100644 doc/licenses/jakarta-jaxb/NOTICE.md
 create mode 100644 doc/licenses/jakarta-ws-rs-api/NOTICE.md
 create mode 100644 doc/licenses/jersey/NOTICE.md
 delete mode 100644 doc/licenses/logging-interceptor/NOTICE
 delete mode 100644 doc/licenses/logging-interceptor/dep-coordinates.txt
 create mode 100644 doc/licenses/osgi-resource-locator/NOTICE.md
 delete mode 100644 doc/licenses/process-nextick-args/dep-coordinates.txt
 delete mode 100644 doc/licenses/process-nextick-args/license.md
 delete mode 100644 doc/licenses/readable-stream/LICENSE
 delete mode 100644 doc/licenses/readable-stream/dep-coordinates.txt
 delete mode 100644 doc/licenses/safe-buffer/LICENSE
 delete mode 100644 doc/licenses/safe-buffer/dep-coordinates.txt
 delete mode 100644 doc/licenses/setimmediate/LICENSE.txt
 delete mode 100644 doc/licenses/setimmediate/dep-coordinates.txt
 delete mode 100644 doc/licenses/stream-browserify/LICENSE
 delete mode 100644 doc/licenses/stream-browserify/dep-coordinates.txt
 delete mode 100644 doc/licenses/string_decoder/LICENSE
 delete mode 100644 doc/licenses/string_decoder/dep-coordinates.txt
 delete mode 100644 doc/licenses/timers-browserify/LICENSE.md
 delete mode 100644 doc/licenses/timers-browserify/dep-coordinates.txt
 delete mode 100644 doc/licenses/util-deprecate/LICENSE
 delete mode 100644 doc/licenses/util-deprecate/dep-coordinates.txt

diff --git a/doc/licenses/angular-translate/LICENSE b/doc/licenses/angular-translate/LICENSE
index 1b0f53a94..fe9028dd7 100644
--- a/doc/licenses/angular-translate/LICENSE
+++ b/doc/licenses/angular-translate/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://angular-translate.github.io/
 # From:    'Pascal Precht' (https://github.com/PascalPrecht)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/angular-translate/angular-translate/refs/tags/${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.19.1] ---
 The MIT License (MIT)
 
 Copyright (c) 2013-2017 The angular-translate team and Pascal Precht
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.19.1] ---
diff --git a/doc/licenses/angular/LICENSE b/doc/licenses/angular/LICENSE
index e8c19e2fe..abace8e0d 100644
--- a/doc/licenses/angular/LICENSE
+++ b/doc/licenses/angular/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://angularjs.org/
 # From:    'Google Inc.' (http://www.google.com/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/angular/angular.js/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.8.3] ---
 The MIT License
 
 Copyright (c) 2010-2020 Google LLC. http://angularjs.org
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.8.3] ---
diff --git a/doc/licenses/apache-commons-beanutils/NOTICE b/doc/licenses/apache-commons-beanutils/NOTICE
index 981566e22..ff7fec875 100644
--- a/doc/licenses/apache-commons-beanutils/NOTICE
+++ b/doc/licenses/apache-commons-beanutils/NOTICE
@@ -2,8 +2,12 @@
 # URL:     http://commons.apache.org/proper/commons-beanutils/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-beanutils/refs/tags/rel/commons-beanutils-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-beanutils/refs/tags/commons-beanutils-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-beanutils/refs/tags/beanutils-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-beanutils/refs/tags/BEANUTILS_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.7.0] ---
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.7.0] ---
diff --git a/doc/licenses/apache-commons-chain/NOTICE b/doc/licenses/apache-commons-chain/NOTICE
index 8e90afd59..01df77a43 100644
--- a/doc/licenses/apache-commons-chain/NOTICE
+++ b/doc/licenses/apache-commons-chain/NOTICE
@@ -2,11 +2,12 @@
 # URL:     http://commons.apache.org/proper/commons-chain/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-chain/refs/tags/CHAIN_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.2] ---
 Apache Commons Chain
 Copyright 2003-2008 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.2] ---
diff --git a/doc/licenses/apache-commons-codec/NOTICE b/doc/licenses/apache-commons-codec/NOTICE
index 06de62068..aa119daeb 100644
--- a/doc/licenses/apache-commons-codec/NOTICE
+++ b/doc/licenses/apache-commons-codec/NOTICE
@@ -2,33 +2,12 @@
 # URL:     http://commons.apache.org/proper/commons-codec/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-codec/refs/tags/rel/commons-codec-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-codec/refs/tags/commons-codec-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-codec/refs/tags/CODEC_${_VERSION_}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-codec/refs/tags/${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-codec/refs/tags/${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE [1.11] ---
-Apache Commons Codec
-Copyright 2002-2020 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-# --- END LICENSE FILE [1.11] ---
-# --- BEGIN LICENSE FILE [1.16.0] ---
-Apache Commons Codec
-Copyright 2002-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-# --- END LICENSE FILE [1.16.0] ---
 # --- BEGIN LICENSE FILE [1.17.1] ---
 Apache Commons Codec
 Copyright 2002-2024 The Apache Software Foundation
diff --git a/doc/licenses/apache-commons-collections/NOTICE b/doc/licenses/apache-commons-collections/NOTICE
index 4a548261e..3a73f505b 100644
--- a/doc/licenses/apache-commons-collections/NOTICE
+++ b/doc/licenses/apache-commons-collections/NOTICE
@@ -2,11 +2,11 @@
 # URL:     http://commons.apache.org/proper/commons-collections/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-collections/refs/tags/rel/commons-collections-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-collections/refs/tags/commons-collections-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-collections/refs/tags/collections-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-collections/refs/tags/commons-commons-collections-${VERSION}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE [3.2.2] ---
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE [3.2.2] ---
 # --- BEGIN LICENSE FILE [4.4] ---
 Apache Commons Collections
 Copyright 2001-2019 The Apache Software Foundation
@@ -14,3 +14,10 @@ Copyright 2001-2019 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 # --- END LICENSE FILE [4.4] ---
+# --- BEGIN LICENSE FILE [3.2.2] ---
+Apache Commons Collections
+Copyright 2001-2015 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE [3.2.2] ---
diff --git a/doc/licenses/apache-commons-configuration/NOTICE b/doc/licenses/apache-commons-configuration/NOTICE
index 4b67274c3..f63090370 100644
--- a/doc/licenses/apache-commons-configuration/NOTICE
+++ b/doc/licenses/apache-commons-configuration/NOTICE
@@ -2,11 +2,14 @@
 # URL:     http://commons.apache.org/proper/commons-configuration/)
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-configuration/refs/tags/rel/commons-configuration-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-configuration/refs/tags/commons-configuration-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-configuration/refs/tags/CONFIGURATION_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.5] ---
 Apache Commons Configuration
 Copyright 2001-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.5] ---
diff --git a/doc/licenses/apache-commons-digester/NOTICE b/doc/licenses/apache-commons-digester/NOTICE
index 678fe5b20..4f87745bb 100644
--- a/doc/licenses/apache-commons-digester/NOTICE
+++ b/doc/licenses/apache-commons-digester/NOTICE
@@ -2,11 +2,12 @@
 # URL:     http://commons.apache.org/proper/commons-digester/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-digester/refs/tags/DIGESTER_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.8] ---
 Apache Jakarta Commons Digester
 Copyright 2001-2006 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.8] ---
diff --git a/doc/licenses/apache-commons-lang/NOTICE b/doc/licenses/apache-commons-lang/NOTICE
index 501ff11f3..2a4639906 100644
--- a/doc/licenses/apache-commons-lang/NOTICE
+++ b/doc/licenses/apache-commons-lang/NOTICE
@@ -2,7 +2,17 @@
 # URL:     http://commons.apache.org/proper/commons-lang/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-lang/refs/tags/rel/commons-lang-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-lang/refs/tags/commons-lang-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-lang/refs/tags/LANG_${_VERSION_}/NOTICE.txt
 #
+# --- BEGIN LICENSE FILE [3.17.0] ---
+Apache Commons Lang
+Copyright 2001-2024 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+# --- END LICENSE FILE [3.17.0] ---
 # --- BEGIN LICENSE FILE [2.3] ---
 Apache Jakarta Commons Lang
 Copyright 2001-2007 The Apache Software Foundation
@@ -10,10 +20,3 @@ Copyright 2001-2007 The Apache Software Foundation
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 # --- END LICENSE FILE [2.3] ---
-# --- BEGIN LICENSE FILE [3.17.0] ---
-Apache Commons Lang
-Copyright 2001-2023 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
-# --- END LICENSE FILE [3.17.0] ---
diff --git a/doc/licenses/apache-commons-logging/NOTICE b/doc/licenses/apache-commons-logging/NOTICE
index 5d9426423..fc81fc29f 100644
--- a/doc/licenses/apache-commons-logging/NOTICE
+++ b/doc/licenses/apache-commons-logging/NOTICE
@@ -2,11 +2,14 @@
 # URL:     http://commons.apache.org/proper/commons-logging/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-logging/refs/tags/rel/commons-logging-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-logging/refs/tags/commons-logging-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-logging/refs/tags/LOGGING_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.2] ---
 Apache Commons Logging
 Copyright 2003-2014 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.2] ---
diff --git a/doc/licenses/apache-commons-pool/NOTICE b/doc/licenses/apache-commons-pool/NOTICE
index 4fa44ecd0..e1495f0f3 100644
--- a/doc/licenses/apache-commons-pool/NOTICE
+++ b/doc/licenses/apache-commons-pool/NOTICE
@@ -2,21 +2,10 @@
 # URL:     http://commons.apache.org/proper/commons-pool/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-pool/refs/tags/rel/commons-pool-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-pool/refs/tags/commons-pool-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-pool/refs/tags/POOL_${_VERSION_}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE [1.5.4] ---
-Apache Commons Pool
-Copyright 1999-2009 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
- APACHE COMMONS POOL DERIVATIVE WORKS:
-   
-   The LinkedBlockingDeque implementation is based on an implementation written by
-   Doug Lea with assistance from members of JCP JSR-166 Expert Group and released
-   to the public domain, as explained at
-   http://creativecommons.org/licenses/publicdomain
-# --- END LICENSE FILE [1.5.4] ---
 # --- BEGIN LICENSE FILE [2.12.0] ---
 Apache Commons Pool
 Copyright 2001-2023 The Apache Software Foundation
@@ -24,3 +13,10 @@ Copyright 2001-2023 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
 # --- END LICENSE FILE [2.12.0] ---
+# --- BEGIN LICENSE FILE [1.5.4] ---
+Apache Commons Pool
+Copyright 1999-2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+# --- END LICENSE FILE [1.5.4] ---
diff --git a/doc/licenses/apache-commons-text/NOTICE.txt b/doc/licenses/apache-commons-text/NOTICE.txt
index b687d8072..1deb3e9e4 100644
--- a/doc/licenses/apache-commons-text/NOTICE.txt
+++ b/doc/licenses/apache-commons-text/NOTICE.txt
@@ -2,11 +2,13 @@
 # URL:     https://commons.apache.org/proper/commons-text/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/commons-text/refs/tags/rel/commons-text-${VERSION}/NOTICE.txt
+# Source:  https://raw.githubusercontent.com/apache/commons-text/refs/tags/commons-text-${VERSION}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.12.0] ---
 Apache Commons Text
-Copyright 2014-2023 The Apache Software Foundation
+Copyright 2014-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.12.0] ---
diff --git a/doc/licenses/apache-directory-api/NOTICE b/doc/licenses/apache-directory-api/NOTICE
index bd0ad5039..484c6ba60 100644
--- a/doc/licenses/apache-directory-api/NOTICE
+++ b/doc/licenses/apache-directory-api/NOTICE
@@ -2,11 +2,12 @@
 # URL:     http://directory.apache.org
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/directory-ldap-api/refs/tags/${VERSION}/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.1.7] ---
 Apache Directory LDAP API
-Copyright 2003-2023 The Apache Software Foundation
+Copyright 2003-2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (https://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.1.7] ---
diff --git a/doc/licenses/apache-mina/NOTICE b/doc/licenses/apache-mina/NOTICE
index cfcc893d1..7450f1c7c 100644
--- a/doc/licenses/apache-mina/NOTICE
+++ b/doc/licenses/apache-mina/NOTICE
@@ -2,11 +2,12 @@
 # URL:     https://mina.apache.org/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/mina/refs/tags/${VERSION}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.2.4] ---
 Apache MINA
 Copyright 2007-2023 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.2.4] ---
diff --git a/doc/licenses/apache-santuario/NOTICE b/doc/licenses/apache-santuario/NOTICE
index 37652853f..9b59ecb87 100644
--- a/doc/licenses/apache-santuario/NOTICE
+++ b/doc/licenses/apache-santuario/NOTICE
@@ -1,9 +1,10 @@
-# Name:    Apache Santuario
+# Name:    Apache Santuario - XML Security for Java
 # URL:     https://santuario.apache.org/
 # From:    'Apache Software Foundation' (https://www.apache.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apache/santuario-xml-security-java/refs/tags/xmlsec-${VERSION}/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.2.6] ---
 Apache Santuario - XML Security for Java
 Copyright 1999-2022 The Apache Software Foundation
 
@@ -18,4 +19,4 @@ Commission in the <WebSig> project in the ISIS Programme.
 
 This product contains software that is
 copyright (c) 2021, Oracle and/or its affiliates.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.2.6] ---
diff --git a/doc/licenses/assert/LICENSE b/doc/licenses/assert/LICENSE
index 2c2547ff2..3504b4435 100644
--- a/doc/licenses/assert/LICENSE
+++ b/doc/licenses/assert/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/browserify/commonjs-assert/
 # From:    'Joyent, Inc. and other Node contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/browserify/commonjs-assert/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.5.0] ---
 Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -22,4 +23,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.5.0] ---
diff --git a/doc/licenses/base64-js/LICENSE b/doc/licenses/base64-js/LICENSE
index 406111427..a0c31053a 100644
--- a/doc/licenses/base64-js/LICENSE
+++ b/doc/licenses/base64-js/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/beatgammit/base64-js
 # From:    'Jameson Little' (https://github.com/beatgammit/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/beatgammit/base64-js/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.5.1] ---
 The MIT License (MIT)
 
 Copyright (c) 2014 Jameson Little
@@ -25,5 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-Footer
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.5.1] ---
diff --git a/doc/licenses/blob-polyfill/LICENSE.md b/doc/licenses/blob-polyfill/LICENSE.md
index 90104b470..ddab2389c 100644
--- a/doc/licenses/blob-polyfill/LICENSE.md
+++ b/doc/licenses/blob-polyfill/LICENSE.md
@@ -1,9 +1,10 @@
-# Name:    Blob.js
-# URL:     https://github.com/eligrey/Blob.js/
+# Name:    Blob Polyfill
+# URL:     https://github.com/bjornstar/blob-polyfill
 # From:    'Eli Grey' (https://github.com/eligrey)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/bjornstar/blob-polyfill/refs/tags/v${VERSION}/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [9.0.20240710] ---
 Copyright © 2014 [Eli Grey][1].
 
 Permission is hereby granted, free of charge, to any person
@@ -28,5 +29,5 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 
 
-  [1]: http://eligrey.com
-# --- END LICENSE FILE ---
+  [1]: https://eligrey.com
+# --- END LICENSE FILE [9.0.20240710] ---
diff --git a/doc/licenses/bouncycastle/LICENSE b/doc/licenses/bouncycastle/LICENSE
index 01923774d..93173ee10 100644
--- a/doc/licenses/bouncycastle/LICENSE
+++ b/doc/licenses/bouncycastle/LICENSE
@@ -3,15 +3,6 @@
 # From:    'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
 # License: MIT
 #
-# --- BEGIN LICENSE FILE [1.44] ---
-Copyright (c) 2000 - 2016 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE [1.44] ---
 # --- BEGIN LICENSE FILE ---
 Copyright (c) 2000-2024 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org).
 
diff --git a/doc/licenses/buffer/LICENSE b/doc/licenses/buffer/LICENSE
index bb8590ee4..35947b835 100644
--- a/doc/licenses/buffer/LICENSE
+++ b/doc/licenses/buffer/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/feross/buffer
 # From:    'Feross Aboukhadijeh' (https://github.com/feross)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/feross/buffer/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [4.9.2] ---
 The MIT License (MIT)
 
 Copyright (c) Feross Aboukhadijeh, and other contributors.
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [4.9.2] ---
diff --git a/doc/licenses/cas-client/NOTICE b/doc/licenses/cas-client/NOTICE
index 23916f811..286277751 100644
--- a/doc/licenses/cas-client/NOTICE
+++ b/doc/licenses/cas-client/NOTICE
@@ -2,8 +2,10 @@
 # URL:     https://www.apereo.org/projects/cas
 # From:    'Apereo Foundation' (https://www.apereo.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/apereo/java-cas-client/refs/tags/v${VERSION}/cas-client-core/NOTICE
+# Source:  https://raw.githubusercontent.com/apereo/java-cas-client/refs/tags/cas-client-${VERSION}/cas-client-core/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.6.4] ---
 This project includes:
   Jasig CAS Client for Java - Core under Apache License Version 2.0
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.6.4] ---
diff --git a/doc/licenses/checker-qual/LICENSE.txt b/doc/licenses/checker-qual/LICENSE.txt
index f1ad04705..e5709a2b7 100644
--- a/doc/licenses/checker-qual/LICENSE.txt
+++ b/doc/licenses/checker-qual/LICENSE.txt
@@ -2,8 +2,9 @@
 # URL:     https://checkerframework.org/
 # From:    'Checker Framework developers' (https://checkerframework.org/)
 # License: MIT
+# Source: https://raw.githubusercontent.com/typetools/checker-framework/refs/tags/checker-framework-${VERSION}/checker-qual/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.37.0] ---
 Checker Framework qualifiers
 Copyright 2004-present by the Checker Framework developers
 
@@ -26,4 +27,28 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.37.0] ---
+# --- BEGIN LICENSE FILE [3.19.0] ---
+Checker Framework qualifiers
+Copyright 2004-present by the Checker Framework developers
+
+MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+# --- END LICENSE FILE [3.19.0] ---
diff --git a/doc/licenses/clean-license-files.sh b/doc/licenses/clean-license-files.sh
new file mode 100755
index 000000000..d1aaca612
--- /dev/null
+++ b/doc/licenses/clean-license-files.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+#
+
+#
+# clean-license-files.sh
+# ----------------------
+#
+# Removes all stored license content for all files with at least one "Source"
+# header, so that the build will automatically pull down the latest license
+# content when run. The license content downloaded may need to be manually
+# edited, particularly if dependency NOTICE files contain extra information
+# that need not be kept in Guacamole's NOTICE files.
+#
+# This script is expected to be manually invoked when updating the license data
+# of dependencies, particularly when dependencies are updated.
+#
+# USAGE:
+#
+#     path/to/clean-license-files.sh
+#
+
+##
+## The directory containing this script and all license information. This
+## should be "doc/licenses/" within the guacamole-client source tree.
+##
+LICENSES_DIR="`dirname "$0"`"
+
+find "$LICENSES_DIR" -type f \
+    | xargs grep -l '^# --- BEGIN LICENSE FILE \(\[[^]]*\] \)\?---$' \
+    | xargs grep -l '^#[[:space:]]*Source:' \
+    | while read FILENAME; do
+
+    sed -i -n \
+        -e '/^# --- BEGIN LICENSE FILE \(\[[^]]*\] \)\?---$/q' \
+        -e 'p' \
+        "$FILENAME"
+
+done
diff --git a/doc/licenses/core-util-is/LICENSE b/doc/licenses/core-util-is/LICENSE
deleted file mode 100644
index 16bfcaaa9..000000000
--- a/doc/licenses/core-util-is/LICENSE
+++ /dev/null
@@ -1,26 +0,0 @@
-# Name:    core-util-is
-# URL:     https://github.com/isaacs/core-util-is
-# From:    'Node.js contributors'
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-Copyright Node.js contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/core-util-is/dep-coordinates.txt b/doc/licenses/core-util-is/dep-coordinates.txt
deleted file mode 100644
index 988b9f79e..000000000
--- a/doc/licenses/core-util-is/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-core-util-is:*
diff --git a/doc/licenses/css-loader/LICENSE b/doc/licenses/css-loader/LICENSE
index dd0b11e39..5ccede99c 100644
--- a/doc/licenses/css-loader/LICENSE
+++ b/doc/licenses/css-loader/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/webpack-contrib/css-loader
 # From:    'JS Foundation and other contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/webpack/css-loader/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [5.2.7] ---
 Copyright JS Foundation and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -24,4 +25,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [5.2.7] ---
diff --git a/doc/licenses/csv/LICENSE b/doc/licenses/csv/LICENSE
index 6f37e2fad..66f7852a1 100644
--- a/doc/licenses/csv/LICENSE
+++ b/doc/licenses/csv/LICENSE
@@ -2,8 +2,10 @@
 # URL:     https://github.com/adaltas/node-csv
 # From:    'Adaltas' (https://github.com/adaltas)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/adaltas/node-csv/refs/tags/csv-parse@${VERSION}/LICENSE
+# Source:  https://raw.githubusercontent.com/adaltas/node-csv/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [5.5.6] ---
 The MIT License (MIT)
 
 Copyright (c) 2010 Adaltas
@@ -25,4 +27,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [5.5.6] ---
diff --git a/doc/licenses/d3-path/LICENSE b/doc/licenses/d3-path/LICENSE
index d141314d6..844e6828d 100644
--- a/doc/licenses/d3-path/LICENSE
+++ b/doc/licenses/d3-path/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/d3/d3-path
 # From:    'Mike Bostock'
 # License: BSD 0-clause 
+# Source:  https://raw.githubusercontent.com/d3/d3-path/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.1.0] ---
 Copyright 2015-2022 Mike Bostock
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
@@ -17,4 +18,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.1.0] ---
diff --git a/doc/licenses/d3-shape/LICENSE b/doc/licenses/d3-shape/LICENSE
index 2592715d8..6ed98c3b7 100644
--- a/doc/licenses/d3-shape/LICENSE
+++ b/doc/licenses/d3-shape/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/d3/d3-shape
 # From:    'Mike Bostock'
 # License: BSD 0-clause 
+# Source:  https://raw.githubusercontent.com/d3/d3-shape/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.2.0] ---
 Copyright 2010-2022 Mike Bostock
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
@@ -17,4 +18,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
 OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
 THIS SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.2.0] ---
diff --git a/doc/licenses/datalist-polyfill/LICENSE b/doc/licenses/datalist-polyfill/LICENSE
index e8784f5cc..4a901d332 100644
--- a/doc/licenses/datalist-polyfill/LICENSE
+++ b/doc/licenses/datalist-polyfill/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/mfranzke/datalist-polyfill
 # From:    'Maximilian Franzke' (https://github.com/mfranzke)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/mfranzke/datalist-polyfill/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.25.1] ---
 MIT License
 
 Copyright (c) 2017 
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.25.1] ---
diff --git a/doc/licenses/dom4j/LICENSE b/doc/licenses/dom4j/LICENSE
index 7cba7fbaf..2bb0477c9 100644
--- a/doc/licenses/dom4j/LICENSE
+++ b/doc/licenses/dom4j/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://dom4j.github.io/
 # From:    'MetaStuff, Ltd. and DOM4J contributors'
 # License: DOM4J License 
+# Source:  https://raw.githubusercontent.com/dom4j/dom4j/refs/tags/version-${MAJOR}.${MINOR}.${PATCH}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.1.4_1] ---
 Copyright 2001-2023 © MetaStuff, Ltd. and DOM4J contributors. All Rights Reserved.
 
 Redistribution and use of this software and associated documentation
@@ -43,4 +44,4 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.1.4_1] ---
diff --git a/doc/licenses/duo-universal-sdk/LICENSE b/doc/licenses/duo-universal-sdk/LICENSE
index b06c958c1..6bca56ac3 100644
--- a/doc/licenses/duo-universal-sdk/LICENSE
+++ b/doc/licenses/duo-universal-sdk/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://duo.com/docs/duoweb
 # From:    'Cisco Systems'
 # License: Duo License 
+# Source:  https://raw.githubusercontent.com/duosecurity/duo_universal_java/refs/tags/${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.3.1] ---
 Copyright (c) 2022 Cisco Systems, Inc. and/or its affiliates
 All rights reserved.
 
@@ -29,4 +30,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.3.1] ---
diff --git a/doc/licenses/events/LICENSE b/doc/licenses/events/LICENSE
deleted file mode 100644
index dc1323d26..000000000
--- a/doc/licenses/events/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-# Name:    events
-# URL:     https://github.com/browserify/events
-# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-MIT
-
-Copyright Joyent, Inc. and other Node contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/events/dep-coordinates.txt b/doc/licenses/events/dep-coordinates.txt
deleted file mode 100644
index 0e9b849d3..000000000
--- a/doc/licenses/events/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-events:*
diff --git a/doc/licenses/fuzzysort/LICENSE b/doc/licenses/fuzzysort/LICENSE
index ea1d380f7..7de998fb2 100644
--- a/doc/licenses/fuzzysort/LICENSE
+++ b/doc/licenses/fuzzysort/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/farzher/fuzzysort/tree/master
 # From:    'Stephen Kamenar' (https://github.com/farzher)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/farzher/fuzzysort/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.0.2] ---
 MIT License
 
 Copyright (c) 2018 Stephen Kamenar
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.0.2] ---
diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh
index 2afd52ee1..62b678a19 100755
--- a/doc/licenses/generate-license-files.sh
+++ b/doc/licenses/generate-license-files.sh
@@ -464,6 +464,45 @@ get_license() {
 
 }
 
+##
+## Downloads and appends the given version of the license file stored within
+## the source tree at the given location. The source URL is determined by the
+## value of any "Source" headers in the file. If multiple "Source" headers are
+## present, each are tried in order until the download succeeds. If all
+## download attempts fail, a license error is flagged.
+##
+## @param FILENAME
+##     The file within the source tree to update. This file must contain at
+##     least one "Source" header.
+##
+## @param VERSION
+##     The version of the file to download.
+##
+append_license() {
+
+    local FILENAME="$1"
+    local VERSION="$2"
+
+    get_header_value "$FILENAME" Source \
+        | subst_version "$VERSION" \
+        | while read -r LICENSE_URL; do
+
+        local LICENSE="`curl -SsfL "$LICENSE_URL" | sed 's:\r$::g'`"
+        if [ -n "$LICENSE" ]; then
+            info "Successfully downloaded from URL \"$LICENSE_URL\"."
+            printf '# --- BEGIN LICENSE FILE [%s] ---\n' "$VERSION"
+            printf '%s\n' "$LICENSE"
+            printf '# --- END LICENSE FILE [%s] ---\n' "$VERSION"
+            exit 1
+        fi
+
+        info "Failed to download from URL \"$LICENSE_URL\"."
+
+    done >> "$FILENAME" \
+        && error "All download attempts failed for `basename "$FILENAME"` ($VERSION)."
+
+}
+
 # Verify that an output directory was provided
 if [ -z "$DEPENDENCY_LIST" -o -z "$OUTPUT_DIR" ]; then
     error "USAGE: $0 DEPENDENCY_LIST OUTPUT_DIRECTORY"
@@ -514,6 +553,15 @@ EOF
         PREAMBLE_ADDED=1
     fi
 
+    # Refresh any outstanding licenses from defined download link
+    find "$LICENSE_INFO_DIR" -type f | xargs grep -l '^#[[:space:]]*Source:' \
+        | while read FILENAME; do
+        if [ -z "`get_license "$FILENAME" "$VERSION"`" ]; then
+            info "Downloading updated `basename "$FILENAME"` for `basename "$LICENSE_INFO_DIR"` ($VERSION)..."
+            append_license "$FILENAME" "$VERSION"
+        fi
+    done
+
     # Locate LICENSE and NOTICE files
     LICENSE_FILE="`license_file "$LICENSE_INFO_DIR"`"
     NOTICE_FILE="`notice_file "$LICENSE_INFO_DIR"`"
diff --git a/doc/licenses/glassfish-hk2/LICENSE.md b/doc/licenses/glassfish-hk2/LICENSE.md
index 52c3162c2..1357eb23e 100644
--- a/doc/licenses/glassfish-hk2/LICENSE.md
+++ b/doc/licenses/glassfish-hk2/LICENSE.md
@@ -2,643 +2,644 @@
 # URL:     https://eclipse-ee4j.github.io/glassfish-hk2/
 # From:    'Eclipse Foundation' (https://www.eclipse.org/)
 # License: EPL v2.0 
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2/refs/tags/${VERSION}/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor:
-         i) changes to the Program, and
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following
-    Secondary Licenses when the conditions for such availability set forth
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
-
----
-
-##    The GNU General Public License (GPL) Version 2, June 1991
-
-    Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-    51 Franklin Street, Fifth Floor
-    Boston, MA 02110-1335
-    USA
-
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-    Preamble
-
-    The licenses for most software are designed to take away your freedom to
-    share and change it. By contrast, the GNU General Public License is
-    intended to guarantee your freedom to share and change free software--to
-    make sure the software is free for all its users. This General Public
-    License applies to most of the Free Software Foundation's software and
-    to any other program whose authors commit to using it. (Some other Free
-    Software Foundation software is covered by the GNU Library General
-    Public License instead.) You can apply it to your programs, too.
-
-    When we speak of free software, we are referring to freedom, not price.
-    Our General Public Licenses are designed to make sure that you have the
-    freedom to distribute copies of free software (and charge for this
-    service if you wish), that you receive source code or can get it if you
-    want it, that you can change the software or use pieces of it in new
-    free programs; and that you know you can do these things.
-
-    To protect your rights, we need to make restrictions that forbid anyone
-    to deny you these rights or to ask you to surrender the rights. These
-    restrictions translate to certain responsibilities for you if you
-    distribute copies of the software, or if you modify it.
-
-    For example, if you distribute copies of such a program, whether gratis
-    or for a fee, you must give the recipients all the rights that you have.
-    You must make sure that they, too, receive or can get the source code.
-    And you must show them these terms so they know their rights.
-
-    We protect your rights with two steps: (1) copyright the software, and
-    (2) offer you this license which gives you legal permission to copy,
-    distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-    that everyone understands that there is no warranty for this free
-    software. If the software is modified by someone else and passed on, we
-    want its recipients to know that what they have is not the original, so
-    that any problems introduced by others will not reflect on the original
-    authors' reputations.
-
-    Finally, any free program is threatened constantly by software patents.
-    We wish to avoid the danger that redistributors of a free program will
-    individually obtain patent licenses, in effect making the program
-    proprietary. To prevent this, we have made it clear that any patent must
-    be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-    modification follow.
-
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains a
-    notice placed by the copyright holder saying it may be distributed under
-    the terms of this General Public License. The "Program", below, refers
-    to any such program or work, and a "work based on the Program" means
-    either the Program or any derivative work under copyright law: that is
-    to say, a work containing the Program or a portion of it, either
-    verbatim or with modifications and/or translated into another language.
-    (Hereinafter, translation is included without limitation in the term
-    "modification".) Each licensee is addressed as "you".
-
-    Activities other than copying, distribution and modification are not
-    covered by this License; they are outside its scope. The act of running
-    the Program is not restricted, and the output from the Program is
-    covered only if its contents constitute a work based on the Program
-    (independent of having been made by running the Program). Whether that
-    is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's source
-    code as you receive it, in any medium, provided that you conspicuously
-    and appropriately publish on each copy an appropriate copyright notice
-    and disclaimer of warranty; keep intact all the notices that refer to
-    this License and to the absence of any warranty; and give any other
-    recipients of the Program a copy of this License along with the Program.
-
-    You may charge a fee for the physical act of transferring a copy, and
-    you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion of
-    it, thus forming a work based on the Program, and copy and distribute
-    such modifications or work under the terms of Section 1 above, provided
-    that you also meet all of these conditions:
-
-        a) You must cause the modified files to carry prominent notices
-        stating that you changed the files and the date of any change.
-
-        b) You must cause any work that you distribute or publish, that in
-        whole or in part contains or is derived from the Program or any part
-        thereof, to be licensed as a whole at no charge to all third parties
-        under the terms of this License.
-
-        c) If the modified program normally reads commands interactively
-        when run, you must cause it, when started running for such
-        interactive use in the most ordinary way, to print or display an
-        announcement including an appropriate copyright notice and a notice
-        that there is no warranty (or else, saying that you provide a
-        warranty) and that users may redistribute the program under these
-        conditions, and telling the user how to view a copy of this License.
-        (Exception: if the Program itself is interactive but does not
-        normally print such an announcement, your work based on the Program
-        is not required to print an announcement.)
-
-    These requirements apply to the modified work as a whole. If
-    identifiable sections of that work are not derived from the Program, and
-    can be reasonably considered independent and separate works in
-    themselves, then this License, and its terms, do not apply to those
-    sections when you distribute them as separate works. But when you
-    distribute the same sections as part of a whole which is a work based on
-    the Program, the distribution of the whole must be on the terms of this
-    License, whose permissions for other licensees extend to the entire
-    whole, and thus to each and every part regardless of who wrote it.
-
-    Thus, it is not the intent of this section to claim rights or contest
-    your rights to work written entirely by you; rather, the intent is to
-    exercise the right to control the distribution of derivative or
-    collective works based on the Program.
-
-    In addition, mere aggregation of another work not based on the Program
-    with the Program (or with a work based on the Program) on a volume of a
-    storage or distribution medium does not bring the other work under the
-    scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-    under Section 2) in object code or executable form under the terms of
-    Sections 1 and 2 above provided that you also do one of the following:
-
-        a) Accompany it with the complete corresponding machine-readable
-        source code, which must be distributed under the terms of Sections 1
-        and 2 above on a medium customarily used for software interchange; or,
-
-        b) Accompany it with a written offer, valid for at least three
-        years, to give any third party, for a charge no more than your cost
-        of physically performing source distribution, a complete
-        machine-readable copy of the corresponding source code, to be
-        distributed under the terms of Sections 1 and 2 above on a medium
-        customarily used for software interchange; or,
-
-        c) Accompany it with the information you received as to the offer to
-        distribute corresponding source code. (This alternative is allowed
-        only for noncommercial distribution and only if you received the
-        program in object code or executable form with such an offer, in
-        accord with Subsection b above.)
-
-    The source code for a work means the preferred form of the work for
-    making modifications to it. For an executable work, complete source code
-    means all the source code for all modules it contains, plus any
-    associated interface definition files, plus the scripts used to control
-    compilation and installation of the executable. However, as a special
-    exception, the source code distributed need not include anything that is
-    normally distributed (in either source or binary form) with the major
-    components (compiler, kernel, and so on) of the operating system on
-    which the executable runs, unless that component itself accompanies the
-    executable.
-
-    If distribution of executable or object code is made by offering access
-    to copy from a designated place, then offering equivalent access to copy
-    the source code from the same place counts as distribution of the source
-    code, even though third parties are not compelled to copy the source
-    along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-    except as expressly provided under this License. Any attempt otherwise
-    to copy, modify, sublicense or distribute the Program is void, and will
-    automatically terminate your rights under this License. However, parties
-    who have received copies, or rights, from you under this License will
-    not have their licenses terminated so long as such parties remain in
-    full compliance.
-
-    5. You are not required to accept this License, since you have not
-    signed it. However, nothing else grants you permission to modify or
-    distribute the Program or its derivative works. These actions are
-    prohibited by law if you do not accept this License. Therefore, by
-    modifying or distributing the Program (or any work based on the
-    Program), you indicate your acceptance of this License to do so, and all
-    its terms and conditions for copying, distributing or modifying the
-    Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-    Program), the recipient automatically receives a license from the
-    original licensor to copy, distribute or modify the Program subject to
-    these terms and conditions. You may not impose any further restrictions
-    on the recipients' exercise of the rights granted herein. You are not
-    responsible for enforcing compliance by third parties to this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-    infringement or for any other reason (not limited to patent issues),
-    conditions are imposed on you (whether by court order, agreement or
-    otherwise) that contradict the conditions of this License, they do not
-    excuse you from the conditions of this License. If you cannot distribute
-    so as to satisfy simultaneously your obligations under this License and
-    any other pertinent obligations, then as a consequence you may not
-    distribute the Program at all. For example, if a patent license would
-    not permit royalty-free redistribution of the Program by all those who
-    receive copies directly or indirectly through you, then the only way you
-    could satisfy both it and this License would be to refrain entirely from
-    distribution of the Program.
-
-    If any portion of this section is held invalid or unenforceable under
-    any particular circumstance, the balance of the section is intended to
-    apply and the section as a whole is intended to apply in other
-    circumstances.
-
-    It is not the purpose of this section to induce you to infringe any
-    patents or other property right claims or to contest validity of any
-    such claims; this section has the sole purpose of protecting the
-    integrity of the free software distribution system, which is implemented
-    by public license practices. Many people have made generous
-    contributions to the wide range of software distributed through that
-    system in reliance on consistent application of that system; it is up to
-    the author/donor to decide if he or she is willing to distribute
-    software through any other system and a licensee cannot impose that choice.
-
-    This section is intended to make thoroughly clear what is believed to be
-    a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-    certain countries either by patents or by copyrighted interfaces, the
-    original copyright holder who places the Program under this License may
-    add an explicit geographical distribution limitation excluding those
-    countries, so that distribution is permitted only in or among countries
-    not thus excluded. In such case, this License incorporates the
-    limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new
-    versions of the General Public License from time to time. Such new
-    versions will be similar in spirit to the present version, but may
-    differ in detail to address new problems or concerns.
-
-    Each version is given a distinguishing version number. If the Program
-    specifies a version number of this License which applies to it and "any
-    later version", you have the option of following the terms and
-    conditions either of that version or of any later version published by
-    the Free Software Foundation. If the Program does not specify a version
-    number of this License, you may choose any version ever published by the
-    Free Software Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-    programs whose distribution conditions are different, write to the
-    author to ask for permission. For software which is copyrighted by the
-    Free Software Foundation, write to the Free Software Foundation; we
-    sometimes make exceptions for this. Our decision will be guided by the
-    two goals of preserving the free status of all derivatives of our free
-    software and of promoting the sharing and reuse of software generally.
-
-    NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-    EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-    OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-    EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-    NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-    AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    END OF TERMS AND CONDITIONS
-
-    How to Apply These Terms to Your New Programs
-
-    If you develop a new program, and you want it to be of the greatest
-    possible use to the public, the best way to achieve this is to make it
-    free software which everyone can redistribute and change under these terms.
-
-    To do so, attach the following notices to the program. It is safest to
-    attach them to the start of each source file to most effectively convey
-    the exclusion of warranty; and each file should have at least the
-    "copyright" line and a pointer to where the full notice is found.
-
-        One line to give the program's name and a brief idea of what it does.
-        Copyright (C) <year> <name of author>
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful, but
-        WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-        General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-    Also add information on how to contact you by electronic and paper mail.
-
-    If the program is interactive, make it output a short notice like this
-    when it starts in an interactive mode:
-
-        Gnomovision version 69, Copyright (C) year name of author
-        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
-        `show w'. This is free software, and you are welcome to redistribute
-        it under certain conditions; type `show c' for details.
-
-    The hypothetical commands `show w' and `show c' should show the
-    appropriate parts of the General Public License. Of course, the commands
-    you use may be called something other than `show w' and `show c'; they
-    could even be mouse-clicks or menu items--whatever suits your program.
-
-    You should also get your employer (if you work as a programmer) or your
-    school, if any, to sign a "copyright disclaimer" for the program, if
-    necessary. Here is a sample; alter the names:
-
-        Yoyodyne, Inc., hereby disclaims all copyright interest in the
-        program `Gnomovision' (which makes passes at compilers) written by
-        James Hacker.
-
-        signature of Ty Coon, 1 April 1989
-        Ty Coon, President of Vice
-
-    This General Public License does not permit incorporating your program
-    into proprietary programs. If your program is a subroutine library, you
-    may consider it more useful to permit linking proprietary applications
-    with the library. If this is what you want to do, use the GNU Library
-    General Public License instead of this License.
-
----
-
-## CLASSPATH EXCEPTION
-
-    Linking this library statically or dynamically with other modules is
-    making a combined work based on this library.  Thus, the terms and
-    conditions of the GNU General Public License version 2 cover the whole
-    combination.
-
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent
-    modules, and to copy and distribute the resulting executable under
-    terms of your choice, provided that you also meet, for each linked
-    independent module, the terms and conditions of the license of that
-    module.  An independent module is a module which is not derived from or
-    based on this library.  If you modify this library, you may extend this
-    exception to your version of the library, but you are not obligated to
-    do so.  If you do not wish to do so, delete this exception statement
-    from your version.
-# --- END LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.6.1] ---
+# Eclipse Public License - v 2.0
+
+        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+    1. DEFINITIONS
+
+    "Contribution" means:
+
+      a) in the case of the initial Contributor, the initial content
+         Distributed under this Agreement, and
+
+      b) in the case of each subsequent Contributor:
+         i) changes to the Program, and
+         ii) additions to the Program;
+      where such changes and/or additions to the Program originate from
+      and are Distributed by that particular Contributor. A Contribution
+      "originates" from a Contributor if it was added to the Program by
+      such Contributor itself or anyone acting on such Contributor's behalf.
+      Contributions do not include changes or additions to the Program that
+      are not Modified Works.
+
+    "Contributor" means any person or entity that Distributes the Program.
+
+    "Licensed Patents" mean patent claims licensable by a Contributor which
+    are necessarily infringed by the use or sale of its Contribution alone
+    or when combined with the Program.
+
+    "Program" means the Contributions Distributed in accordance with this
+    Agreement.
+
+    "Recipient" means anyone who receives the Program under this Agreement
+    or any Secondary License (as applicable), including Contributors.
+
+    "Derivative Works" shall mean any work, whether in Source Code or other
+    form, that is based on (or derived from) the Program and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship.
+
+    "Modified Works" shall mean any work in Source Code or other form that
+    results from an addition to, deletion from, or modification of the
+    contents of the Program, including, for purposes of clarity any new file
+    in Source Code form that contains any contents of the Program. Modified
+    Works shall not include works that contain only declarations,
+    interfaces, types, classes, structures, or files of the Program solely
+    in each case in order to link to, bind by name, or subclass the Program
+    or Modified Works thereof.
+
+    "Distribute" means the acts of a) distributing or b) making available
+    in any manner that enables the transfer of a copy.
+
+    "Source Code" means the form of a Program preferred for making
+    modifications, including but not limited to software source code,
+    documentation source, and configuration files.
+
+    "Secondary License" means either the GNU General Public License,
+    Version 2.0, or any later versions of that license, including any
+    exceptions or additional permissions as identified by the initial
+    Contributor.
+
+    2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free copyright
+      license to reproduce, prepare Derivative Works of, publicly display,
+      publicly perform, Distribute and sublicense the Contribution of such
+      Contributor, if any, and such Derivative Works.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free patent
+      license under Licensed Patents to make, use, sell, offer to sell,
+      import and otherwise transfer the Contribution of such Contributor,
+      if any, in Source Code or other form. This patent license shall
+      apply to the combination of the Contribution and the Program if, at
+      the time the Contribution is added by the Contributor, such addition
+      of the Contribution causes such combination to be covered by the
+      Licensed Patents. The patent license shall not apply to any other
+      combinations which include the Contribution. No hardware per se is
+      licensed hereunder.
+
+      c) Recipient understands that although each Contributor grants the
+      licenses to its Contributions set forth herein, no assurances are
+      provided by any Contributor that the Program does not infringe the
+      patent or other intellectual property rights of any other entity.
+      Each Contributor disclaims any liability to Recipient for claims
+      brought by any other entity based on infringement of intellectual
+      property rights or otherwise. As a condition to exercising the
+      rights and licenses granted hereunder, each Recipient hereby
+      assumes sole responsibility to secure any other intellectual
+      property rights needed, if any. For example, if a third party
+      patent license is required to allow Recipient to Distribute the
+      Program, it is Recipient's responsibility to acquire that license
+      before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has
+      sufficient copyright rights in its Contribution, if any, to grant
+      the copyright license set forth in this Agreement.
+
+      e) Notwithstanding the terms of any Secondary License, no
+      Contributor makes additional grants to any Recipient (other than
+      those set forth in this Agreement) as a result of such Recipient's
+      receipt of the Program under the terms of a Secondary License
+      (if permitted under the terms of Section 3).
+
+    3. REQUIREMENTS
+
+    3.1 If a Contributor Distributes the Program in any form, then:
+
+      a) the Program must also be made available as Source Code, in
+      accordance with section 3.2, and the Contributor must accompany
+      the Program with a statement that the Source Code for the Program
+      is available under this Agreement, and informs Recipients how to
+      obtain it in a reasonable manner on or through a medium customarily
+      used for software exchange; and
+
+      b) the Contributor may Distribute the Program under a license
+      different than this Agreement, provided that such license:
+         i) effectively disclaims on behalf of all other Contributors all
+         warranties and conditions, express and implied, including
+         warranties or conditions of title and non-infringement, and
+         implied warranties or conditions of merchantability and fitness
+         for a particular purpose;
+
+         ii) effectively excludes on behalf of all other Contributors all
+         liability for damages, including direct, indirect, special,
+         incidental and consequential damages, such as lost profits;
+
+         iii) does not attempt to limit or alter the recipients' rights
+         in the Source Code under section 3.2; and
+
+         iv) requires any subsequent distribution of the Program by any
+         party to be under a license that satisfies the requirements
+         of this section 3.
+
+    3.2 When the Program is Distributed as Source Code:
+
+      a) it must be made available under this Agreement, or if the
+      Program (i) is combined with other material in a separate file or
+      files made available under a Secondary License, and (ii) the initial
+      Contributor attached to the Source Code the notice described in
+      Exhibit A of this Agreement, then the Program may be made available
+      under the terms of such Secondary Licenses, and
+
+      b) a copy of this Agreement must be included with each copy of
+      the Program.
+
+    3.3 Contributors may not remove or alter any copyright, patent,
+    trademark, attribution notices, disclaimers of warranty, or limitations
+    of liability ("notices") contained within the Program from any copy of
+    the Program which they Distribute, provided that Contributors may add
+    their own appropriate notices.
+
+    4. COMMERCIAL DISTRIBUTION
+
+    Commercial distributors of software may accept certain responsibilities
+    with respect to end users, business partners and the like. While this
+    license is intended to facilitate the commercial use of the Program,
+    the Contributor who includes the Program in a commercial product
+    offering should do so in a manner which does not create potential
+    liability for other Contributors. Therefore, if a Contributor includes
+    the Program in a commercial product offering, such Contributor
+    ("Commercial Contributor") hereby agrees to defend and indemnify every
+    other Contributor ("Indemnified Contributor") against any losses,
+    damages and costs (collectively "Losses") arising from claims, lawsuits
+    and other legal actions brought by a third party against the Indemnified
+    Contributor to the extent caused by the acts or omissions of such
+    Commercial Contributor in connection with its distribution of the Program
+    in a commercial product offering. The obligations in this section do not
+    apply to any claims or Losses relating to any actual or alleged
+    intellectual property infringement. In order to qualify, an Indemnified
+    Contributor must: a) promptly notify the Commercial Contributor in
+    writing of such claim, and b) allow the Commercial Contributor to control,
+    and cooperate with the Commercial Contributor in, the defense and any
+    related settlement negotiations. The Indemnified Contributor may
+    participate in any such claim at its own expense.
+
+    For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those performance
+    claims and warranties, and if a court requires any other Contributor to
+    pay any damages as a result, the Commercial Contributor must pay
+    those damages.
+
+    5. NO WARRANTY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+    PURPOSE. Each Recipient is solely responsible for determining the
+    appropriateness of using and distributing the Program and assumes all
+    risks associated with its exercise of rights under this Agreement,
+    including but not limited to the risks and costs of program errors,
+    compliance with applicable laws, damage to or loss of data, programs
+    or equipment, and unavailability or interruption of operations.
+
+    6. DISCLAIMER OF LIABILITY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.
+
+    7. GENERAL
+
+    If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further
+    action by the parties hereto, such provision shall be reformed to the
+    minimum extent necessary to make such provision valid and enforceable.
+
+    If Recipient institutes patent litigation against any entity
+    (including a cross-claim or counterclaim in a lawsuit) alleging that the
+    Program itself (excluding combinations of the Program with other software
+    or hardware) infringes such Recipient's patent(s), then such Recipient's
+    rights granted under Section 2(b) shall terminate as of the date such
+    litigation is filed.
+
+    All Recipient's rights under this Agreement shall terminate if it
+    fails to comply with any of the material terms or conditions of this
+    Agreement and does not cure such failure in a reasonable period of
+    time after becoming aware of such noncompliance. If all Recipient's
+    rights under this Agreement terminate, Recipient agrees to cease use
+    and distribution of the Program as soon as reasonably practicable.
+    However, Recipient's obligations under this Agreement and any licenses
+    granted by Recipient relating to the Program shall continue and survive.
+
+    Everyone is permitted to copy and distribute copies of this Agreement,
+    but in order to avoid inconsistency the Agreement is copyrighted and
+    may only be modified in the following manner. The Agreement Steward
+    reserves the right to publish new versions (including revisions) of
+    this Agreement from time to time. No one other than the Agreement
+    Steward has the right to modify this Agreement. The Eclipse Foundation
+    is the initial Agreement Steward. The Eclipse Foundation may assign the
+    responsibility to serve as the Agreement Steward to a suitable separate
+    entity. Each new version of the Agreement will be given a distinguishing
+    version number. The Program (including Contributions) may always be
+    Distributed subject to the version of the Agreement under which it was
+    received. In addition, after a new version of the Agreement is published,
+    Contributor may elect to Distribute the Program (including its
+    Contributions) under the new version.
+
+    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+    receives no rights or licenses to the intellectual property of any
+    Contributor under this Agreement, whether expressly, by implication,
+    estoppel or otherwise. All rights in the Program not expressly granted
+    under this Agreement are reserved. Nothing in this Agreement is intended
+    to be enforceable by any entity that is not a Contributor or Recipient.
+    No third-party beneficiary rights are created under this Agreement.
+
+    Exhibit A - Form of Secondary Licenses Notice
+
+    "This Source Code may also be made available under the following
+    Secondary Licenses when the conditions for such availability set forth
+    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    version(s), and exceptions or additional permissions here}."
+
+      Simply including a copy of this Agreement, including this Exhibit A
+      is not sufficient to license the Source Code under Secondary Licenses.
+
+      If it is not possible or desirable to put the notice in a particular
+      file, then You may include the notice in a location (such as a LICENSE
+      file in a relevant directory) where a recipient would be likely to
+      look for such a notice.
+
+      You may add additional accurate notices of copyright ownership.
+
+---
+
+##    The GNU General Public License (GPL) Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+    51 Franklin Street, Fifth Floor
+    Boston, MA 02110-1335
+    USA
+
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+    Preamble
+
+    The licenses for most software are designed to take away your freedom to
+    share and change it. By contrast, the GNU General Public License is
+    intended to guarantee your freedom to share and change free software--to
+    make sure the software is free for all its users. This General Public
+    License applies to most of the Free Software Foundation's software and
+    to any other program whose authors commit to using it. (Some other Free
+    Software Foundation software is covered by the GNU Library General
+    Public License instead.) You can apply it to your programs, too.
+
+    When we speak of free software, we are referring to freedom, not price.
+    Our General Public Licenses are designed to make sure that you have the
+    freedom to distribute copies of free software (and charge for this
+    service if you wish), that you receive source code or can get it if you
+    want it, that you can change the software or use pieces of it in new
+    free programs; and that you know you can do these things.
+
+    To protect your rights, we need to make restrictions that forbid anyone
+    to deny you these rights or to ask you to surrender the rights. These
+    restrictions translate to certain responsibilities for you if you
+    distribute copies of the software, or if you modify it.
+
+    For example, if you distribute copies of such a program, whether gratis
+    or for a fee, you must give the recipients all the rights that you have.
+    You must make sure that they, too, receive or can get the source code.
+    And you must show them these terms so they know their rights.
+
+    We protect your rights with two steps: (1) copyright the software, and
+    (2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software. If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+    Finally, any free program is threatened constantly by software patents.
+    We wish to avoid the danger that redistributors of a free program will
+    individually obtain patent licenses, in effect making the program
+    proprietary. To prevent this, we have made it clear that any patent must
+    be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+    modification follow.
+
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains a
+    notice placed by the copyright holder saying it may be distributed under
+    the terms of this General Public License. The "Program", below, refers
+    to any such program or work, and a "work based on the Program" means
+    either the Program or any derivative work under copyright law: that is
+    to say, a work containing the Program or a portion of it, either
+    verbatim or with modifications and/or translated into another language.
+    (Hereinafter, translation is included without limitation in the term
+    "modification".) Each licensee is addressed as "you".
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope. The act of running
+    the Program is not restricted, and the output from the Program is
+    covered only if its contents constitute a work based on the Program
+    (independent of having been made by running the Program). Whether that
+    is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's source
+    code as you receive it, in any medium, provided that you conspicuously
+    and appropriately publish on each copy an appropriate copyright notice
+    and disclaimer of warranty; keep intact all the notices that refer to
+    this License and to the absence of any warranty; and give any other
+    recipients of the Program a copy of this License along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion of
+    it, thus forming a work based on the Program, and copy and distribute
+    such modifications or work under the terms of Section 1 above, provided
+    that you also meet all of these conditions:
+
+        a) You must cause the modified files to carry prominent notices
+        stating that you changed the files and the date of any change.
+
+        b) You must cause any work that you distribute or publish, that in
+        whole or in part contains or is derived from the Program or any part
+        thereof, to be licensed as a whole at no charge to all third parties
+        under the terms of this License.
+
+        c) If the modified program normally reads commands interactively
+        when run, you must cause it, when started running for such
+        interactive use in the most ordinary way, to print or display an
+        announcement including an appropriate copyright notice and a notice
+        that there is no warranty (or else, saying that you provide a
+        warranty) and that users may redistribute the program under these
+        conditions, and telling the user how to view a copy of this License.
+        (Exception: if the Program itself is interactive but does not
+        normally print such an announcement, your work based on the Program
+        is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole. If
+    identifiable sections of that work are not derived from the Program, and
+    can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works. But when you
+    distribute the same sections as part of a whole which is a work based on
+    the Program, the distribution of the whole must be on the terms of this
+    License, whose permissions for other licensees extend to the entire
+    whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of a
+    storage or distribution medium does not bring the other work under the
+    scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+    under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+        a) Accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of Sections 1
+        and 2 above on a medium customarily used for software interchange; or,
+
+        b) Accompany it with a written offer, valid for at least three
+        years, to give any third party, for a charge no more than your cost
+        of physically performing source distribution, a complete
+        machine-readable copy of the corresponding source code, to be
+        distributed under the terms of Sections 1 and 2 above on a medium
+        customarily used for software interchange; or,
+
+        c) Accompany it with the information you received as to the offer to
+        distribute corresponding source code. (This alternative is allowed
+        only for noncommercial distribution and only if you received the
+        program in object code or executable form with such an offer, in
+        accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it. For an executable work, complete source code
+    means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to control
+    compilation and installation of the executable. However, as a special
+    exception, the source code distributed need not include anything that is
+    normally distributed (in either source or binary form) with the major
+    components (compiler, kernel, and so on) of the operating system on
+    which the executable runs, unless that component itself accompanies the
+    executable.
+
+    If distribution of executable or object code is made by offering access
+    to copy from a designated place, then offering equivalent access to copy
+    the source code from the same place counts as distribution of the source
+    code, even though third parties are not compelled to copy the source
+    along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License. Any attempt otherwise
+    to copy, modify, sublicense or distribute the Program is void, and will
+    automatically terminate your rights under this License. However, parties
+    who have received copies, or rights, from you under this License will
+    not have their licenses terminated so long as such parties remain in
+    full compliance.
+
+    5. You are not required to accept this License, since you have not
+    signed it. However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works. These actions are
+    prohibited by law if you do not accept this License. Therefore, by
+    modifying or distributing the Program (or any work based on the
+    Program), you indicate your acceptance of this License to do so, and all
+    its terms and conditions for copying, distributing or modifying the
+    Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+    Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions. You may not impose any further restrictions
+    on the recipients' exercise of the rights granted herein. You are not
+    responsible for enforcing compliance by third parties to this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+    otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License. If you cannot distribute
+    so as to satisfy simultaneously your obligations under this License and
+    any other pertinent obligations, then as a consequence you may not
+    distribute the Program at all. For example, if a patent license would
+    not permit royalty-free redistribution of the Program by all those who
+    receive copies directly or indirectly through you, then the only way you
+    could satisfy both it and this License would be to refrain entirely from
+    distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is implemented
+    by public license practices. Many people have made generous
+    contributions to the wide range of software distributed through that
+    system in reliance on consistent application of that system; it is up to
+    the author/donor to decide if he or she is willing to distribute
+    software through any other system and a licensee cannot impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to be
+    a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License may
+    add an explicit geographical distribution limitation excluding those
+    countries, so that distribution is permitted only in or among countries
+    not thus excluded. In such case, this License incorporates the
+    limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new
+    versions of the General Public License from time to time. Such new
+    versions will be similar in spirit to the present version, but may
+    differ in detail to address new problems or concerns.
+
+    Each version is given a distinguishing version number. If the Program
+    specifies a version number of this License which applies to it and "any
+    later version", you have the option of following the terms and
+    conditions either of that version or of any later version published by
+    the Free Software Foundation. If the Program does not specify a version
+    number of this License, you may choose any version ever published by the
+    Free Software Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the
+    author to ask for permission. For software which is copyrighted by the
+    Free Software Foundation, write to the Free Software Foundation; we
+    sometimes make exceptions for this. Our decision will be guided by the
+    two goals of preserving the free status of all derivatives of our free
+    software and of promoting the sharing and reuse of software generally.
+
+    NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+    EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+    OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+    EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+    NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+    AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    END OF TERMS AND CONDITIONS
+
+    How to Apply These Terms to Your New Programs
+
+    If you develop a new program, and you want it to be of the greatest
+    possible use to the public, the best way to achieve this is to make it
+    free software which everyone can redistribute and change under these terms.
+
+    To do so, attach the following notices to the program. It is safest to
+    attach them to the start of each source file to most effectively convey
+    the exclusion of warranty; and each file should have at least the
+    "copyright" line and a pointer to where the full notice is found.
+
+        One line to give the program's name and a brief idea of what it does.
+        Copyright (C) <year> <name of author>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful, but
+        WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+        General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+    Also add information on how to contact you by electronic and paper mail.
+
+    If the program is interactive, make it output a short notice like this
+    when it starts in an interactive mode:
+
+        Gnomovision version 69, Copyright (C) year name of author
+        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+        `show w'. This is free software, and you are welcome to redistribute
+        it under certain conditions; type `show c' for details.
+
+    The hypothetical commands `show w' and `show c' should show the
+    appropriate parts of the General Public License. Of course, the commands
+    you use may be called something other than `show w' and `show c'; they
+    could even be mouse-clicks or menu items--whatever suits your program.
+
+    You should also get your employer (if you work as a programmer) or your
+    school, if any, to sign a "copyright disclaimer" for the program, if
+    necessary. Here is a sample; alter the names:
+
+        Yoyodyne, Inc., hereby disclaims all copyright interest in the
+        program `Gnomovision' (which makes passes at compilers) written by
+        James Hacker.
+
+        signature of Ty Coon, 1 April 1989
+        Ty Coon, President of Vice
+
+    This General Public License does not permit incorporating your program
+    into proprietary programs. If your program is a subroutine library, you
+    may consider it more useful to permit linking proprietary applications
+    with the library. If this is what you want to do, use the GNU Library
+    General Public License instead of this License.
+
+---
+
+## CLASSPATH EXCEPTION
+
+    Linking this library statically or dynamically with other modules is
+    making a combined work based on this library.  Thus, the terms and
+    conditions of the GNU General Public License version 2 cover the whole
+    combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent
+    modules, and to copy and distribute the resulting executable under
+    terms of your choice, provided that you also meet, for each linked
+    independent module, the terms and conditions of the license of that
+    module.  An independent module is a module which is not derived from or
+    based on this library.  If you modify this library, you may extend this
+    exception to your version of the library, but you are not obligated to
+    do so.  If you do not wish to do so, delete this exception statement
+    from your version.
+# --- END LICENSE FILE [2.6.1] ---
diff --git a/doc/licenses/glassfish-hk2/NOTICE.md b/doc/licenses/glassfish-hk2/NOTICE.md
new file mode 100644
index 000000000..994f2fbcb
--- /dev/null
+++ b/doc/licenses/glassfish-hk2/NOTICE.md
@@ -0,0 +1,22 @@
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2/refs/tags/${VERSION}/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [2.6.1] ---
+# Notices for Eclipse GlassFish
+
+This content is produced and maintained by the Eclipse GlassFish project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.glassfish
+
+## Trademarks
+
+Eclipse GlassFish, and GlassFish are trademarks of the Eclipse Foundation.
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+# --- END LICENSE FILE [2.6.1] ---
diff --git a/doc/licenses/ieee754/LICENSE b/doc/licenses/ieee754/LICENSE
index 0dd69e766..067abbfdc 100644
--- a/doc/licenses/ieee754/LICENSE
+++ b/doc/licenses/ieee754/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/feross/ieee754
 # From:    'Fair Oaks Labs, Inc'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/feross/ieee754/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.2.1] ---
 Copyright 2008 Fair Oaks Labs, Inc.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -15,4 +16,4 @@ Redistribution and use in source and binary forms, with or without modification,
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.2.1] ---
diff --git a/doc/licenses/inherits/LICENSE b/doc/licenses/inherits/LICENSE
index 364e03266..21ee57acb 100644
--- a/doc/licenses/inherits/LICENSE
+++ b/doc/licenses/inherits/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/isaacs/inherits
 # From:    'Isaac Z. Schlueter' (https://github.com/isaacs)
 # License: ISC 
+# Source:  https://raw.githubusercontent.com/isaacs/inherits/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.0.3] ---
 The ISC License
 
 Copyright (c) Isaac Z. Schlueter
@@ -19,4 +20,4 @@ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.0.3] ---
diff --git a/doc/licenses/isarray/LICENSE b/doc/licenses/isarray/LICENSE
index a9072712b..d43107bdc 100644
--- a/doc/licenses/isarray/LICENSE
+++ b/doc/licenses/isarray/LICENSE
@@ -2,18 +2,20 @@
 # URL:     https://github.com/juliangruber/isarray
 # From:    'Julian Gruber' (https://github.com/juliangruber)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/juliangruber/isarray/refs/tags/v${VERSION}/LICENSE
+# Source:  https://raw.githubusercontent.com/juliangruber/isarray/refs/tags/v${VERSION}/README.md
 #
-# --- BEGIN LICENSE FILE ---
-MIT License
+# --- BEGIN LICENSE FILE [1.0.0] ---
+(MIT)
 
-Copyright (c) 2013 Julian Gruber <julian@juliangruber.com>
+Copyright (c) 2013 Julian Gruber &lt;julian@juliangruber.com&gt;
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -25,4 +27,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.0.0] ---
diff --git a/doc/licenses/jackson-databind/NOTICE b/doc/licenses/jackson-databind/NOTICE
index cbd95b854..cd69aafb4 100644
--- a/doc/licenses/jackson-databind/NOTICE
+++ b/doc/licenses/jackson-databind/NOTICE
@@ -2,10 +2,23 @@
 # URL:     https://github.com/FasterXML/jackson-databind
 # From:    'FasterXML, LLC' (https://github.com/FasterXML)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/FasterXML/jackson-databind/refs/tags/jackson-databind-${VERSION}/src/main/resources/META-INF/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.19.0] ---
+# Jackson JSON processor
+
 Jackson is a high-performance, Free/Open Source JSON processing library.
 It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
 been in development since 2007.
 It is currently developed by a community of developers.
-# --- END LICENSE FILE ---
+
+## Copyright
+
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+
+## Credits
+
+A list of contributors may be found from CREDITS(-2.x) file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
+# --- END LICENSE FILE [2.19.0] ---
diff --git a/doc/licenses/jackson/NOTICE b/doc/licenses/jackson/NOTICE
index 9a4df260c..9e66bdec1 100644
--- a/doc/licenses/jackson/NOTICE
+++ b/doc/licenses/jackson/NOTICE
@@ -2,10 +2,34 @@
 # URL:     https://github.com/FasterXML/jackson
 # From:    'FasterXML, LLC' (https://github.com/FasterXML)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/FasterXML/jackson-core/refs/tags/jackson-core-${VERSION}/src/main/resources/META-INF/jackson-core-NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.19.0] ---
+# Jackson JSON processor
+
 Jackson is a high-performance, Free/Open Source JSON processing library.
 It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
 been in development since 2007.
 It is currently developed by a community of developers.
-# --- END LICENSE FILE ---
+
+## Copyright
+
+Copyright 2007-, Tatu Saloranta (tatu.saloranta@iki.fi)
+
+## Credits
+
+A list of contributors may be found from CREDITS(-2.x) file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
+
+## FastDoubleParser
+
+jackson-core bundles a shaded copy of FastDoubleParser <https://github.com/wrandelshofer/FastDoubleParser>.
+That code is available under an MIT license <https://github.com/wrandelshofer/FastDoubleParser/blob/main/LICENSE>
+under the following copyright.
+
+Copyright © 2023 Werner Randelshofer, Switzerland. MIT License.
+
+See FastDoubleParser-NOTICE for details of other source code included in FastDoubleParser
+and the licenses and copyrights that apply to that code.
+# --- END LICENSE FILE [2.19.0] ---
diff --git a/doc/licenses/jai-imageio-core/LICENSE.txt b/doc/licenses/jai-imageio-core/LICENSE.txt
index 444f275ea..166d57418 100644
--- a/doc/licenses/jai-imageio-core/LICENSE.txt
+++ b/doc/licenses/jai-imageio-core/LICENSE.txt
@@ -5,8 +5,9 @@
 # From:    'Stian Soiland-Reyes' (https://github.com/stain)
 # From:    'Peter Hull'
 # License: BSD 3-clause 
+# Source:  https://raw.githubusercontent.com/jai-imageio/jai-imageio-core/refs/tags/jai-imageio-core-${VERSION}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.4.0] ---
 Copyright (c) 2005 Sun Microsystems, Inc. 
 Copyright © 2010-2014 University of Manchester
 Copyright © 2010-2015 Stian Soiland-Reyes
@@ -46,4 +47,4 @@ POSSIBILITY OF SUCH DAMAGES.
 You acknowledge that this software is not designed or intended for 
 use in the design, construction, operation or maintenance of any 
 nuclear facility. 
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.4.0] ---
diff --git a/doc/licenses/jakarta-activation/LICENSE.md b/doc/licenses/jakarta-activation/LICENSE.md
index 51054b88f..d8588923e 100644
--- a/doc/licenses/jakarta-activation/LICENSE.md
+++ b/doc/licenses/jakarta-activation/LICENSE.md
@@ -2,8 +2,9 @@
 # URL:     https://eclipse-ee4j.github.io/jaf/
 # From:    'Oracle Corporation' (http://www.oracle.com/)
 # License: BSD 3-clause 
+# Source:  https://raw.githubusercontent.com/jakartaee/jaf-api/refs/tags/${VERSION}/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.2.2] ---
 
     Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
    
@@ -33,4 +34,35 @@
     LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
     NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.2.2] ---
+# --- BEGIN LICENSE FILE [1.2.1] ---
+
+    Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+   
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+   
+      - Redistributions of source code must retain the above copyright
+        notice, this list of conditions and the following disclaimer.
+   
+      - Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+   
+      - Neither the name of the Eclipse Foundation, Inc. nor the names of its
+        contributors may be used to endorse or promote products derived
+        from this software without specific prior written permission.
+   
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+    THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+    PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# --- END LICENSE FILE [1.2.1] ---
diff --git a/doc/licenses/jakarta-annotation-api/LICENSE.md b/doc/licenses/jakarta-annotation-api/LICENSE.md
index 401afcae4..be335f732 100644
--- a/doc/licenses/jakarta-annotation-api/LICENSE.md
+++ b/doc/licenses/jakarta-annotation-api/LICENSE.md
@@ -1,9 +1,10 @@
 # Name:    Jakarta Annotations
-# URL:     https://eclipse-ee4j.github.io/common-annotations-api/
+# URL:     https://projects.eclipse.org/projects/ee4j.ca
 # From:    'Oracle Corporation' (http://www.oracle.com/)
-# License: EPL v2.0 
+# License: EPL v2.0
+# Source:  https://raw.githubusercontent.com/jakartaee/common-annotations-api/refs/tags/${VERSION}/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.3.5] ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -641,4 +642,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.3.5] ---
diff --git a/doc/licenses/jakarta-annotation-api/NOTICE.md b/doc/licenses/jakarta-annotation-api/NOTICE.md
new file mode 100644
index 000000000..16519cfa8
--- /dev/null
+++ b/doc/licenses/jakarta-annotation-api/NOTICE.md
@@ -0,0 +1,22 @@
+# Source:  https://raw.githubusercontent.com/jakartaee/common-annotations-api/refs/tags/${VERSION}/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [1.3.5] ---
+# Notices for Jakarta Annotations
+
+This content is produced and maintained by the Jakarta Annotations project.
+
+ * Project home: https://projects.eclipse.org/projects/ee4j.ca
+
+## Trademarks
+
+Jakarta Annotations is a trademark of the Eclipse Foundation.
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+# --- END LICENSE FILE [1.3.5] ---
diff --git a/doc/licenses/jakarta-jaxb/LICENSE.md b/doc/licenses/jakarta-jaxb/LICENSE.md
index 7728004d6..b3d8fee74 100644
--- a/doc/licenses/jakarta-jaxb/LICENSE.md
+++ b/doc/licenses/jakarta-jaxb/LICENSE.md
@@ -2,8 +2,9 @@
 # URL:     https://eclipse-ee4j.github.io/jaxb-ri/
 # From:    'Oracle Corporation' (http://www.oracle.com/)
 # License: BSD 3-clause 
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/jaxb-ri/refs/tags/${VERSION}-RI/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.3.2] ---
 Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -32,4 +33,4 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.3.2] ---
diff --git a/doc/licenses/jakarta-jaxb/NOTICE.md b/doc/licenses/jakarta-jaxb/NOTICE.md
new file mode 100644
index 000000000..2de331e57
--- /dev/null
+++ b/doc/licenses/jakarta-jaxb/NOTICE.md
@@ -0,0 +1,23 @@
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/jaxb-ri/refs/tags/${VERSION}-RI/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [2.3.2] ---
+# Notices for Eclipse Implementation of JAXB
+
+This content is produced and maintained by the Eclipse Implementation of JAXB
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.jaxb-impl
+
+## Trademarks
+
+Eclipse Implementation of JAXB is a trademark of the Eclipse Foundation.
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+# --- END LICENSE FILE [2.3.2] ---
diff --git a/doc/licenses/jakarta-validation-api/NOTICE b/doc/licenses/jakarta-validation-api/NOTICE
index e1a147bf9..5e53a7670 100644
--- a/doc/licenses/jakarta-validation-api/NOTICE
+++ b/doc/licenses/jakarta-validation-api/NOTICE
@@ -1,9 +1,10 @@
-# Name:    Jakarta Bean Validation API
+# Name:    Jakarta Validation API
 # URL:     https://beanvalidation.org/
-# From:    'Red Hat Inc.' (https://www.redhat.com/)
+# From:    'Red Hat Inc. and respective authors or employers'
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/jakartaee/validation/refs/tags/${VERSION}/NOTICE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.0.2] ---
 # Notices for Eclipse Jakarta Bean Validation
 
 This content is produced and maintained by the Eclipse Jakarta Bean Validation
@@ -14,4 +15,4 @@ project.
 ## Trademarks
 
  Jakarta Bean Validation is a trademark of the Eclipse Foundation.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.0.2] ---
diff --git a/doc/licenses/jakarta-ws-rs-api/LICENSE.md b/doc/licenses/jakarta-ws-rs-api/LICENSE.md
index 9b204c4f0..221c10015 100644
--- a/doc/licenses/jakarta-ws-rs-api/LICENSE.md
+++ b/doc/licenses/jakarta-ws-rs-api/LICENSE.md
@@ -1,9 +1,11 @@
 # Name:    Jakarta RESTful Web Services
-# URL:     https://github.com/eclipse-ee4j/jaxrs-api/
+# URL:     https://github.com/jakartaee/rest
 # From:    'Oracle Corporation' (http://www.oracle.com/)
-# License: EPL v2.0 
+# License: EPL v2.0
+# Source:  https://raw.githubusercontent.com/jakartaee/rest/refs/tags/${VERSION}/LICENSE.md
+# Source:  https://raw.githubusercontent.com/jakartaee/rest/refs/tags/${VERSION}-RELEASE/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.1.6] ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -641,4 +643,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.1.6] ---
diff --git a/doc/licenses/jakarta-ws-rs-api/NOTICE.md b/doc/licenses/jakarta-ws-rs-api/NOTICE.md
new file mode 100644
index 000000000..de8d88ff7
--- /dev/null
+++ b/doc/licenses/jakarta-ws-rs-api/NOTICE.md
@@ -0,0 +1,24 @@
+# Source:  https://raw.githubusercontent.com/jakartaee/rest/refs/tags/${VERSION}/NOTICE.md
+# Source:  https://raw.githubusercontent.com/jakartaee/rest/refs/tags/${VERSION}-RELEASE/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [2.1.6] ---
+# Notices for the Jakarta RESTful Web Services Project
+
+This content is produced and maintained by the **Jakarta RESTful Web Services**
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.jaxrs
+
+## Trademarks
+
+**Jakarta RESTful Web Services** is a trademark of the Eclipse Foundation.
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+# --- END LICENSE FILE [2.1.6] ---
diff --git a/doc/licenses/java-jwt/LICENSE b/doc/licenses/java-jwt/LICENSE
index 93f4a002b..83c8f1b7b 100644
--- a/doc/licenses/java-jwt/LICENSE
+++ b/doc/licenses/java-jwt/LICENSE
@@ -2,8 +2,10 @@
 # URL:     https://github.com/auth0/java-jwt
 # From:    'Auth0 by Okta' (https://www.auth0.com)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/auth0/java-jwt/refs/tags/${VERSION}/LICENSE
+# Source:  https://raw.githubusercontent.com/auth0/java-jwt/refs/tags/java-jwt-${VERSION}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [4.0.0] ---
 The MIT License (MIT)
  
 Copyright (c) 2015 Auth0, Inc. <support@auth0.com> (http://auth0.com)
@@ -25,4 +27,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [4.0.0] ---
diff --git a/doc/licenses/java-saml/LICENSE b/doc/licenses/java-saml/LICENSE
index 7ce3c77d3..461d7172a 100644
--- a/doc/licenses/java-saml/LICENSE
+++ b/doc/licenses/java-saml/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/onelogin/java-saml
 # From:    'OneLogin' (https://www.onelogin.com)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/SAML-Toolkits/java-saml/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.9.0] ---
 Copyright (c) 2010-2016 OneLogin, Inc.
 
 Permission is hereby granted, free of charge, to any person
@@ -26,4 +27,4 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.9.0] ---
diff --git a/doc/licenses/javaee-activation/LICENSE.txt b/doc/licenses/javaee-activation/LICENSE.txt
index 8142c6837..490774e82 100644
--- a/doc/licenses/javaee-activation/LICENSE.txt
+++ b/doc/licenses/javaee-activation/LICENSE.txt
@@ -2,8 +2,9 @@
 # URL:     https://github.com/javaee/activation
 # From:    'Oracle and/or its affiliates'
 # License: CDDL v1.1 
+# Source:  https://raw.githubusercontent.com/javaee/activation/refs/tags/JAF-${_VERSION_}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.2.0] ---
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
 
 1. Definitions.
@@ -763,4 +764,4 @@ based on this library.  If you modify this library, you may extend this
 exception to your version of the library, but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement
 from your version.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.2.0] ---
diff --git a/doc/licenses/jaxb-api/LICENSE.txt b/doc/licenses/jaxb-api/LICENSE.txt
index 760ca8e4c..ce2fa021d 100644
--- a/doc/licenses/jaxb-api/LICENSE.txt
+++ b/doc/licenses/jaxb-api/LICENSE.txt
@@ -2,8 +2,10 @@
 # URL:     https://github.com/javaee/jaxb-spec
 # From:    'Oracle' (http://www.oracle.com)
 # License: CDDL v1.1 
+# Source:  https://raw.githubusercontent.com/javaee/jaxb-spec/refs/tags/${VERSION}/LICENSE.txt
+# Source:  https://raw.githubusercontent.com/javaee/jaxb-spec/refs/heads/${MAJOR}.${MINOR}-branch/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.2.12] ---
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
 
 1. Definitions.
@@ -278,4 +280,280 @@ Certain source files distributed by Oracle are subject to the following clarific
 Linking this library statically or dynamically with other modules is making a combined work based on this library.  Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
 
 As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.  An independent module is a module which is not derived from or based on this library.  If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.2.12] ---
+# --- BEGIN LICENSE FILE [2.3.1] ---
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)Version 1.1
+
+1. Definitions.
+
+     1.1. "Contributor" means each individual or entity that creates or contributes to the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
+
+     1.3. "Covered Software" means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
+
+     1.4. "Executable" means the Covered Software in any form other than Source Code.
+
+     1.5. "Initial Developer" means the individual or entity that first makes Original Software available under this License.
+
+     1.6. "Larger Work" means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
+
+     1.7. "License" means this document.
+
+     1.8. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means the Source Code and Executable form of any of the following:
+
+     A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
+
+     B. Any new file that contains any part of the Original Software or previous Modification; or
+
+     C. Any new file that is contributed or otherwise made available under the terms of this License.
+
+     1.10. "Original Software" means the Source Code and Executable form of computer software code that is originally released under this License.
+
+     1.11. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+     1.12. "Source Code" means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
+
+     1.13. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+     2.1. The Initial Developer Grant.
+
+     Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+     (a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
+
+     (b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
+
+     (c) The licenses granted in Sections 2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
+
+     (d) Notwithstanding Section 2.1(b) above, no patent license is granted: (1) for code that You delete from the Original Software, or (2) for infringements caused by: (i) the modification of the Original Software, or (ii) the combination of the Original Software with other software or devices.
+
+     2.2. Contributor Grant.
+
+     Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
+
+     (a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
+
+     (b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1) Modifications made by that Contributor (or portions thereof); and (2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+
+     (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
+
+     (d) Notwithstanding Section 2.2(b) above, no patent license is granted: (1) for any code that Contributor has deleted from the Contributor Version; (2) for infringements caused by: (i) third party modifications of Contributor Version, or (ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3) under Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Availability of Source Code.
+
+     Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
+
+     3.2. Modifications.
+
+     The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
+
+     3.3. Required Notices.
+
+     You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
+
+     3.4. Application of Additional Terms.
+
+     You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients' rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+     3.5. Distribution of Executable Versions.
+
+     You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipient's rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+     3.6. Larger Works.
+
+     You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+     4.1. New Versions.
+
+     Oracle is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
+
+     4.2. Effect of New Versions.
+
+     You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
+
+     4.3. Modified Versions.
+
+     When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a) rename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b) otherwise make it clear that the license contains terms which differ from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+     COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+     6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+     6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as "Participant") alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
+
+     6.3. If You assert a patent infringement claim against Participant alleging that the Participant Software directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+
+     6.4. In the event of termination under Sections 6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+     The Covered Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" (as that term is defined at 48 C.F.R. ? 252.227-7014(a)(1)) and "commercial computer software documentation" as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdiction's conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+----------
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
+The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+
+
+
+The GNU General Public License (GPL) Version 2, June 1991
+
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+   a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+   b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+   c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+   a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+   One line to give the program's name and a brief idea of what it does.
+
+   Copyright (C)
+
+   This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+   Gnomovision version 69, Copyright (C) year name of author
+   Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+   signature of Ty Coon, 1 April 1989
+   Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Oracle are subject to the following clarification and special exception to the GPL Version 2, but only where Oracle has expressly included in the particular source file's header the words "Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library.  Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.  An independent module is a module which is not derived from or based on this library.  If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.
+# --- END LICENSE FILE [2.3.1] ---
diff --git a/doc/licenses/jcommander/NOTICE b/doc/licenses/jcommander/NOTICE
index 04091e14c..2d42e4f08 100644
--- a/doc/licenses/jcommander/NOTICE
+++ b/doc/licenses/jcommander/NOTICE
@@ -2,7 +2,9 @@
 # URL:     https://jcommander.org/
 # From:    'Cédric Beust' (https://github.com/cbeust)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/cbeust/jcommander/refs/tags/${VERSION}/notice.md
+# Source:  https://raw.githubusercontent.com/cbeust/jcommander/refs/tags/jcommander-${VERSION}/notice.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.82] ---
 Copyright 2010 Cedric Beust <cedric@beust.com>
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.82] ---
diff --git a/doc/licenses/jersey/LICENSE.md b/doc/licenses/jersey/LICENSE.md
index 81eaa0b10..af960e735 100644
--- a/doc/licenses/jersey/LICENSE.md
+++ b/doc/licenses/jersey/LICENSE.md
@@ -1,9 +1,10 @@
 # Name:    Jersey
-# URL:     https://jersey.java.net/
+# URL:     https://eclipse-ee4j.github.io/jersey/
 # From:    'Eclipse Foundation' (https://www.eclipse.org/)
-# License: EPL v2.0 
+# License: EPL v2.0
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/jersey/refs/tags/${VERSION}/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.46] ---
 # Eclipse Public License - v 2.0
 
         THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
@@ -641,4 +642,4 @@
     exception to your version of the library, but you are not obligated to
     do so.  If you do not wish to do so, delete this exception statement
     from your version.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.46] ---
diff --git a/doc/licenses/jersey/NOTICE.md b/doc/licenses/jersey/NOTICE.md
new file mode 100644
index 000000000..81736f053
--- /dev/null
+++ b/doc/licenses/jersey/NOTICE.md
@@ -0,0 +1,11 @@
+# Source:  https://raw.githubusercontent.com/eclipse-ee4j/jersey/refs/tags/${VERSION}/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [2.46] ---
+# Notice for Jersey 
+This content is produced and maintained by the Eclipse Jersey project.
+
+*  Project home: https://projects.eclipse.org/projects/ee4j.jersey
+
+## Trademarks
+Eclipse Jersey is a trademark of the Eclipse Foundation.
+# --- END LICENSE FILE [2.46] ---
diff --git a/doc/licenses/joda-time/NOTICE b/doc/licenses/joda-time/NOTICE
index 79518491b..87120d34c 100644
--- a/doc/licenses/joda-time/NOTICE
+++ b/doc/licenses/joda-time/NOTICE
@@ -2,8 +2,9 @@
 # URL:     https://www.joda.org/joda-time/
 # From:    'Joda.org' (https://www.joda.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/JodaOrg/joda-time/refs/tags/v${VERSION}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.10.6] ---
 This product includes software developed by
 Joda.org (https://www.joda.org/).
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.10.6] ---
diff --git a/doc/licenses/jose4j/NOTICE b/doc/licenses/jose4j/NOTICE
index 9d25c7792..f37c7d80a 100644
--- a/doc/licenses/jose4j/NOTICE
+++ b/doc/licenses/jose4j/NOTICE
@@ -2,10 +2,11 @@
 # URL:     https://bitbucket.org/b_c/jose4j/
 # From:    'Brian Campbell' (https://bitbucket.org/b_c/)
 # License: Apache v2.0
+# Source:  https://bitbucket.org/b_c/jose4j/raw/jose4j-${VERSION}/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [0.9.6] ---
 jose4j
-Copyright 2012-2024 Brian Campbell
+Copyright 2012-2015 Brian Campbell
 
 EcdsaUsingShaAlgorithm contains code for converting the concatenated
 R & S values of the signature to and from DER, which was originally
@@ -17,4 +18,4 @@ Apache Commons Codec project. http://commons.apache.org/proper/commons-codec/
 
 JSON processing in this software was derived from the JSON.simple toolkit.
 https://code.google.com/p/json-simple/
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [0.9.6] ---
diff --git a/doc/licenses/jquery/LICENSE.txt b/doc/licenses/jquery/LICENSE.txt
index a8393c48b..baf71d4b2 100644
--- a/doc/licenses/jquery/LICENSE.txt
+++ b/doc/licenses/jquery/LICENSE.txt
@@ -2,8 +2,9 @@
 # URL:     http://jquery.com/
 # From:    'OpenJS Foundation' (https://openjsf.org/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/jquery/jquery/refs/tags/${VERSION}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.7.1] ---
 Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -24,4 +25,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.7.1] ---
diff --git a/doc/licenses/jradius/LICENSE b/doc/licenses/jradius/LICENSE
index 5dc95689d..1809745e5 100644
--- a/doc/licenses/jradius/LICENSE
+++ b/doc/licenses/jradius/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/coova/jradius
 # From:    'Coova Technologies, LLC' (https://coova.github.io)
 # License: LGPL v2.1 
+# Source:  https://raw.githubusercontent.com/coova/jradius/refs/tags/jradius-${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.1.5] ---
 ==========================================================================
 
 Coova JRadius License:
@@ -549,4 +550,4 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.1.5] ---
diff --git a/doc/licenses/jstz/LICENSE b/doc/licenses/jstz/LICENSE
index 7f5490d0c..cd637a3bb 100644
--- a/doc/licenses/jstz/LICENSE
+++ b/doc/licenses/jstz/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/iansinnott/jstz
 # From:    'Jon Nylander' (https://github.com/pellepim)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/iansinnott/jstz/refs/tags/v${VERSION}/LICENCE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [2.1.1] ---
 MIT License 
 
 Copyright (c) 2012 Jon Nylander, project maintained at 
@@ -26,4 +27,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.1.1] ---
diff --git a/doc/licenses/kotlin/NOTICE.txt b/doc/licenses/kotlin/NOTICE.txt
index 050913f7b..789478cf5 100644
--- a/doc/licenses/kotlin/NOTICE.txt
+++ b/doc/licenses/kotlin/NOTICE.txt
@@ -2,8 +2,9 @@
 # URL:     https://kotlinlang.org/
 # From:    'JetBrains s.r.o and respective authors and developers'
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/JetBrains/kotlin/refs/tags/v${VERSION}/license/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
-Kotlin Compiler
-Copyright 2010-2023 JetBrains s.r.o and respective authors and developers
-# --- END LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.9.25] ---
+   Kotlin Compiler
+   Copyright 2010-2023 JetBrains s.r.o and respective authors and developers
+# --- END LICENSE FILE [1.9.25] ---
diff --git a/doc/licenses/kotlinx-serialization/NOTICE.txt b/doc/licenses/kotlinx-serialization/NOTICE.txt
index 66d7415be..11002606d 100644
--- a/doc/licenses/kotlinx-serialization/NOTICE.txt
+++ b/doc/licenses/kotlinx-serialization/NOTICE.txt
@@ -2,8 +2,9 @@
 # URL:     https://github.com/Kotlin/kotlinx.serialization
 # From:    'JetBrains s.r.o and respective authors and developers'
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/Kotlin/kotlinx.serialization/refs/tags/v${VERSION}/license/NOTICE.txt
 #
-# --- BEGIN LICENSE FILE ---
-kotlinx.serialization library.
-Copyright 2017-2023 JetBrains s.r.o and respective authors and developers
-# --- END LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.9.0] ---
+   kotlinx.serialization library.
+   Copyright 2017-2019 JetBrains s.r.o and respective authors and developers
+# --- END LICENSE FILE [1.9.0] ---
diff --git a/doc/licenses/ksm-sdk/LICENSE b/doc/licenses/ksm-sdk/LICENSE
index 2eebd4070..6bbf99972 100644
--- a/doc/licenses/ksm-sdk/LICENSE
+++ b/doc/licenses/ksm-sdk/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/Keeper-Security/secrets-manager
 # From:    'Keeper Security' (https://www.keepersecurity.com/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/Keeper-Security/secrets-manager/refs/tags/java-sdk-v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [17.1.1] ---
 MIT License
 
 Copyright (c) 2021 Keeper Security
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [17.1.1] ---
diff --git a/doc/licenses/lodash/LICENSE b/doc/licenses/lodash/LICENSE
index 0fa9d5695..c408f4860 100644
--- a/doc/licenses/lodash/LICENSE
+++ b/doc/licenses/lodash/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://lodash.com/
 # From:    'OpenJS Foundation' (https://openjsf.org/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/lodash/lodash/${VERSION}-npm/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [4.17.21] ---
 Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
 
 Based on Underscore.js, copyright Jeremy Ashkenas,
@@ -51,4 +52,4 @@ Files located in the node_modules and vendor directories are externally
 maintained libraries used by this software which have their own
 licenses; we recommend you read them, as their terms may differ from the
 terms above.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [4.17.21] ---
diff --git a/doc/licenses/logback/LICENSE.txt b/doc/licenses/logback/LICENSE.txt
index 95fb659ae..5b1df2624 100644
--- a/doc/licenses/logback/LICENSE.txt
+++ b/doc/licenses/logback/LICENSE.txt
@@ -2,8 +2,11 @@
 # URL:     http://logback.qos.ch/
 # From:    'QOS.ch Sàrl' (http://qos.ch/)
 # License: EPL v1.0 
+# Source:  https://raw.githubusercontent.com/qos-ch/logback/refs/tags/v_${VERSION}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
+# +: ** ECLIPSE PUBLIC LICENSE v1.0 CHOSEN. **
+#
+# --- BEGIN LICENSE FILE [1.3.15] ---
 Logback LICENSE
 ---------------
 
@@ -18,6 +21,4 @@ the Eclipse Foundation
  
 under the terms of the GNU Lesser General Public License version 2.1
 as published by the Free Software Foundation.
-
-** ECLIPSE PUBLIC LICENSE v1.0 CHOSEN. **
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.3.15] ---
diff --git a/doc/licenses/logging-interceptor/NOTICE b/doc/licenses/logging-interceptor/NOTICE
deleted file mode 100644
index c2d4df4c2..000000000
--- a/doc/licenses/logging-interceptor/NOTICE
+++ /dev/null
@@ -1,20 +0,0 @@
-# Name:    OkHttp Logging Interceptor
-# URL:     https://square.github.io/okhttp/
-# From:    'Square Inc'
-# License: Apache v2.0
-#
-# --- BEGIN LICENSE FILE ---
-Copyright 2019 Square, Inc.
-
-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.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/logging-interceptor/dep-coordinates.txt b/doc/licenses/logging-interceptor/dep-coordinates.txt
deleted file mode 100644
index b0c95a032..000000000
--- a/doc/licenses/logging-interceptor/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-com.squareup.okhttp3:logging-interceptor:jar:*
\ No newline at end of file
diff --git a/doc/licenses/make-plural/LICENSE b/doc/licenses/make-plural/LICENSE
index cf5b0001e..54bc0c956 100644
--- a/doc/licenses/make-plural/LICENSE
+++ b/doc/licenses/make-plural/LICENSE
@@ -1,9 +1,10 @@
 # Name:    make-plural
 # URL:     https://github.com/eemeli/make-plural
 # From:    'Eemeli Aro' (https://github.com/eemeli)
-# License: ISC 
+# License: ISC
+# Source:  https://raw.githubusercontent.com/eemeli/make-plural/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.0.6] ---
 Copyright (c) 2014-2016 by Eemeli Aro <eemeli@gmail.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -17,4 +18,4 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.0.6] ---
diff --git a/doc/licenses/messageformat-parser/LICENSE b/doc/licenses/messageformat-parser/LICENSE
index 96e2e9156..c805561f2 100644
--- a/doc/licenses/messageformat-parser/LICENSE
+++ b/doc/licenses/messageformat-parser/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://messageformat.github.io/
 # From:    'Alex Sexton, Eemeli Aro, and Contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/messageformat/parser/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.1.0] ---
 Copyright 2012-2016 Alex Sexton, Eemeli Aro, and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -24,4 +25,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.1.0] ---
diff --git a/doc/licenses/messageformat/LICENSE b/doc/licenses/messageformat/LICENSE
index d5e062b97..6b0d9caa4 100644
--- a/doc/licenses/messageformat/LICENSE
+++ b/doc/licenses/messageformat/LICENSE
@@ -1,9 +1,10 @@
-# Name:    messageformat (
+# Name:    messageformat
 # URL:     https://messageformat.github.io/
 # From:    'Alex Sexton, Eemeli Aro, and Contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/messageformat/messageformat/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.0.2] ---
 Copyright 2012-2016 Alex Sexton, Eemeli Aro, and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -24,4 +25,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.0.2] ---
diff --git a/doc/licenses/mybatis-guice/NOTICE b/doc/licenses/mybatis-guice/NOTICE
index d37b4bb97..36ffecde3 100644
--- a/doc/licenses/mybatis-guice/NOTICE
+++ b/doc/licenses/mybatis-guice/NOTICE
@@ -2,8 +2,9 @@
 # URL:     http://www.mybatis.org/guice/
 # From:    'MyBatis' (http://www.mybatis.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/mybatis/guice/refs/tags/mybatis-guice-${VERSION}/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.18] ---
 MyBatis-Guice
 Copyright 2010-2013
 
@@ -18,4 +19,4 @@ iBATIS
 
 Google Guice
    Copyright 2010 The Apache Software Foundation
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.18] ---
diff --git a/doc/licenses/mybatis/NOTICE b/doc/licenses/mybatis/NOTICE
index a8114c7ad..b904073d7 100644
--- a/doc/licenses/mybatis/NOTICE
+++ b/doc/licenses/mybatis/NOTICE
@@ -2,11 +2,18 @@
 # URL:     http://www.mybatis.org/mybatis-3/
 # From:    'MyBatis' (http://www.mybatis.org/)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/mybatis/mybatis-3/refs/tags/mybatis-${VERSION}/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.5.19] ---
+MyBatis
+Copyright 2010-2023
+
+This product includes software developed by
+The MyBatis Team (https://www.mybatis.org/).
+
 iBATIS
    This product includes software developed by
-   The Apache Software Foundation (http://www.apache.org/).
+   The Apache Software Foundation (https://www.apache.org/).
 
    Copyright 2010 The Apache Software Foundation
 
@@ -48,4 +55,4 @@ Refactored SqlBuilder class (SQL, AbstractSQL)
    Adam Gent (https://gist.github.com/3650165)
 
    Copyright 2010 Adam Gent
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.5.19] ---
diff --git a/doc/licenses/object-assign/LICENSE b/doc/licenses/object-assign/LICENSE
index b0226e762..444056b74 100644
--- a/doc/licenses/object-assign/LICENSE
+++ b/doc/licenses/object-assign/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/sindresorhus/object-assign/
 # From:    'Sindre Sorhus' (https://github.com/sindresorhus)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/sindresorhus/object-assign/refs/tags/v${VERSION}/license
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [4.1.1] ---
 The MIT License (MIT)
 
 Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [4.1.1] ---
diff --git a/doc/licenses/osgi-resource-locator/LICENSE.md b/doc/licenses/osgi-resource-locator/LICENSE.md
index 0f39745e0..c238e6659 100644
--- a/doc/licenses/osgi-resource-locator/LICENSE.md
+++ b/doc/licenses/osgi-resource-locator/LICENSE.md
@@ -2,643 +2,645 @@
 # URL:     https://github.com/eclipse-ee4j/glassfish-hk2-extra
 # From:    'Oracle Corporation' (http://www.oracle.com/)
 # License: EPL v2.0 
+# Source: https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2-extra/refs/tags/${VERSION}/LICENSE.md
+# Source: https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2-extra/refs/tags/${VERSION}-RELEASE/LICENSE.md
 #
-# --- BEGIN LICENSE FILE ---
-# Eclipse Public License - v 2.0
-
-        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
-        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-    1. DEFINITIONS
-
-    "Contribution" means:
-
-      a) in the case of the initial Contributor, the initial content
-         Distributed under this Agreement, and
-
-      b) in the case of each subsequent Contributor: 
-         i) changes to the Program, and 
-         ii) additions to the Program;
-      where such changes and/or additions to the Program originate from
-      and are Distributed by that particular Contributor. A Contribution
-      "originates" from a Contributor if it was added to the Program by
-      such Contributor itself or anyone acting on such Contributor's behalf.
-      Contributions do not include changes or additions to the Program that
-      are not Modified Works.
-
-    "Contributor" means any person or entity that Distributes the Program.
-
-    "Licensed Patents" mean patent claims licensable by a Contributor which
-    are necessarily infringed by the use or sale of its Contribution alone
-    or when combined with the Program.
-
-    "Program" means the Contributions Distributed in accordance with this
-    Agreement.
-
-    "Recipient" means anyone who receives the Program under this Agreement
-    or any Secondary License (as applicable), including Contributors.
-
-    "Derivative Works" shall mean any work, whether in Source Code or other
-    form, that is based on (or derived from) the Program and for which the
-    editorial revisions, annotations, elaborations, or other modifications
-    represent, as a whole, an original work of authorship.
-
-    "Modified Works" shall mean any work in Source Code or other form that
-    results from an addition to, deletion from, or modification of the
-    contents of the Program, including, for purposes of clarity any new file
-    in Source Code form that contains any contents of the Program. Modified
-    Works shall not include works that contain only declarations,
-    interfaces, types, classes, structures, or files of the Program solely
-    in each case in order to link to, bind by name, or subclass the Program
-    or Modified Works thereof.
-
-    "Distribute" means the acts of a) distributing or b) making available
-    in any manner that enables the transfer of a copy.
-
-    "Source Code" means the form of a Program preferred for making
-    modifications, including but not limited to software source code,
-    documentation source, and configuration files.
-
-    "Secondary License" means either the GNU General Public License,
-    Version 2.0, or any later versions of that license, including any
-    exceptions or additional permissions as identified by the initial
-    Contributor.
-
-    2. GRANT OF RIGHTS
-
-      a) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free copyright
-      license to reproduce, prepare Derivative Works of, publicly display,
-      publicly perform, Distribute and sublicense the Contribution of such
-      Contributor, if any, and such Derivative Works.
-
-      b) Subject to the terms of this Agreement, each Contributor hereby
-      grants Recipient a non-exclusive, worldwide, royalty-free patent
-      license under Licensed Patents to make, use, sell, offer to sell,
-      import and otherwise transfer the Contribution of such Contributor,
-      if any, in Source Code or other form. This patent license shall
-      apply to the combination of the Contribution and the Program if, at
-      the time the Contribution is added by the Contributor, such addition
-      of the Contribution causes such combination to be covered by the
-      Licensed Patents. The patent license shall not apply to any other
-      combinations which include the Contribution. No hardware per se is
-      licensed hereunder.
-
-      c) Recipient understands that although each Contributor grants the
-      licenses to its Contributions set forth herein, no assurances are
-      provided by any Contributor that the Program does not infringe the
-      patent or other intellectual property rights of any other entity.
-      Each Contributor disclaims any liability to Recipient for claims
-      brought by any other entity based on infringement of intellectual
-      property rights or otherwise. As a condition to exercising the
-      rights and licenses granted hereunder, each Recipient hereby
-      assumes sole responsibility to secure any other intellectual
-      property rights needed, if any. For example, if a third party
-      patent license is required to allow Recipient to Distribute the
-      Program, it is Recipient's responsibility to acquire that license
-      before distributing the Program.
-
-      d) Each Contributor represents that to its knowledge it has
-      sufficient copyright rights in its Contribution, if any, to grant
-      the copyright license set forth in this Agreement.
-
-      e) Notwithstanding the terms of any Secondary License, no
-      Contributor makes additional grants to any Recipient (other than
-      those set forth in this Agreement) as a result of such Recipient's
-      receipt of the Program under the terms of a Secondary License
-      (if permitted under the terms of Section 3).
-
-    3. REQUIREMENTS
-
-    3.1 If a Contributor Distributes the Program in any form, then:
-
-      a) the Program must also be made available as Source Code, in
-      accordance with section 3.2, and the Contributor must accompany
-      the Program with a statement that the Source Code for the Program
-      is available under this Agreement, and informs Recipients how to
-      obtain it in a reasonable manner on or through a medium customarily
-      used for software exchange; and
-
-      b) the Contributor may Distribute the Program under a license
-      different than this Agreement, provided that such license:
-         i) effectively disclaims on behalf of all other Contributors all
-         warranties and conditions, express and implied, including
-         warranties or conditions of title and non-infringement, and
-         implied warranties or conditions of merchantability and fitness
-         for a particular purpose;
-
-         ii) effectively excludes on behalf of all other Contributors all
-         liability for damages, including direct, indirect, special,
-         incidental and consequential damages, such as lost profits;
-
-         iii) does not attempt to limit or alter the recipients' rights
-         in the Source Code under section 3.2; and
-
-         iv) requires any subsequent distribution of the Program by any
-         party to be under a license that satisfies the requirements
-         of this section 3.
-
-    3.2 When the Program is Distributed as Source Code:
-
-      a) it must be made available under this Agreement, or if the
-      Program (i) is combined with other material in a separate file or
-      files made available under a Secondary License, and (ii) the initial
-      Contributor attached to the Source Code the notice described in
-      Exhibit A of this Agreement, then the Program may be made available
-      under the terms of such Secondary Licenses, and
-
-      b) a copy of this Agreement must be included with each copy of
-      the Program.
-
-    3.3 Contributors may not remove or alter any copyright, patent,
-    trademark, attribution notices, disclaimers of warranty, or limitations
-    of liability ("notices") contained within the Program from any copy of
-    the Program which they Distribute, provided that Contributors may add
-    their own appropriate notices.
-
-    4. COMMERCIAL DISTRIBUTION
-
-    Commercial distributors of software may accept certain responsibilities
-    with respect to end users, business partners and the like. While this
-    license is intended to facilitate the commercial use of the Program,
-    the Contributor who includes the Program in a commercial product
-    offering should do so in a manner which does not create potential
-    liability for other Contributors. Therefore, if a Contributor includes
-    the Program in a commercial product offering, such Contributor
-    ("Commercial Contributor") hereby agrees to defend and indemnify every
-    other Contributor ("Indemnified Contributor") against any losses,
-    damages and costs (collectively "Losses") arising from claims, lawsuits
-    and other legal actions brought by a third party against the Indemnified
-    Contributor to the extent caused by the acts or omissions of such
-    Commercial Contributor in connection with its distribution of the Program
-    in a commercial product offering. The obligations in this section do not
-    apply to any claims or Losses relating to any actual or alleged
-    intellectual property infringement. In order to qualify, an Indemnified
-    Contributor must: a) promptly notify the Commercial Contributor in
-    writing of such claim, and b) allow the Commercial Contributor to control,
-    and cooperate with the Commercial Contributor in, the defense and any
-    related settlement negotiations. The Indemnified Contributor may
-    participate in any such claim at its own expense.
-
-    For example, a Contributor might include the Program in a commercial
-    product offering, Product X. That Contributor is then a Commercial
-    Contributor. If that Commercial Contributor then makes performance
-    claims, or offers warranties related to Product X, those performance
-    claims and warranties are such Commercial Contributor's responsibility
-    alone. Under this section, the Commercial Contributor would have to
-    defend claims against the other Contributors related to those performance
-    claims and warranties, and if a court requires any other Contributor to
-    pay any damages as a result, the Commercial Contributor must pay
-    those damages.
-
-    5. NO WARRANTY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
-    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
-    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
-    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-    PURPOSE. Each Recipient is solely responsible for determining the
-    appropriateness of using and distributing the Program and assumes all
-    risks associated with its exercise of rights under this Agreement,
-    including but not limited to the risks and costs of program errors,
-    compliance with applicable laws, damage to or loss of data, programs
-    or equipment, and unavailability or interruption of operations.
-
-    6. DISCLAIMER OF LIABILITY
-
-    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
-    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
-    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
-    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGES.
-
-    7. GENERAL
-
-    If any provision of this Agreement is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this Agreement, and without further
-    action by the parties hereto, such provision shall be reformed to the
-    minimum extent necessary to make such provision valid and enforceable.
-
-    If Recipient institutes patent litigation against any entity
-    (including a cross-claim or counterclaim in a lawsuit) alleging that the
-    Program itself (excluding combinations of the Program with other software
-    or hardware) infringes such Recipient's patent(s), then such Recipient's
-    rights granted under Section 2(b) shall terminate as of the date such
-    litigation is filed.
-
-    All Recipient's rights under this Agreement shall terminate if it
-    fails to comply with any of the material terms or conditions of this
-    Agreement and does not cure such failure in a reasonable period of
-    time after becoming aware of such noncompliance. If all Recipient's
-    rights under this Agreement terminate, Recipient agrees to cease use
-    and distribution of the Program as soon as reasonably practicable.
-    However, Recipient's obligations under this Agreement and any licenses
-    granted by Recipient relating to the Program shall continue and survive.
-
-    Everyone is permitted to copy and distribute copies of this Agreement,
-    but in order to avoid inconsistency the Agreement is copyrighted and
-    may only be modified in the following manner. The Agreement Steward
-    reserves the right to publish new versions (including revisions) of
-    this Agreement from time to time. No one other than the Agreement
-    Steward has the right to modify this Agreement. The Eclipse Foundation
-    is the initial Agreement Steward. The Eclipse Foundation may assign the
-    responsibility to serve as the Agreement Steward to a suitable separate
-    entity. Each new version of the Agreement will be given a distinguishing
-    version number. The Program (including Contributions) may always be
-    Distributed subject to the version of the Agreement under which it was
-    received. In addition, after a new version of the Agreement is published,
-    Contributor may elect to Distribute the Program (including its
-    Contributions) under the new version.
-
-    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-    receives no rights or licenses to the intellectual property of any
-    Contributor under this Agreement, whether expressly, by implication,
-    estoppel or otherwise. All rights in the Program not expressly granted
-    under this Agreement are reserved. Nothing in this Agreement is intended
-    to be enforceable by any entity that is not a Contributor or Recipient.
-    No third-party beneficiary rights are created under this Agreement.
-
-    Exhibit A - Form of Secondary Licenses Notice
-
-    "This Source Code may also be made available under the following 
-    Secondary Licenses when the conditions for such availability set forth 
-    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    version(s), and exceptions or additional permissions here}."
-
-      Simply including a copy of this Agreement, including this Exhibit A
-      is not sufficient to license the Source Code under Secondary Licenses.
-
-      If it is not possible or desirable to put the notice in a particular
-      file, then You may include the notice in a location (such as a LICENSE
-      file in a relevant directory) where a recipient would be likely to
-      look for such a notice.
-
-      You may add additional accurate notices of copyright ownership.
-
----
-
-##    The GNU General Public License (GPL) Version 2, June 1991
-
-    Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-    51 Franklin Street, Fifth Floor
-    Boston, MA 02110-1335
-    USA
-
-    Everyone is permitted to copy and distribute verbatim copies
-    of this license document, but changing it is not allowed.
-
-    Preamble
-
-    The licenses for most software are designed to take away your freedom to
-    share and change it. By contrast, the GNU General Public License is
-    intended to guarantee your freedom to share and change free software--to
-    make sure the software is free for all its users. This General Public
-    License applies to most of the Free Software Foundation's software and
-    to any other program whose authors commit to using it. (Some other Free
-    Software Foundation software is covered by the GNU Library General
-    Public License instead.) You can apply it to your programs, too.
-
-    When we speak of free software, we are referring to freedom, not price.
-    Our General Public Licenses are designed to make sure that you have the
-    freedom to distribute copies of free software (and charge for this
-    service if you wish), that you receive source code or can get it if you
-    want it, that you can change the software or use pieces of it in new
-    free programs; and that you know you can do these things.
-
-    To protect your rights, we need to make restrictions that forbid anyone
-    to deny you these rights or to ask you to surrender the rights. These
-    restrictions translate to certain responsibilities for you if you
-    distribute copies of the software, or if you modify it.
-
-    For example, if you distribute copies of such a program, whether gratis
-    or for a fee, you must give the recipients all the rights that you have.
-    You must make sure that they, too, receive or can get the source code.
-    And you must show them these terms so they know their rights.
-
-    We protect your rights with two steps: (1) copyright the software, and
-    (2) offer you this license which gives you legal permission to copy,
-    distribute and/or modify the software.
-
-    Also, for each author's protection and ours, we want to make certain
-    that everyone understands that there is no warranty for this free
-    software. If the software is modified by someone else and passed on, we
-    want its recipients to know that what they have is not the original, so
-    that any problems introduced by others will not reflect on the original
-    authors' reputations.
-
-    Finally, any free program is threatened constantly by software patents.
-    We wish to avoid the danger that redistributors of a free program will
-    individually obtain patent licenses, in effect making the program
-    proprietary. To prevent this, we have made it clear that any patent must
-    be licensed for everyone's free use or not licensed at all.
-
-    The precise terms and conditions for copying, distribution and
-    modification follow.
-
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-    0. This License applies to any program or other work which contains a
-    notice placed by the copyright holder saying it may be distributed under
-    the terms of this General Public License. The "Program", below, refers
-    to any such program or work, and a "work based on the Program" means
-    either the Program or any derivative work under copyright law: that is
-    to say, a work containing the Program or a portion of it, either
-    verbatim or with modifications and/or translated into another language.
-    (Hereinafter, translation is included without limitation in the term
-    "modification".) Each licensee is addressed as "you".
-
-    Activities other than copying, distribution and modification are not
-    covered by this License; they are outside its scope. The act of running
-    the Program is not restricted, and the output from the Program is
-    covered only if its contents constitute a work based on the Program
-    (independent of having been made by running the Program). Whether that
-    is true depends on what the Program does.
-
-    1. You may copy and distribute verbatim copies of the Program's source
-    code as you receive it, in any medium, provided that you conspicuously
-    and appropriately publish on each copy an appropriate copyright notice
-    and disclaimer of warranty; keep intact all the notices that refer to
-    this License and to the absence of any warranty; and give any other
-    recipients of the Program a copy of this License along with the Program.
-
-    You may charge a fee for the physical act of transferring a copy, and
-    you may at your option offer warranty protection in exchange for a fee.
-
-    2. You may modify your copy or copies of the Program or any portion of
-    it, thus forming a work based on the Program, and copy and distribute
-    such modifications or work under the terms of Section 1 above, provided
-    that you also meet all of these conditions:
-
-        a) You must cause the modified files to carry prominent notices
-        stating that you changed the files and the date of any change.
-
-        b) You must cause any work that you distribute or publish, that in
-        whole or in part contains or is derived from the Program or any part
-        thereof, to be licensed as a whole at no charge to all third parties
-        under the terms of this License.
-
-        c) If the modified program normally reads commands interactively
-        when run, you must cause it, when started running for such
-        interactive use in the most ordinary way, to print or display an
-        announcement including an appropriate copyright notice and a notice
-        that there is no warranty (or else, saying that you provide a
-        warranty) and that users may redistribute the program under these
-        conditions, and telling the user how to view a copy of this License.
-        (Exception: if the Program itself is interactive but does not
-        normally print such an announcement, your work based on the Program
-        is not required to print an announcement.)
-
-    These requirements apply to the modified work as a whole. If
-    identifiable sections of that work are not derived from the Program, and
-    can be reasonably considered independent and separate works in
-    themselves, then this License, and its terms, do not apply to those
-    sections when you distribute them as separate works. But when you
-    distribute the same sections as part of a whole which is a work based on
-    the Program, the distribution of the whole must be on the terms of this
-    License, whose permissions for other licensees extend to the entire
-    whole, and thus to each and every part regardless of who wrote it.
-
-    Thus, it is not the intent of this section to claim rights or contest
-    your rights to work written entirely by you; rather, the intent is to
-    exercise the right to control the distribution of derivative or
-    collective works based on the Program.
-
-    In addition, mere aggregation of another work not based on the Program
-    with the Program (or with a work based on the Program) on a volume of a
-    storage or distribution medium does not bring the other work under the
-    scope of this License.
-
-    3. You may copy and distribute the Program (or a work based on it,
-    under Section 2) in object code or executable form under the terms of
-    Sections 1 and 2 above provided that you also do one of the following:
-
-        a) Accompany it with the complete corresponding machine-readable
-        source code, which must be distributed under the terms of Sections 1
-        and 2 above on a medium customarily used for software interchange; or,
-
-        b) Accompany it with a written offer, valid for at least three
-        years, to give any third party, for a charge no more than your cost
-        of physically performing source distribution, a complete
-        machine-readable copy of the corresponding source code, to be
-        distributed under the terms of Sections 1 and 2 above on a medium
-        customarily used for software interchange; or,
-
-        c) Accompany it with the information you received as to the offer to
-        distribute corresponding source code. (This alternative is allowed
-        only for noncommercial distribution and only if you received the
-        program in object code or executable form with such an offer, in
-        accord with Subsection b above.)
-
-    The source code for a work means the preferred form of the work for
-    making modifications to it. For an executable work, complete source code
-    means all the source code for all modules it contains, plus any
-    associated interface definition files, plus the scripts used to control
-    compilation and installation of the executable. However, as a special
-    exception, the source code distributed need not include anything that is
-    normally distributed (in either source or binary form) with the major
-    components (compiler, kernel, and so on) of the operating system on
-    which the executable runs, unless that component itself accompanies the
-    executable.
-
-    If distribution of executable or object code is made by offering access
-    to copy from a designated place, then offering equivalent access to copy
-    the source code from the same place counts as distribution of the source
-    code, even though third parties are not compelled to copy the source
-    along with the object code.
-
-    4. You may not copy, modify, sublicense, or distribute the Program
-    except as expressly provided under this License. Any attempt otherwise
-    to copy, modify, sublicense or distribute the Program is void, and will
-    automatically terminate your rights under this License. However, parties
-    who have received copies, or rights, from you under this License will
-    not have their licenses terminated so long as such parties remain in
-    full compliance.
-
-    5. You are not required to accept this License, since you have not
-    signed it. However, nothing else grants you permission to modify or
-    distribute the Program or its derivative works. These actions are
-    prohibited by law if you do not accept this License. Therefore, by
-    modifying or distributing the Program (or any work based on the
-    Program), you indicate your acceptance of this License to do so, and all
-    its terms and conditions for copying, distributing or modifying the
-    Program or works based on it.
-
-    6. Each time you redistribute the Program (or any work based on the
-    Program), the recipient automatically receives a license from the
-    original licensor to copy, distribute or modify the Program subject to
-    these terms and conditions. You may not impose any further restrictions
-    on the recipients' exercise of the rights granted herein. You are not
-    responsible for enforcing compliance by third parties to this License.
-
-    7. If, as a consequence of a court judgment or allegation of patent
-    infringement or for any other reason (not limited to patent issues),
-    conditions are imposed on you (whether by court order, agreement or
-    otherwise) that contradict the conditions of this License, they do not
-    excuse you from the conditions of this License. If you cannot distribute
-    so as to satisfy simultaneously your obligations under this License and
-    any other pertinent obligations, then as a consequence you may not
-    distribute the Program at all. For example, if a patent license would
-    not permit royalty-free redistribution of the Program by all those who
-    receive copies directly or indirectly through you, then the only way you
-    could satisfy both it and this License would be to refrain entirely from
-    distribution of the Program.
-
-    If any portion of this section is held invalid or unenforceable under
-    any particular circumstance, the balance of the section is intended to
-    apply and the section as a whole is intended to apply in other
-    circumstances.
-
-    It is not the purpose of this section to induce you to infringe any
-    patents or other property right claims or to contest validity of any
-    such claims; this section has the sole purpose of protecting the
-    integrity of the free software distribution system, which is implemented
-    by public license practices. Many people have made generous
-    contributions to the wide range of software distributed through that
-    system in reliance on consistent application of that system; it is up to
-    the author/donor to decide if he or she is willing to distribute
-    software through any other system and a licensee cannot impose that choice.
-
-    This section is intended to make thoroughly clear what is believed to be
-    a consequence of the rest of this License.
-
-    8. If the distribution and/or use of the Program is restricted in
-    certain countries either by patents or by copyrighted interfaces, the
-    original copyright holder who places the Program under this License may
-    add an explicit geographical distribution limitation excluding those
-    countries, so that distribution is permitted only in or among countries
-    not thus excluded. In such case, this License incorporates the
-    limitation as if written in the body of this License.
-
-    9. The Free Software Foundation may publish revised and/or new
-    versions of the General Public License from time to time. Such new
-    versions will be similar in spirit to the present version, but may
-    differ in detail to address new problems or concerns.
-
-    Each version is given a distinguishing version number. If the Program
-    specifies a version number of this License which applies to it and "any
-    later version", you have the option of following the terms and
-    conditions either of that version or of any later version published by
-    the Free Software Foundation. If the Program does not specify a version
-    number of this License, you may choose any version ever published by the
-    Free Software Foundation.
-
-    10. If you wish to incorporate parts of the Program into other free
-    programs whose distribution conditions are different, write to the
-    author to ask for permission. For software which is copyrighted by the
-    Free Software Foundation, write to the Free Software Foundation; we
-    sometimes make exceptions for this. Our decision will be guided by the
-    two goals of preserving the free status of all derivatives of our free
-    software and of promoting the sharing and reuse of software generally.
-
-    NO WARRANTY
-
-    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
-    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-    EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-    OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
-    EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
-    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
-    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-    NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-    AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
-    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
-    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
-    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
-    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
-    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-    END OF TERMS AND CONDITIONS
-
-    How to Apply These Terms to Your New Programs
-
-    If you develop a new program, and you want it to be of the greatest
-    possible use to the public, the best way to achieve this is to make it
-    free software which everyone can redistribute and change under these terms.
-
-    To do so, attach the following notices to the program. It is safest to
-    attach them to the start of each source file to most effectively convey
-    the exclusion of warranty; and each file should have at least the
-    "copyright" line and a pointer to where the full notice is found.
-
-        One line to give the program's name and a brief idea of what it does.
-        Copyright (C) <year> <name of author>
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful, but
-        WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-        General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
-
-    Also add information on how to contact you by electronic and paper mail.
-
-    If the program is interactive, make it output a short notice like this
-    when it starts in an interactive mode:
-
-        Gnomovision version 69, Copyright (C) year name of author
-        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
-        `show w'. This is free software, and you are welcome to redistribute
-        it under certain conditions; type `show c' for details.
-
-    The hypothetical commands `show w' and `show c' should show the
-    appropriate parts of the General Public License. Of course, the commands
-    you use may be called something other than `show w' and `show c'; they
-    could even be mouse-clicks or menu items--whatever suits your program.
-
-    You should also get your employer (if you work as a programmer) or your
-    school, if any, to sign a "copyright disclaimer" for the program, if
-    necessary. Here is a sample; alter the names:
-
-        Yoyodyne, Inc., hereby disclaims all copyright interest in the
-        program `Gnomovision' (which makes passes at compilers) written by
-        James Hacker.
-
-        signature of Ty Coon, 1 April 1989
-        Ty Coon, President of Vice
-
-    This General Public License does not permit incorporating your program
-    into proprietary programs. If your program is a subroutine library, you
-    may consider it more useful to permit linking proprietary applications
-    with the library. If this is what you want to do, use the GNU Library
-    General Public License instead of this License.
-
----
-
-## CLASSPATH EXCEPTION
-
-    Linking this library statically or dynamically with other modules is
-    making a combined work based on this library.  Thus, the terms and
-    conditions of the GNU General Public License version 2 cover the whole
-    combination.
-
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent
-    modules, and to copy and distribute the resulting executable under
-    terms of your choice, provided that you also meet, for each linked
-    independent module, the terms and conditions of the license of that
-    module.  An independent module is a module which is not derived from or
-    based on this library.  If you modify this library, you may extend this
-    exception to your version of the library, but you are not obligated to
-    do so.  If you do not wish to do so, delete this exception statement
-    from your version.
-# --- END LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.0.3] ---
+# Eclipse Public License - v 2.0
+
+        THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+        PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION
+        OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+    1. DEFINITIONS
+
+    "Contribution" means:
+
+      a) in the case of the initial Contributor, the initial content
+         Distributed under this Agreement, and
+
+      b) in the case of each subsequent Contributor: 
+         i) changes to the Program, and 
+         ii) additions to the Program;
+      where such changes and/or additions to the Program originate from
+      and are Distributed by that particular Contributor. A Contribution
+      "originates" from a Contributor if it was added to the Program by
+      such Contributor itself or anyone acting on such Contributor's behalf.
+      Contributions do not include changes or additions to the Program that
+      are not Modified Works.
+
+    "Contributor" means any person or entity that Distributes the Program.
+
+    "Licensed Patents" mean patent claims licensable by a Contributor which
+    are necessarily infringed by the use or sale of its Contribution alone
+    or when combined with the Program.
+
+    "Program" means the Contributions Distributed in accordance with this
+    Agreement.
+
+    "Recipient" means anyone who receives the Program under this Agreement
+    or any Secondary License (as applicable), including Contributors.
+
+    "Derivative Works" shall mean any work, whether in Source Code or other
+    form, that is based on (or derived from) the Program and for which the
+    editorial revisions, annotations, elaborations, or other modifications
+    represent, as a whole, an original work of authorship.
+
+    "Modified Works" shall mean any work in Source Code or other form that
+    results from an addition to, deletion from, or modification of the
+    contents of the Program, including, for purposes of clarity any new file
+    in Source Code form that contains any contents of the Program. Modified
+    Works shall not include works that contain only declarations,
+    interfaces, types, classes, structures, or files of the Program solely
+    in each case in order to link to, bind by name, or subclass the Program
+    or Modified Works thereof.
+
+    "Distribute" means the acts of a) distributing or b) making available
+    in any manner that enables the transfer of a copy.
+
+    "Source Code" means the form of a Program preferred for making
+    modifications, including but not limited to software source code,
+    documentation source, and configuration files.
+
+    "Secondary License" means either the GNU General Public License,
+    Version 2.0, or any later versions of that license, including any
+    exceptions or additional permissions as identified by the initial
+    Contributor.
+
+    2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free copyright
+      license to reproduce, prepare Derivative Works of, publicly display,
+      publicly perform, Distribute and sublicense the Contribution of such
+      Contributor, if any, and such Derivative Works.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby
+      grants Recipient a non-exclusive, worldwide, royalty-free patent
+      license under Licensed Patents to make, use, sell, offer to sell,
+      import and otherwise transfer the Contribution of such Contributor,
+      if any, in Source Code or other form. This patent license shall
+      apply to the combination of the Contribution and the Program if, at
+      the time the Contribution is added by the Contributor, such addition
+      of the Contribution causes such combination to be covered by the
+      Licensed Patents. The patent license shall not apply to any other
+      combinations which include the Contribution. No hardware per se is
+      licensed hereunder.
+
+      c) Recipient understands that although each Contributor grants the
+      licenses to its Contributions set forth herein, no assurances are
+      provided by any Contributor that the Program does not infringe the
+      patent or other intellectual property rights of any other entity.
+      Each Contributor disclaims any liability to Recipient for claims
+      brought by any other entity based on infringement of intellectual
+      property rights or otherwise. As a condition to exercising the
+      rights and licenses granted hereunder, each Recipient hereby
+      assumes sole responsibility to secure any other intellectual
+      property rights needed, if any. For example, if a third party
+      patent license is required to allow Recipient to Distribute the
+      Program, it is Recipient's responsibility to acquire that license
+      before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has
+      sufficient copyright rights in its Contribution, if any, to grant
+      the copyright license set forth in this Agreement.
+
+      e) Notwithstanding the terms of any Secondary License, no
+      Contributor makes additional grants to any Recipient (other than
+      those set forth in this Agreement) as a result of such Recipient's
+      receipt of the Program under the terms of a Secondary License
+      (if permitted under the terms of Section 3).
+
+    3. REQUIREMENTS
+
+    3.1 If a Contributor Distributes the Program in any form, then:
+
+      a) the Program must also be made available as Source Code, in
+      accordance with section 3.2, and the Contributor must accompany
+      the Program with a statement that the Source Code for the Program
+      is available under this Agreement, and informs Recipients how to
+      obtain it in a reasonable manner on or through a medium customarily
+      used for software exchange; and
+
+      b) the Contributor may Distribute the Program under a license
+      different than this Agreement, provided that such license:
+         i) effectively disclaims on behalf of all other Contributors all
+         warranties and conditions, express and implied, including
+         warranties or conditions of title and non-infringement, and
+         implied warranties or conditions of merchantability and fitness
+         for a particular purpose;
+
+         ii) effectively excludes on behalf of all other Contributors all
+         liability for damages, including direct, indirect, special,
+         incidental and consequential damages, such as lost profits;
+
+         iii) does not attempt to limit or alter the recipients' rights
+         in the Source Code under section 3.2; and
+
+         iv) requires any subsequent distribution of the Program by any
+         party to be under a license that satisfies the requirements
+         of this section 3.
+
+    3.2 When the Program is Distributed as Source Code:
+
+      a) it must be made available under this Agreement, or if the
+      Program (i) is combined with other material in a separate file or
+      files made available under a Secondary License, and (ii) the initial
+      Contributor attached to the Source Code the notice described in
+      Exhibit A of this Agreement, then the Program may be made available
+      under the terms of such Secondary Licenses, and
+
+      b) a copy of this Agreement must be included with each copy of
+      the Program.
+
+    3.3 Contributors may not remove or alter any copyright, patent,
+    trademark, attribution notices, disclaimers of warranty, or limitations
+    of liability ("notices") contained within the Program from any copy of
+    the Program which they Distribute, provided that Contributors may add
+    their own appropriate notices.
+
+    4. COMMERCIAL DISTRIBUTION
+
+    Commercial distributors of software may accept certain responsibilities
+    with respect to end users, business partners and the like. While this
+    license is intended to facilitate the commercial use of the Program,
+    the Contributor who includes the Program in a commercial product
+    offering should do so in a manner which does not create potential
+    liability for other Contributors. Therefore, if a Contributor includes
+    the Program in a commercial product offering, such Contributor
+    ("Commercial Contributor") hereby agrees to defend and indemnify every
+    other Contributor ("Indemnified Contributor") against any losses,
+    damages and costs (collectively "Losses") arising from claims, lawsuits
+    and other legal actions brought by a third party against the Indemnified
+    Contributor to the extent caused by the acts or omissions of such
+    Commercial Contributor in connection with its distribution of the Program
+    in a commercial product offering. The obligations in this section do not
+    apply to any claims or Losses relating to any actual or alleged
+    intellectual property infringement. In order to qualify, an Indemnified
+    Contributor must: a) promptly notify the Commercial Contributor in
+    writing of such claim, and b) allow the Commercial Contributor to control,
+    and cooperate with the Commercial Contributor in, the defense and any
+    related settlement negotiations. The Indemnified Contributor may
+    participate in any such claim at its own expense.
+
+    For example, a Contributor might include the Program in a commercial
+    product offering, Product X. That Contributor is then a Commercial
+    Contributor. If that Commercial Contributor then makes performance
+    claims, or offers warranties related to Product X, those performance
+    claims and warranties are such Commercial Contributor's responsibility
+    alone. Under this section, the Commercial Contributor would have to
+    defend claims against the other Contributors related to those performance
+    claims and warranties, and if a court requires any other Contributor to
+    pay any damages as a result, the Commercial Contributor must pay
+    those damages.
+
+    5. NO WARRANTY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS"
+    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+    IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF
+    TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+    PURPOSE. Each Recipient is solely responsible for determining the
+    appropriateness of using and distributing the Program and assumes all
+    risks associated with its exercise of rights under this Agreement,
+    including but not limited to the risks and costs of program errors,
+    compliance with applicable laws, damage to or loss of data, programs
+    or equipment, and unavailability or interruption of operations.
+
+    6. DISCLAIMER OF LIABILITY
+
+    EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+    PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS
+    SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+    PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
+    EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.
+
+    7. GENERAL
+
+    If any provision of this Agreement is invalid or unenforceable under
+    applicable law, it shall not affect the validity or enforceability of
+    the remainder of the terms of this Agreement, and without further
+    action by the parties hereto, such provision shall be reformed to the
+    minimum extent necessary to make such provision valid and enforceable.
+
+    If Recipient institutes patent litigation against any entity
+    (including a cross-claim or counterclaim in a lawsuit) alleging that the
+    Program itself (excluding combinations of the Program with other software
+    or hardware) infringes such Recipient's patent(s), then such Recipient's
+    rights granted under Section 2(b) shall terminate as of the date such
+    litigation is filed.
+
+    All Recipient's rights under this Agreement shall terminate if it
+    fails to comply with any of the material terms or conditions of this
+    Agreement and does not cure such failure in a reasonable period of
+    time after becoming aware of such noncompliance. If all Recipient's
+    rights under this Agreement terminate, Recipient agrees to cease use
+    and distribution of the Program as soon as reasonably practicable.
+    However, Recipient's obligations under this Agreement and any licenses
+    granted by Recipient relating to the Program shall continue and survive.
+
+    Everyone is permitted to copy and distribute copies of this Agreement,
+    but in order to avoid inconsistency the Agreement is copyrighted and
+    may only be modified in the following manner. The Agreement Steward
+    reserves the right to publish new versions (including revisions) of
+    this Agreement from time to time. No one other than the Agreement
+    Steward has the right to modify this Agreement. The Eclipse Foundation
+    is the initial Agreement Steward. The Eclipse Foundation may assign the
+    responsibility to serve as the Agreement Steward to a suitable separate
+    entity. Each new version of the Agreement will be given a distinguishing
+    version number. The Program (including Contributions) may always be
+    Distributed subject to the version of the Agreement under which it was
+    received. In addition, after a new version of the Agreement is published,
+    Contributor may elect to Distribute the Program (including its
+    Contributions) under the new version.
+
+    Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+    receives no rights or licenses to the intellectual property of any
+    Contributor under this Agreement, whether expressly, by implication,
+    estoppel or otherwise. All rights in the Program not expressly granted
+    under this Agreement are reserved. Nothing in this Agreement is intended
+    to be enforceable by any entity that is not a Contributor or Recipient.
+    No third-party beneficiary rights are created under this Agreement.
+
+    Exhibit A - Form of Secondary Licenses Notice
+
+    "This Source Code may also be made available under the following 
+    Secondary Licenses when the conditions for such availability set forth 
+    in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    version(s), and exceptions or additional permissions here}."
+
+      Simply including a copy of this Agreement, including this Exhibit A
+      is not sufficient to license the Source Code under Secondary Licenses.
+
+      If it is not possible or desirable to put the notice in a particular
+      file, then You may include the notice in a location (such as a LICENSE
+      file in a relevant directory) where a recipient would be likely to
+      look for such a notice.
+
+      You may add additional accurate notices of copyright ownership.
+
+---
+
+##    The GNU General Public License (GPL) Version 2, June 1991
+
+    Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+    51 Franklin Street, Fifth Floor
+    Boston, MA 02110-1335
+    USA
+
+    Everyone is permitted to copy and distribute verbatim copies
+    of this license document, but changing it is not allowed.
+
+    Preamble
+
+    The licenses for most software are designed to take away your freedom to
+    share and change it. By contrast, the GNU General Public License is
+    intended to guarantee your freedom to share and change free software--to
+    make sure the software is free for all its users. This General Public
+    License applies to most of the Free Software Foundation's software and
+    to any other program whose authors commit to using it. (Some other Free
+    Software Foundation software is covered by the GNU Library General
+    Public License instead.) You can apply it to your programs, too.
+
+    When we speak of free software, we are referring to freedom, not price.
+    Our General Public Licenses are designed to make sure that you have the
+    freedom to distribute copies of free software (and charge for this
+    service if you wish), that you receive source code or can get it if you
+    want it, that you can change the software or use pieces of it in new
+    free programs; and that you know you can do these things.
+
+    To protect your rights, we need to make restrictions that forbid anyone
+    to deny you these rights or to ask you to surrender the rights. These
+    restrictions translate to certain responsibilities for you if you
+    distribute copies of the software, or if you modify it.
+
+    For example, if you distribute copies of such a program, whether gratis
+    or for a fee, you must give the recipients all the rights that you have.
+    You must make sure that they, too, receive or can get the source code.
+    And you must show them these terms so they know their rights.
+
+    We protect your rights with two steps: (1) copyright the software, and
+    (2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+    Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software. If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+    Finally, any free program is threatened constantly by software patents.
+    We wish to avoid the danger that redistributors of a free program will
+    individually obtain patent licenses, in effect making the program
+    proprietary. To prevent this, we have made it clear that any patent must
+    be licensed for everyone's free use or not licensed at all.
+
+    The precise terms and conditions for copying, distribution and
+    modification follow.
+
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+    0. This License applies to any program or other work which contains a
+    notice placed by the copyright holder saying it may be distributed under
+    the terms of this General Public License. The "Program", below, refers
+    to any such program or work, and a "work based on the Program" means
+    either the Program or any derivative work under copyright law: that is
+    to say, a work containing the Program or a portion of it, either
+    verbatim or with modifications and/or translated into another language.
+    (Hereinafter, translation is included without limitation in the term
+    "modification".) Each licensee is addressed as "you".
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope. The act of running
+    the Program is not restricted, and the output from the Program is
+    covered only if its contents constitute a work based on the Program
+    (independent of having been made by running the Program). Whether that
+    is true depends on what the Program does.
+
+    1. You may copy and distribute verbatim copies of the Program's source
+    code as you receive it, in any medium, provided that you conspicuously
+    and appropriately publish on each copy an appropriate copyright notice
+    and disclaimer of warranty; keep intact all the notices that refer to
+    this License and to the absence of any warranty; and give any other
+    recipients of the Program a copy of this License along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+    2. You may modify your copy or copies of the Program or any portion of
+    it, thus forming a work based on the Program, and copy and distribute
+    such modifications or work under the terms of Section 1 above, provided
+    that you also meet all of these conditions:
+
+        a) You must cause the modified files to carry prominent notices
+        stating that you changed the files and the date of any change.
+
+        b) You must cause any work that you distribute or publish, that in
+        whole or in part contains or is derived from the Program or any part
+        thereof, to be licensed as a whole at no charge to all third parties
+        under the terms of this License.
+
+        c) If the modified program normally reads commands interactively
+        when run, you must cause it, when started running for such
+        interactive use in the most ordinary way, to print or display an
+        announcement including an appropriate copyright notice and a notice
+        that there is no warranty (or else, saying that you provide a
+        warranty) and that users may redistribute the program under these
+        conditions, and telling the user how to view a copy of this License.
+        (Exception: if the Program itself is interactive but does not
+        normally print such an announcement, your work based on the Program
+        is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole. If
+    identifiable sections of that work are not derived from the Program, and
+    can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works. But when you
+    distribute the same sections as part of a whole which is a work based on
+    the Program, the distribution of the whole must be on the terms of this
+    License, whose permissions for other licensees extend to the entire
+    whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of a
+    storage or distribution medium does not bring the other work under the
+    scope of this License.
+
+    3. You may copy and distribute the Program (or a work based on it,
+    under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+        a) Accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of Sections 1
+        and 2 above on a medium customarily used for software interchange; or,
+
+        b) Accompany it with a written offer, valid for at least three
+        years, to give any third party, for a charge no more than your cost
+        of physically performing source distribution, a complete
+        machine-readable copy of the corresponding source code, to be
+        distributed under the terms of Sections 1 and 2 above on a medium
+        customarily used for software interchange; or,
+
+        c) Accompany it with the information you received as to the offer to
+        distribute corresponding source code. (This alternative is allowed
+        only for noncommercial distribution and only if you received the
+        program in object code or executable form with such an offer, in
+        accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it. For an executable work, complete source code
+    means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to control
+    compilation and installation of the executable. However, as a special
+    exception, the source code distributed need not include anything that is
+    normally distributed (in either source or binary form) with the major
+    components (compiler, kernel, and so on) of the operating system on
+    which the executable runs, unless that component itself accompanies the
+    executable.
+
+    If distribution of executable or object code is made by offering access
+    to copy from a designated place, then offering equivalent access to copy
+    the source code from the same place counts as distribution of the source
+    code, even though third parties are not compelled to copy the source
+    along with the object code.
+
+    4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License. Any attempt otherwise
+    to copy, modify, sublicense or distribute the Program is void, and will
+    automatically terminate your rights under this License. However, parties
+    who have received copies, or rights, from you under this License will
+    not have their licenses terminated so long as such parties remain in
+    full compliance.
+
+    5. You are not required to accept this License, since you have not
+    signed it. However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works. These actions are
+    prohibited by law if you do not accept this License. Therefore, by
+    modifying or distributing the Program (or any work based on the
+    Program), you indicate your acceptance of this License to do so, and all
+    its terms and conditions for copying, distributing or modifying the
+    Program or works based on it.
+
+    6. Each time you redistribute the Program (or any work based on the
+    Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions. You may not impose any further restrictions
+    on the recipients' exercise of the rights granted herein. You are not
+    responsible for enforcing compliance by third parties to this License.
+
+    7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+    otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License. If you cannot distribute
+    so as to satisfy simultaneously your obligations under this License and
+    any other pertinent obligations, then as a consequence you may not
+    distribute the Program at all. For example, if a patent license would
+    not permit royalty-free redistribution of the Program by all those who
+    receive copies directly or indirectly through you, then the only way you
+    could satisfy both it and this License would be to refrain entirely from
+    distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is implemented
+    by public license practices. Many people have made generous
+    contributions to the wide range of software distributed through that
+    system in reliance on consistent application of that system; it is up to
+    the author/donor to decide if he or she is willing to distribute
+    software through any other system and a licensee cannot impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to be
+    a consequence of the rest of this License.
+
+    8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License may
+    add an explicit geographical distribution limitation excluding those
+    countries, so that distribution is permitted only in or among countries
+    not thus excluded. In such case, this License incorporates the
+    limitation as if written in the body of this License.
+
+    9. The Free Software Foundation may publish revised and/or new
+    versions of the General Public License from time to time. Such new
+    versions will be similar in spirit to the present version, but may
+    differ in detail to address new problems or concerns.
+
+    Each version is given a distinguishing version number. If the Program
+    specifies a version number of this License which applies to it and "any
+    later version", you have the option of following the terms and
+    conditions either of that version or of any later version published by
+    the Free Software Foundation. If the Program does not specify a version
+    number of this License, you may choose any version ever published by the
+    Free Software Foundation.
+
+    10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the
+    author to ask for permission. For software which is copyrighted by the
+    Free Software Foundation, write to the Free Software Foundation; we
+    sometimes make exceptions for this. Our decision will be guided by the
+    two goals of preserving the free status of all derivatives of our free
+    software and of promoting the sharing and reuse of software generally.
+
+    NO WARRANTY
+
+    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
+    WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+    EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+    OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
+    EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
+    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
+    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+    NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+    WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+    AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL
+    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM
+    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF
+    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    END OF TERMS AND CONDITIONS
+
+    How to Apply These Terms to Your New Programs
+
+    If you develop a new program, and you want it to be of the greatest
+    possible use to the public, the best way to achieve this is to make it
+    free software which everyone can redistribute and change under these terms.
+
+    To do so, attach the following notices to the program. It is safest to
+    attach them to the start of each source file to most effectively convey
+    the exclusion of warranty; and each file should have at least the
+    "copyright" line and a pointer to where the full notice is found.
+
+        One line to give the program's name and a brief idea of what it does.
+        Copyright (C) <year> <name of author>
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful, but
+        WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+        General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
+
+    Also add information on how to contact you by electronic and paper mail.
+
+    If the program is interactive, make it output a short notice like this
+    when it starts in an interactive mode:
+
+        Gnomovision version 69, Copyright (C) year name of author
+        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
+        `show w'. This is free software, and you are welcome to redistribute
+        it under certain conditions; type `show c' for details.
+
+    The hypothetical commands `show w' and `show c' should show the
+    appropriate parts of the General Public License. Of course, the commands
+    you use may be called something other than `show w' and `show c'; they
+    could even be mouse-clicks or menu items--whatever suits your program.
+
+    You should also get your employer (if you work as a programmer) or your
+    school, if any, to sign a "copyright disclaimer" for the program, if
+    necessary. Here is a sample; alter the names:
+
+        Yoyodyne, Inc., hereby disclaims all copyright interest in the
+        program `Gnomovision' (which makes passes at compilers) written by
+        James Hacker.
+
+        signature of Ty Coon, 1 April 1989
+        Ty Coon, President of Vice
+
+    This General Public License does not permit incorporating your program
+    into proprietary programs. If your program is a subroutine library, you
+    may consider it more useful to permit linking proprietary applications
+    with the library. If this is what you want to do, use the GNU Library
+    General Public License instead of this License.
+
+---
+
+## CLASSPATH EXCEPTION
+
+    Linking this library statically or dynamically with other modules is
+    making a combined work based on this library.  Thus, the terms and
+    conditions of the GNU General Public License version 2 cover the whole
+    combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent
+    modules, and to copy and distribute the resulting executable under
+    terms of your choice, provided that you also meet, for each linked
+    independent module, the terms and conditions of the license of that
+    module.  An independent module is a module which is not derived from or
+    based on this library.  If you modify this library, you may extend this
+    exception to your version of the library, but you are not obligated to
+    do so.  If you do not wish to do so, delete this exception statement
+    from your version.
+# --- END LICENSE FILE [1.0.3] ---
diff --git a/doc/licenses/osgi-resource-locator/NOTICE.md b/doc/licenses/osgi-resource-locator/NOTICE.md
new file mode 100644
index 000000000..0c673e21b
--- /dev/null
+++ b/doc/licenses/osgi-resource-locator/NOTICE.md
@@ -0,0 +1,23 @@
+# Source: https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2-extra/refs/tags/${VERSION}/NOTICE.md
+# Source: https://raw.githubusercontent.com/eclipse-ee4j/glassfish-hk2-extra/refs/tags/${VERSION}-RELEASE/NOTICE.md
+#
+# --- BEGIN LICENSE FILE [1.0.3] ---
+# Notices for Eclipse GlassFish
+
+This content is produced and maintained by the Eclipse GlassFish project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.glassfish
+
+## Trademarks
+
+Eclipse GlassFish, and GlassFish are trademarks of the Eclipse Foundation.
+
+## Cryptography
+
+Content may contain encryption software. The country in which you are currently
+may have restrictions on the import, possession, and use, and/or re-export to
+another country, of encryption software. BEFORE using any encryption software,
+please check the country's laws, regulations and policies concerning the import,
+possession, or use, and re-export of encryption software, to see if this is
+permitted.
+# --- END LICENSE FILE [1.0.3] ---
diff --git a/doc/licenses/pickr/LICENSE b/doc/licenses/pickr/LICENSE
index 95dadd63f..13f764ef1 100644
--- a/doc/licenses/pickr/LICENSE
+++ b/doc/licenses/pickr/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://simonwep.github.io/pickr/
 # From:    'Simon Reinisch' (https://github.com/Simonwep/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/simonwep/pickr/refs/tags/${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [1.8.2] ---
 MIT License
 
 Copyright (c) 2018 - 2021 Simon Reinisch
@@ -25,4 +26,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [1.8.2] ---
diff --git a/doc/licenses/process-nextick-args/dep-coordinates.txt b/doc/licenses/process-nextick-args/dep-coordinates.txt
deleted file mode 100644
index f4c7239e9..000000000
--- a/doc/licenses/process-nextick-args/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-process-nextick-args:*
diff --git a/doc/licenses/process-nextick-args/license.md b/doc/licenses/process-nextick-args/license.md
deleted file mode 100644
index 761ee4286..000000000
--- a/doc/licenses/process-nextick-args/license.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Name:    process-nextick-args
-# URL:     https://github.com/calvinmetcalf/process-nextick-args
-# From:    'Calvin Metcalf' (https://github.com/calvinmetcalf)
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-# Copyright (c) 2015 Calvin Metcalf
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-**THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.**
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/process/LICENSE b/doc/licenses/process/LICENSE
index 521586024..75443add9 100644
--- a/doc/licenses/process/LICENSE
+++ b/doc/licenses/process/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/defunctzombie/node-process/
 # From:    'Roman Shtylman' (https://github.com/defunctzombie)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/defunctzombie/node-process/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [0.11.10] ---
 (The MIT License)
 
 Copyright (c) 2013 Roman Shtylman <shtylman@gmail.com>
@@ -26,4 +27,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [0.11.10] ---
diff --git a/doc/licenses/readable-stream/LICENSE b/doc/licenses/readable-stream/LICENSE
deleted file mode 100644
index 5d4d3ebb0..000000000
--- a/doc/licenses/readable-stream/LICENSE
+++ /dev/null
@@ -1,54 +0,0 @@
-# Name:    readable-stream
-# URL:     https://github.com/nodejs/readable-stream
-# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-Node.js is licensed for use as follows:
-
-"""
-Copyright Node.js contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-"""
-
-This license applies to parts of Node.js originating from the
-https://github.com/joyent/node repository:
-
-"""
-Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-"""
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/readable-stream/dep-coordinates.txt b/doc/licenses/readable-stream/dep-coordinates.txt
deleted file mode 100644
index 47c1abf10..000000000
--- a/doc/licenses/readable-stream/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-readable-stream:*
diff --git a/doc/licenses/reserved-words/LICENSE b/doc/licenses/reserved-words/LICENSE
index 6d5a535a9..df0cfc688 100644
--- a/doc/licenses/reserved-words/LICENSE
+++ b/doc/licenses/reserved-words/LICENSE
@@ -2,8 +2,10 @@
 # URL:     https://github.com/qfox/reserved-words/
 # From:    'Alexej Yaroshevich and other contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/qfox/reserved-words/refs/tags/v${VERSION}/LICENSE
+# Source:  https://raw.githubusercontent.com/qfox/reserved-words/refs/tags/${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [0.1.2] ---
 The MIT License (MIT)
 
 Copyright 2015 Alexej Yaroshevich and other contributors
@@ -26,4 +28,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [0.1.2] ---
diff --git a/doc/licenses/safe-buffer/LICENSE b/doc/licenses/safe-buffer/LICENSE
deleted file mode 100644
index 8533ed779..000000000
--- a/doc/licenses/safe-buffer/LICENSE
+++ /dev/null
@@ -1,28 +0,0 @@
-# Name:    safe-buffer
-# URL:     https://github.com/feross/safe-buffer
-# From:    'Feross Aboukhadijeh' (https://github.com/feross)
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-The MIT License (MIT)
-
-Copyright (c) Feross Aboukhadijeh
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/safe-buffer/dep-coordinates.txt b/doc/licenses/safe-buffer/dep-coordinates.txt
deleted file mode 100644
index cc40c73e8..000000000
--- a/doc/licenses/safe-buffer/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-safe-buffer:*
diff --git a/doc/licenses/setimmediate/LICENSE.txt b/doc/licenses/setimmediate/LICENSE.txt
deleted file mode 100644
index 19cceaffb..000000000
--- a/doc/licenses/setimmediate/LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Name:    setImmediate.js
-# URL:     https://github.com/YuzuJS/setImmediate
-# From:    'Yuzu (by Barnes & Noble Education)' (https://github.com/YuzuJS)
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-Copyright (c) 2012 Barnesandnoble.com, llc, Donavon West, and Domenic Denicola
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/setimmediate/dep-coordinates.txt b/doc/licenses/setimmediate/dep-coordinates.txt
deleted file mode 100644
index 43d2c2222..000000000
--- a/doc/licenses/setimmediate/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-setimmediate:*
diff --git a/doc/licenses/slf4j-api/LICENSE.txt b/doc/licenses/slf4j-api/LICENSE.txt
index e09f334b2..eb6a58a03 100644
--- a/doc/licenses/slf4j-api/LICENSE.txt
+++ b/doc/licenses/slf4j-api/LICENSE.txt
@@ -2,9 +2,10 @@
 # URL:     http://slf4j.org/
 # From:    'QOS.ch Sàrl' (http://qos.ch/)
 # License: MIT
+# Source:  https://raw.githubusercontent.com/qos-ch/slf4j/refs/tags/v_${VERSION}/LICENSE.txt
 #
-# --- BEGIN LICENSE FILE ---
-Copyright (c) 2004-2024 QOS.ch Sarl (Switzerland)
+# --- BEGIN LICENSE FILE [2.0.17] ---
+Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
 All rights reserved.
 
 Permission is hereby granted, free  of charge, to any person obtaining
@@ -25,4 +26,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [2.0.17] ---
diff --git a/doc/licenses/stream-browserify/LICENSE b/doc/licenses/stream-browserify/LICENSE
deleted file mode 100644
index 585b8ddd0..000000000
--- a/doc/licenses/stream-browserify/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-# Name:    stream-browserify
-# URL:     https://github.com/browserify/stream-browserify
-# From:    'James Halliday'
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-MIT License
-
-Copyright (c) James Halliday
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/stream-browserify/dep-coordinates.txt b/doc/licenses/stream-browserify/dep-coordinates.txt
deleted file mode 100644
index 4f19a63d5..000000000
--- a/doc/licenses/stream-browserify/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-stream-browserify:*
diff --git a/doc/licenses/string_decoder/LICENSE b/doc/licenses/string_decoder/LICENSE
deleted file mode 100644
index f40ea6abc..000000000
--- a/doc/licenses/string_decoder/LICENSE
+++ /dev/null
@@ -1,54 +0,0 @@
-# Name:    string_decoder
-# URL:     https://github.com/nodejs/string_decoder
-# From:    'Node.js contributors, Joyent, Inc., and other Node contributors'
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-Node.js is licensed for use as follows:
-
-"""
-Copyright Node.js contributors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-"""
-
-This license applies to parts of Node.js originating from the
-https://github.com/joyent/node repository:
-
-"""
-Copyright Joyent, Inc. and other Node contributors. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-"""
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/string_decoder/dep-coordinates.txt b/doc/licenses/string_decoder/dep-coordinates.txt
deleted file mode 100644
index 767cbb353..000000000
--- a/doc/licenses/string_decoder/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-string_decoder:*
diff --git a/doc/licenses/timers-browserify/LICENSE.md b/doc/licenses/timers-browserify/LICENSE.md
deleted file mode 100644
index 23d9f7a97..000000000
--- a/doc/licenses/timers-browserify/LICENSE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Name:    timers-browserify
-# URL:     https://github.com/browserify/timers-browserify
-# From:    'J. Ryan Stinnett' (https://github.com/jryans)
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-# timers-browserify
-
-This project uses the [MIT](http://jryans.mit-license.org/) license:
-
-    Copyright © 2012 J. Ryan Stinnett <jryans@gmail.com>
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the “Software”),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/timers-browserify/dep-coordinates.txt b/doc/licenses/timers-browserify/dep-coordinates.txt
deleted file mode 100644
index f27dc9e18..000000000
--- a/doc/licenses/timers-browserify/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-timers-browserify:*
diff --git a/doc/licenses/util-deprecate/LICENSE b/doc/licenses/util-deprecate/LICENSE
deleted file mode 100644
index 37c6128d2..000000000
--- a/doc/licenses/util-deprecate/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-# Name:    util-deprecate
-# URL:     https://github.com/TooTallNate/util-deprecate
-# From:    'Nathan Rajlich' (https://github.com/TooTallNate)
-# License: MIT
-#
-# --- BEGIN LICENSE FILE ---
-(The MIT License)
-
-Copyright (c) 2014 Nathan Rajlich <nathan@tootallnate.net>
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
diff --git a/doc/licenses/util-deprecate/dep-coordinates.txt b/doc/licenses/util-deprecate/dep-coordinates.txt
deleted file mode 100644
index cddba60fe..000000000
--- a/doc/licenses/util-deprecate/dep-coordinates.txt
+++ /dev/null
@@ -1 +0,0 @@
-util-deprecate:*
diff --git a/doc/licenses/util/LICENSE b/doc/licenses/util/LICENSE
index 08165867e..e3b4bbda5 100644
--- a/doc/licenses/util/LICENSE
+++ b/doc/licenses/util/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://github.com/browserify/node-util
 # From:    'Joyent, Inc. and other Node contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/browserify/node-util/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [0.11.1] ---
 Copyright Joyent, Inc. and other Node contributors. All rights reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
@@ -22,4 +23,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [0.11.1] ---
diff --git a/doc/licenses/webpack/LICENSE b/doc/licenses/webpack/LICENSE
index 780627071..2ee017807 100644
--- a/doc/licenses/webpack/LICENSE
+++ b/doc/licenses/webpack/LICENSE
@@ -2,8 +2,9 @@
 # URL:     https://webpack.js.org/
 # From:    'JS Foundation and other contributors'
 # License: MIT
+# Source:  https://raw.githubusercontent.com/webpack/webpack/refs/tags/v${VERSION}/LICENSE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [4.47.0] ---
 Copyright JS Foundation and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -24,4 +25,4 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [4.47.0] ---
diff --git a/doc/licenses/woodstox-stax2-api/LICENSE b/doc/licenses/woodstox-stax2-api/LICENSE
index a3efa3ef5..46f33b2b5 100644
--- a/doc/licenses/woodstox-stax2-api/LICENSE
+++ b/doc/licenses/woodstox-stax2-api/LICENSE
@@ -4,10 +4,10 @@
 # License: BSD Simplified 
 #
 # --- BEGIN LICENSE FILE ---
-Copyright 2010 FasterXML, LLC
+Copyright 2010- FasterXML.com
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this
 list of conditions and the following disclaimer.
@@ -16,7 +16,7 @@ list of conditions and the following disclaimer.
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
diff --git a/doc/licenses/zxing/AUTHORS b/doc/licenses/zxing/AUTHORS
index 01d2d05a2..a9fcc61a0 100644
--- a/doc/licenses/zxing/AUTHORS
+++ b/doc/licenses/zxing/AUTHORS
@@ -1,4 +1,6 @@
-# --- BEGIN LICENSE FILE ---
+# Source: https://raw.githubusercontent.com/zxing/zxing/refs/tags/zxing-${VERSION}/AUTHORS
+#
+# --- BEGIN LICENSE FILE [3.5.3] ---
 This project consists of contributions from several people, recognized here for convenience,
 in alphabetical order.
 
@@ -134,4 +136,4 @@ Yakov Okshtein (Google)
 Yao Wei
 Younes CHTIOUI
 Yunhao Tian
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.5.3] ---
diff --git a/doc/licenses/zxing/NOTICE b/doc/licenses/zxing/NOTICE
index 5077a3732..20645226e 100644
--- a/doc/licenses/zxing/NOTICE
+++ b/doc/licenses/zxing/NOTICE
@@ -1,9 +1,10 @@
 # Name:    ZXing Barcode Scanning Library
 # URL:     https://github.com/zxing/zxing/
-# From:    'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-${DEP_VERSION}/AUTHORS)
+# From:    'ZXing authors' (bundled/zxing/AUTHORS)
 # License: Apache v2.0
+# Source:  https://raw.githubusercontent.com/zxing/zxing/refs/tags/zxing-${VERSION}/NOTICE
 #
-# --- BEGIN LICENSE FILE ---
+# --- BEGIN LICENSE FILE [3.5.3] ---
 Barcode4J
 Copyright 2002-2010 Jeremias Märki
 Copyright 2005-2006 Dietmar Bürkle
@@ -11,4 +12,4 @@ Copyright 2005-2006 Dietmar Bürkle
 Portions of this software were contributed under section 5 of the
 Apache License. Contributors are listed under:
 http://barcode4j.sourceforge.net/contributors.html
-# --- END LICENSE FILE ---
+# --- END LICENSE FILE [3.5.3] ---

From 6f223944221ae6bf397d0082b2f7396fead5c3fc Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Tue, 10 Feb 2026 23:16:58 -0800
Subject: [PATCH 4/4] GUACAMOLE-2139: Fail build if licenses would be
 downloaded (unless explicitly overridden).

---
 doc/licenses/generate-license-files.sh | 20 +++++++++++++++++---
 pom.xml                                |  6 ++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/licenses/generate-license-files.sh b/doc/licenses/generate-license-files.sh
index 62b678a19..5d43811b9 100755
--- a/doc/licenses/generate-license-files.sh
+++ b/doc/licenses/generate-license-files.sh
@@ -49,7 +49,17 @@
 # errors are encountered, failing the build. If this is undesirable (dependency
 # changes are being tested, a full list of all license errors across all
 # projects is needed, etc.), set the IGNORE_LICENSE_ERRORS environment variable
-# to "true".
+# to "true" (by building with "-DignoreLicenseErrors" specified).
+#
+# Downloading licenses automatically
+# ----------------------------------
+#
+# By default, this script will flag a license error if license information is
+# missing for any dependency. If license information can be downloaded from a
+# declared source (any of the "Source" URLs in the license information files),
+# this script can be instructed to automatically update license information
+# files by setting the DOWNLOAD_MISSING_LICENSES environment variable to
+# "true" (by building with "-DdownloadMissingLicenses" specified).
 #
 # Structure of license information
 # --------------------------------
@@ -557,8 +567,12 @@ EOF
     find "$LICENSE_INFO_DIR" -type f | xargs grep -l '^#[[:space:]]*Source:' \
         | while read FILENAME; do
         if [ -z "`get_license "$FILENAME" "$VERSION"`" ]; then
-            info "Downloading updated `basename "$FILENAME"` for `basename "$LICENSE_INFO_DIR"` ($VERSION)..."
-            append_license "$FILENAME" "$VERSION"
+            if [ "$DOWNLOAD_MISSING_LICENSES" = "true" ]; then
+                info "Downloading updated `basename "$FILENAME"` for `basename "$LICENSE_INFO_DIR"` ($VERSION)..."
+                append_license "$FILENAME" "$VERSION"
+            else
+                error "Missing license information in `basename "$FILENAME"` for `basename "$LICENSE_INFO_DIR"` ($VERSION). Rebuild with \"-DdownloadMissingLicenses\" to automatically download."
+            fi
         fi
     done
 
diff --git a/pom.xml b/pom.xml
index 244d32c83..2f260fc6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,11 @@
             or missing license headers). -->
         <ignoreLicenseErrors>false</ignoreLicenseErrors>
 
+        <!-- Set to "true" to automatically download license information
+            for any files that have "Source" headers but lack specific
+            information for the current version of that dependency. -->
+        <downloadMissingLicenses>false</downloadMissingLicenses>
+
         <!-- Set to "true" to perform automated checks for available dependency
             updates, including whether the declared versions of any
             dependencies have associated CVEs in NVD. Beware that both checks
@@ -278,6 +283,7 @@
                                 </arguments>
                                 <environmentVariables>
                                     <IGNORE_LICENSE_ERRORS>${ignoreLicenseErrors}</IGNORE_LICENSE_ERRORS>
+                                    <DOWNLOAD_MISSING_LICENSES>${downloadMissingLicenses}</DOWNLOAD_MISSING_LICENSES>
                                 </environmentVariables>
                             </configuration>
                             <goals>