apache · necouchman · Apr 10, 2024 · Apr 10, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -22,10 +22,10 @@
 #
 
 # Use args for Tomcat image label to allow image builder to choose alternatives
-# such as `--build-arg TOMCAT_JRE=jre8-alpine`
+# such as `--build-arg TOMCAT_JRE=jre11-alpine`
 #
-ARG TOMCAT_VERSION=8.5
-ARG TOMCAT_JRE=jdk8
+ARG TOMCAT_VERSION=10
+ARG TOMCAT_JRE=jre11
 
 # Use official maven image for the build
 FROM maven:3-eclipse-temurin-8-focal AS builder

diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
@@ -96,9 +96,9 @@
 
         <!-- Servlet API -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <version>10.0.0</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/...e-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java b/...e-example/src/main/java/org/apache/guacamole/net/example/DummyGuacamoleTunnelServlet.java
@@ -19,7 +19,7 @@
 
 package org.apache.guacamole.net.example;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.net.GuacamoleSocket;
 import org.apache.guacamole.net.GuacamoleTunnel;

diff --git a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
diff --git a/doc/licenses/apache-santuario-2.2.6/NOTICE → doc/licenses/apache-santuario-4.0.2/NOTICE b/doc/licenses/apache-santuario-2.2.6/NOTICE → doc/licenses/apache-santuario-4.0.2/NOTICE
diff --git a/doc/licenses/apache-santuario-2.2.6/README → doc/licenses/apache-santuario-4.0.2/README b/doc/licenses/apache-santuario-2.2.6/README → doc/licenses/apache-santuario-4.0.2/README
@@ -1,7 +1,7 @@
 Apache Santuario (https://santuario.apache.org/)
 -------------------------------------------------
 
-    Version: 2.2.6
+    Version: 4.0.2
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt b/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.santuario:xmlsec:jar:4.0.2
diff --git a/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt b/doc/licenses/glassfish-hk2-2.6.1/dep-coordinates.txt
diff --git a/doc/licenses/glassfish-hk2-2.6.1/LICENSE.md → doc/licenses/glassfish-hk2-3.1.0/LICENSE.md b/doc/licenses/glassfish-hk2-2.6.1/LICENSE.md → doc/licenses/glassfish-hk2-3.1.0/LICENSE.md
diff --git a/doc/licenses/glassfish-hk2-2.6.1/README → doc/licenses/glassfish-hk2-3.1.0/README b/doc/licenses/glassfish-hk2-2.6.1/README → doc/licenses/glassfish-hk2-3.1.0/README
@@ -1,8 +1,8 @@
 GlassFish HK2 (https://eclipse-ee4j.github.io/glassfish-hk2/)
 -------------------------------------------------------------
 
-    Version: 2.6.1
+    Version: 3.1.0
     From: 'Eclipse Foundation' (https://www.eclipse.org/)
     License(s):
-        EPL v2.0 (bundled/glassfish-hk2-2.6.1/LICENSE.md)
+        EPL v2.0 (bundled/glassfish-hk2-3.0.6/LICENSE.md)
 
diff --git a/doc/licenses/glassfish-hk2-3.1.0/dep-coordinates.txt b/doc/licenses/glassfish-hk2-3.1.0/dep-coordinates.txt
@@ -0,0 +1,6 @@
+org.glassfish.hk2.external:aopalliance-repackaged:jar:3.1.0
+org.glassfish.hk2.external:jakarta.inject:jar:3.1.0
+org.glassfish.hk2:guice-bridge:jar:3.1.0
+org.glassfish.hk2:hk2-api:jar:3.1.0
+org.glassfish.hk2:hk2-locator:jar:3.1.0
+org.glassfish.hk2:hk2-utils:jar:3.1.0
diff --git a/doc/licenses/guice-5.1.0/dep-coordinates.txt b/doc/licenses/guice-5.1.0/dep-coordinates.txt
diff --git a/doc/licenses/guice-5.1.0/README → doc/licenses/guice-7.0.0/README b/doc/licenses/guice-5.1.0/README → doc/licenses/guice-7.0.0/README
@@ -1,7 +1,7 @@
 Google Guice (https://github.com/google/guice)
 ----------------------------------------------
 
-    Version: 5.1.0
+    Version: 7.0.0
     From: 'Google Inc.' (http://www.google.com/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/guice-7.0.0/dep-coordinates.txt b/doc/licenses/guice-7.0.0/dep-coordinates.txt
@@ -0,0 +1,3 @@
+com.google.inject:guice:jar:7.0.0
+com.google.inject.extensions:guice-assistedinject:jar:7.0.0
+com.google.inject.extensions:guice-servlet:jar:7.0.0
diff --git a/doc/licenses/jackson-2.17.0/dep-coordinates.txt b/doc/licenses/jackson-2.17.0/dep-coordinates.txt
@@ -2,3 +2,4 @@ com.fasterxml.jackson.core:jackson-core:jar:2.17.0
 com.fasterxml.jackson.core:jackson-annotations:jar:2.17.0
 com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.17.0
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.17.0
+com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:jar:2.17.0
diff --git a/doc/licenses/jakarta-activation-1.2.2/README b/doc/licenses/jakarta-activation-1.2.2/README
diff --git a/doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt b/doc/licenses/jakarta-activation-1.2.2/dep-coordinates.txt
diff --git a/...enses/jakarta-activation-1.2.2/LICENSE.md → ...enses/jakarta-activation-2.1.0/LICENSE.md b/...enses/jakarta-activation-1.2.2/LICENSE.md → ...enses/jakarta-activation-2.1.0/LICENSE.md
diff --git a/doc/licenses/jakarta-activation-2.1.0/README b/doc/licenses/jakarta-activation-2.1.0/README
@@ -0,0 +1,8 @@
+Jakarta Activation (https://eclipse-ee4j.github.io/jaf/)
+--------------------------------------------------------
+
+    Version: 2.1.0
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
+    License(s):
+        BSD 3-clause (bundled/jakarta-activation-2.1.0/LICENSE.md)
+
diff --git a/doc/licenses/jakarta-activation-2.1.0/dep-coordinates.txt b/doc/licenses/jakarta-activation-2.1.0/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.activation:jakarta.activation-api:jar:2.1.0
diff --git a/doc/licenses/jakarta-activation-2.1.3/LICENSE.md b/doc/licenses/jakarta-activation-2.1.3/LICENSE.md
@@ -0,0 +1,29 @@
+
+    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-2.1.3/README b/doc/licenses/jakarta-activation-2.1.3/README
@@ -0,0 +1,8 @@
+Jakarta Activation (https://eclipse-ee4j.github.io/jaf/)
+--------------------------------------------------------
+
+    Version: 2.1.3
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
+    License(s):
+        BSD 3-clause (bundled/jakarta-activation-2.1.0/LICENSE.md)
+
diff --git a/doc/licenses/jakarta-activation-2.1.3/dep-coordinates.txt b/doc/licenses/jakarta-activation-2.1.3/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.activation:jakarta.activation-api:jar:2.1.3
diff --git a/doc/licenses/jakarta-annotation-api-1.3.5/README b/doc/licenses/jakarta-annotation-api-1.3.5/README
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
diff --git a/...s/jakarta-annotation-api-1.3.5/LICENSE.md → ...s/jakarta-annotation-api-2.1.1/LICENSE.md b/...s/jakarta-annotation-api-1.3.5/LICENSE.md → ...s/jakarta-annotation-api-2.1.1/LICENSE.md
diff --git a/doc/licenses/jakarta-annotation-api-2.1.1/README b/doc/licenses/jakarta-annotation-api-2.1.1/README
@@ -0,0 +1,8 @@
+Jakarta Annotations (https://jakartaee.github.io/common-annotations-api/)
+-------------------------------------------------------------------------
+
+    Version: 2.1.1
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
+    License(s):
+        EPL v2.0 (bundled/jakarta-annotation-api-2.1.1/LICENSE.md)
+
diff --git a/doc/licenses/jakarta-annotation-api-2.1.1/dep-coordinates.txt b/doc/licenses/jakarta-annotation-api-2.1.1/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.annotation:jakarta.annotation-api:jar:2.1.1
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt b/doc/licenses/jakarta-jaxb-2.3.3/dep-coordinates.txt
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md → doc/licenses/jakarta-jaxb-4.0.2/LICENSE.md b/doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md → doc/licenses/jakarta-jaxb-4.0.2/LICENSE.md
diff --git a/doc/licenses/jakarta-jaxb-2.3.3/README → doc/licenses/jakarta-jaxb-4.0.2/README b/doc/licenses/jakarta-jaxb-2.3.3/README → doc/licenses/jakarta-jaxb-4.0.2/README
@@ -1,8 +1,8 @@
 Jakarta XML Binding (https://eclipse-ee4j.github.io/jaxb-ri/)
 -------------------------------------------------------------
 
-    Version: 2.3.3
-    From: 'Oracle Corporation' (http://www.oracle.com/)
+    Version: 4.0.2
+    From: 'Eclipse Foundation' (https://www.eclipse.org)
     License(s):
-        BSD 3-clause (bundled/jakarta-jaxb-2.3.3/LICENSE.md)
+        BSD 3-clause (bundled/jakarta-jaxb-4.0.2/LICENSE.md)
 
diff --git a/doc/licenses/jakarta-jaxb-4.0.2/dep-coordinates.txt b/doc/licenses/jakarta-jaxb-4.0.2/dep-coordinates.txt
@@ -0,0 +1,3 @@
+jakarta.xml.bind:jakarta.xml.bind-api:jar:4.0.2
+org.glassfish.jaxb:jaxb-runtime:jar:4.0.2
+org.glassfish.jaxb:txw2:jar:4.0.2
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
diff --git a/...enses/jakarta-validation-api-2.0.2/NOTICE → ...enses/jakarta-validation-api-3.0.2/NOTICE b/...enses/jakarta-validation-api-2.0.2/NOTICE → ...enses/jakarta-validation-api-3.0.2/NOTICE
diff --git a/...enses/jakarta-validation-api-2.0.2/README → ...enses/jakarta-validation-api-3.0.2/README b/...enses/jakarta-validation-api-2.0.2/README → ...enses/jakarta-validation-api-3.0.2/README
@@ -1,8 +1,8 @@
 Jakarta Bean Validation API (https://beanvalidation.org/)
 ---------------------------------------------------------
 
-    Version: 2.0.2
-    From: 'Red Hat Inc.' (https://www.redhat.com/)
+    Version: 3.0.2
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
     License(s):
         Apache v2.0
 
diff --git a/doc/licenses/jakarta-validation-api-3.0.2/dep-coordinates.txt b/doc/licenses/jakarta-validation-api-3.0.2/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.validation:jakarta.validation-api:jar:3.0.2
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
diff --git a/...censes/jakarta-ws-rs-api-2.1.6/LICENSE.md → ...censes/jakarta-ws-rs-api-3.1.0/LICENSE.md b/...censes/jakarta-ws-rs-api-2.1.6/LICENSE.md → ...censes/jakarta-ws-rs-api-3.1.0/LICENSE.md
diff --git a/doc/licenses/jakarta-ws-rs-api-2.1.6/README → doc/licenses/jakarta-ws-rs-api-3.1.0/README b/doc/licenses/jakarta-ws-rs-api-2.1.6/README → doc/licenses/jakarta-ws-rs-api-3.1.0/README
@@ -1,8 +1,8 @@
 Jakarta RESTful Web Services (https://github.com/eclipse-ee4j/jaxrs-api/)
 -------------------------------------------------------------------------
 
-    Version: 2.1.6
-    From: 'Oracle Corporation' (http://www.oracle.com/)
+    Version: 3.1.0
+    From: 'Eclipse Foundation' (https://www.eclipse.org)
     License(s):
-        EPL v2.0 (bundled/jakarta-ws-rs-api-2.1.6/LICENSE.md)
+        EPL v2.0 (bundled/jakarta-ws-rs-api-3.1.0/LICENSE.md)
 
diff --git a/doc/licenses/jakarta-ws-rs-api-3.1.0/dep-coordinates.txt b/doc/licenses/jakarta-ws-rs-api-3.1.0/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.ws.rs:jakarta.ws.rs-api:jar:3.1.0
diff --git a/doc/licenses/jakarta.inject-2.0.1/README b/doc/licenses/jakarta.inject-2.0.1/README
@@ -0,0 +1,8 @@
+Jakarta Dependency Injection (https://github.com/jakartaee/inject)
+------------------------------------------------------------------
+
+    Version: 2.0.1
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
+    License(s):
+        Apache v2.0
+
diff --git a/doc/licenses/jakarta.inject-2.0.1/dep-coordinates.txt b/doc/licenses/jakarta.inject-2.0.1/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.inject:jakarta.inject-api:jar:2.0.1
diff --git a/doc/licenses/javax.inject-1/README → doc/licenses/javax-inject-1/README b/doc/licenses/javax.inject-1/README → doc/licenses/javax-inject-1/README
@@ -5,4 +5,3 @@ JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/)
     From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330)
     License(s):
         Apache v2.0
-
diff --git a/...censes/javax.inject-1/dep-coordinates.txt → ...censes/javax-inject-1/dep-coordinates.txt b/...censes/javax.inject-1/dep-coordinates.txt → ...censes/javax-inject-1/dep-coordinates.txt
diff --git a/doc/licenses/jcip-annotations-1.0-1/README b/doc/licenses/jcip-annotations-1.0-1/README
@@ -0,0 +1,7 @@
+JCIP Annotations (https://github.com/stephenc/jcip-annotations)
+---------------------------------------------------------------
+
+    Version: 1.0-1
+    From: 'Stephen Connolly' (https://github.com/stephenc)
+    License(s):
+        Apache v2.0
diff --git a/doc/licenses/jcip-annotations-1.0-1/dep-coordinates.txt b/doc/licenses/jcip-annotations-1.0-1/dep-coordinates.txt
@@ -0,0 +1 @@
+com.github.stephenc.jcip:jcip-annotations:jar:1.0-1
diff --git a/doc/licenses/jersey-2.42/README b/doc/licenses/jersey-2.42/README
diff --git a/doc/licenses/jersey-2.42/dep-coordinates.txt b/doc/licenses/jersey-2.42/dep-coordinates.txt
diff --git a/doc/licenses/jersey-2.42/LICENSE.md → doc/licenses/jersey-3.1.6/LICENSE.md b/doc/licenses/jersey-2.42/LICENSE.md → doc/licenses/jersey-3.1.6/LICENSE.md
diff --git a/doc/licenses/jersey-3.1.6/README b/doc/licenses/jersey-3.1.6/README
@@ -0,0 +1,8 @@
+Jersey (https://eclipse-ee4j.github.io/jersey/)
+-----------------------------------------------
+
+    Version: 3.1.6
+    From: 'Eclipse Foundation' (https://www.eclipse.org/)
+    License(s):
+        EPL v2.0 (bundled/jersey-3.1.6/LICENSE.md)
+
diff --git a/doc/licenses/jersey-3.1.6/dep-coordinates.txt b/doc/licenses/jersey-3.1.6/dep-coordinates.txt
@@ -0,0 +1,7 @@
+org.glassfish.jersey.containers:jersey-container-servlet-core:jar:3.1.6
+org.glassfish.jersey.core:jersey-common:jar:3.1.6
+org.glassfish.jersey.core:jersey-server:jar:3.1.6
+org.glassfish.jersey.core:jersey-client:jar:3.1.6
+org.glassfish.jersey.inject:jersey-hk2:jar:3.1.6
+org.glassfish.jersey.media:jersey-media-json-jackson:jar:3.1.6
+org.glassfish.jersey.ext:jersey-entity-filtering:jar:3.1.6
diff --git a/...ses/logging-interceptor-4.9.1/LICENSE.txt → ...es/logging-interceptor-4.12.0/LICENSE.txt b/...ses/logging-interceptor-4.9.1/LICENSE.txt → ...es/logging-interceptor-4.12.0/LICENSE.txt
diff --git a/...licenses/logging-interceptor-4.9.1/NOTICE → ...icenses/logging-interceptor-4.12.0/NOTICE b/...licenses/logging-interceptor-4.9.1/NOTICE → ...icenses/logging-interceptor-4.12.0/NOTICE
diff --git a/...licenses/logging-interceptor-4.9.1/README → ...icenses/logging-interceptor-4.12.0/README b/...licenses/logging-interceptor-4.9.1/README → ...icenses/logging-interceptor-4.12.0/README
@@ -1,7 +1,7 @@
 okhttp logging-interceptor (https://square.github.io/okhttp/)
 -------------------------------------------------------------
 
-    Version: 4.9.1
+    Version: 4.12.0
     From: 'Square Inc'
     License(s):
         Apache v2.0

diff --git a/doc/licenses/logging-interceptor-4.12.0/dep-coordinates.txt b/doc/licenses/logging-interceptor-4.12.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.squareup.okhttp3:logging-interceptor:jar:4.12.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
diff --git a/doc/licenses/micrometer-metrics-1.12.4/README b/doc/licenses/micrometer-metrics-1.12.4/README
@@ -0,0 +1,7 @@
+Micrometer Metrics (https://github.com/micrometer-metrics/micrometer)
+---------------------------------------------------------------------
+
+    Version: 1.12.4
+    From: 'Micrometer' (https://micrometer.io/)
+    License(s):
+        Apache 2.0
diff --git a/doc/licenses/micrometer-metrics-1.12.4/dep-coordinates.txt b/doc/licenses/micrometer-metrics-1.12.4/dep-coordinates.txt
@@ -0,0 +1,2 @@
+io.micrometer:micrometer-observation:jar:1.12.4
+io.micrometer:micrometer-commons:jar:1.12.4
diff --git a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt b/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
diff --git a/doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE b/doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE
diff --git a/doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README b/doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README
@@ -1,7 +1,7 @@
 MyBatis (http://www.mybatis.org/mybatis-3/)
 -------------------------------------------
 
-    Version: 3.5.15
+    Version: 3.5.16
     From: 'MyBatis' (http://www.mybatis.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/mybatis-3.5.16/dep-coordinates.txt b/doc/licenses/mybatis-3.5.16/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis:jar:3.5.16
diff --git a/doc/licenses/mybatis-guice-3.18/dep-coordinates.txt b/doc/licenses/mybatis-guice-3.18/dep-coordinates.txt
diff --git a/doc/licenses/mybatis-guice-3.18/NOTICE → doc/licenses/mybatis-guice-4.0.0/NOTICE b/doc/licenses/mybatis-guice-3.18/NOTICE → doc/licenses/mybatis-guice-4.0.0/NOTICE
diff --git a/doc/licenses/mybatis-guice-3.18/README → doc/licenses/mybatis-guice-4.0.0/README b/doc/licenses/mybatis-guice-3.18/README → doc/licenses/mybatis-guice-4.0.0/README
@@ -1,7 +1,7 @@
 MyBatis-Guice (http://www.mybatis.org/guice/)
 ---------------------------------------------
 
-    Version: 3.18
+    Version: 4.0.0
     From: 'MyBatis' (http://www.mybatis.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/mybatis-guice-4.0.0/dep-coordinates.txt b/doc/licenses/mybatis-guice-4.0.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis-guice:jar:4.0.0
diff --git a/doc/licenses/nimbus-jose-jwt-9.37.3/README b/doc/licenses/nimbus-jose-jwt-9.37.3/README
@@ -0,0 +1,7 @@
+Nimbus JOSE+JWT (https://bitbucket.org/connect2id/nimbus-jose-jwt)
+------------------------------------------------------------------
+
+    Version: 9.37.3
+    From: 'Connect2Id Ltd' (https://connect2id.com/)
+    License(s):
+        Apache v2.0
diff --git a/doc/licenses/nimbus-jose-jwt-9.37.3/dep-coordinates.txt b/doc/licenses/nimbus-jose-jwt-9.37.3/dep-coordinates.txt
@@ -0,0 +1 @@
+com.nimbusds:nimbus-jose-jwt:jar:9.37.3
diff --git a/doc/licenses/okhttp-3.14.9/dep-coordinates.txt b/doc/licenses/okhttp-3.14.9/dep-coordinates.txt
diff --git a/doc/licenses/okhttp-3.14.9/LICENSE.txt → doc/licenses/okhttp-4.12.0/LICENSE.txt b/doc/licenses/okhttp-3.14.9/LICENSE.txt → doc/licenses/okhttp-4.12.0/LICENSE.txt
diff --git a/doc/licenses/okhttp-3.14.9/NOTICE → doc/licenses/okhttp-4.12.0/NOTICE b/doc/licenses/okhttp-3.14.9/NOTICE → doc/licenses/okhttp-4.12.0/NOTICE
diff --git a/doc/licenses/okhttp-3.14.9/README → doc/licenses/okhttp-4.12.0/README b/doc/licenses/okhttp-3.14.9/README → doc/licenses/okhttp-4.12.0/README
@@ -1,7 +1,7 @@
 okhttp (https://square.github.io/okhttp/)
 ---------------------------------------------
 
-    Version: 3.14.9
+    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
@@ -0,0 +1 @@
+com.squareup.okhttp3:okhttp:jar:4.12.0
diff --git a/doc/licenses/okio-2.8.0/dep-coordinates.txt b/doc/licenses/okio-2.8.0/dep-coordinates.txt
diff --git a/doc/licenses/okio-2.8.0/LICENSE.txt → doc/licenses/okio-3.6.0/LICENSE.txt b/doc/licenses/okio-2.8.0/LICENSE.txt → doc/licenses/okio-3.6.0/LICENSE.txt
diff --git a/doc/licenses/okio-2.8.0/NOTICE → doc/licenses/okio-3.6.0/NOTICE b/doc/licenses/okio-2.8.0/NOTICE → doc/licenses/okio-3.6.0/NOTICE
diff --git a/doc/licenses/okio-2.8.0/README → doc/licenses/okio-3.6.0/README b/doc/licenses/okio-2.8.0/README → doc/licenses/okio-3.6.0/README
@@ -1,7 +1,7 @@
 okio (https://square.github.io/okio/)
 ---------------------------------------------
 
-    Version: 2.8.0
+    Version: 3.6.0
     From: 'Square Inc'
     License(s):
-        Apache 2.0 (bundled/retrofit-2.9.0/LICENSE.txt)
+        Apache 2.0 (bundled/retrofit-3.6.0/LICENSE.txt)
diff --git a/doc/licenses/okio-3.6.0/dep-coordinates.txt b/doc/licenses/okio-3.6.0/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.squareup.okio:okio:jar:3.6.0
+com.squareup.okio:okio-jvm:jar:3.6.0
diff --git a/doc/licenses/spring-web-5.3.25/dep-coordinates.txt b/doc/licenses/spring-web-5.3.25/dep-coordinates.txt
diff --git a/doc/licenses/spring-web-5.3.25/LICENSE → doc/licenses/spring-web-5.3.33/LICENSE b/doc/licenses/spring-web-5.3.25/LICENSE → doc/licenses/spring-web-5.3.33/LICENSE
diff --git a/doc/licenses/spring-web-5.3.25/README → doc/licenses/spring-web-5.3.33/README b/doc/licenses/spring-web-5.3.25/README → doc/licenses/spring-web-5.3.33/README
@@ -1,7 +1,7 @@
 Spring Framework (https://spring.io/projects/spring-framework)
 --------------------------------------------------------------
 
-    Version: 5.3.25
+    Version: 5.3.33
     From: 'Spring' (https://spring.io/)
     License(s):
         Apache v2.0
diff --git a/doc/licenses/spring-web-5.3.33/dep-coordinates.txt b/doc/licenses/spring-web-5.3.33/dep-coordinates.txt
@@ -0,0 +1,4 @@
+org.springframework:spring-web:jar:5.3.33
+org.springframework:spring-beans:jar:5.3.33
+org.springframework:spring-core:jar:5.3.33
+org.springframework:spring-jcl:jar:5.3.33