Merge branch 'main' into uiChange

README.md

@@ -167,7 +167,7 @@ Stirling PDF currently supports 28!
 | English (US) (en_US)                        | ![100%](https://geps.dev/progress/100) |
 | Arabic (العربية) (ar_AR)                    | ![41%](https://geps.dev/progress/41)   |
 | German (Deutsch) (de_DE)                    | ![100%](https://geps.dev/progress/100)   |
-| French (Français) (fr_FR)                   | ![95%](https://geps.dev/progress/95)   |
+| French (Français) (fr_FR)                   | ![94%](https://geps.dev/progress/94)   |
 | Spanish (Español) (es_ES)                   | ![96%](https://geps.dev/progress/96)   |
 | Simplified Chinese (简体中文) (zh_CN)       | ![96%](https://geps.dev/progress/96)   |
 | Traditional Chinese (繁體中文) (zh_TW)      | ![95%](https://geps.dev/progress/95)   |
@@ -183,7 +183,7 @@ Stirling PDF currently supports 28!
 | Japanese (日本語) (ja_JP)                   | ![88%](https://geps.dev/progress/88)   |
 | Dutch (Nederlands) (nl_NL)                  | ![86%](https://geps.dev/progress/86)   |
 | Greek (Ελληνικά) (el_GR)                    | ![86%](https://geps.dev/progress/86)   |
-| Turkish (Türkçe) (tr_TR)                    | ![99%](https://geps.dev/progress/99)   |
+| Turkish (Türkçe) (tr_TR)                    | ![98%](https://geps.dev/progress/98)   |
 | Indonesia (Bahasa Indonesia) (id_ID)        | ![79%](https://geps.dev/progress/79)   |
 | Hindi (हिंदी) (hi_IN)                          | ![80%](https://geps.dev/progress/80)   |
 | Hungarian (Magyar) (hu_HU)                  | ![79%](https://geps.dev/progress/79)   |

cucumber/requirements.txt

@@ -2,3 +2,4 @@ behave
 requests
 PyPDF2
 reportlab
+PyCryptodome

src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java

@@ -129,6 +129,8 @@ public class AccountWebController {
                 case "invalid_request":
                     erroroauth = "login.oauth2invalidRequest";
                     break;
+                case "invalid_id_token":
+                    erroroauth = "login.oauth2InvalidIdToken";
                 default:
                     break;
             }

src/main/resources/messages_ar_AR.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_bg_BG.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_ca_CA.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_cs_CZ.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_de_DE.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Ungültige Benutzerinformationsantwort
 login.oauth2invalidRequest=ungültige Anfrage
 login.oauth2AccessDenied=Zugriff abgelehnt
 login.oauth2InvalidTokenResponse=Ungültige Token-Antwort
+login.oauth2InvalidIdToken=Ungültiges ID-Token
 
 
 #auto-redact

src/main/resources/messages_el_GR.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_en_GB.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_en_US.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_es_ES.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_eu_ES.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_fr_FR.properties

@@ -357,7 +357,7 @@ home.adjust-contrast.desc=Ajustez le contraste, la saturation et la luminosité
 adjust-contrast.tags=ajuster,couleurs,amélioration,color-correction,tune,modify,enhance
 
 home.crop.title=Redimensionner
-home.crop.desc=Redimmensionnez un PDF pour réduire sa taille (en conservant le texte !).
+home.crop.desc=Redimensionnez un PDF pour réduire sa taille (en conservant le texte !).
 crop.tags=redimensionner,trim,shrink,edit,shape
 
 home.autoSplitPDF.title=Séparer automatiquement les pages
@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_hi_IN.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_hu_HU.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_id_ID.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_it_IT.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Risposta relativa alle informazioni utente n
 login.oauth2invalidRequest=Richiesta non valida
 login.oauth2AccessDenied=Accesso negato
 login.oauth2InvalidTokenResponse=Risposta token non valida
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_ja_JP.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_ko_KR.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_nl_NL.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_pl_PL.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_pt_BR.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_pt_PT.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_ro_RO.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_ru_RU.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_sk_SK.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_sr_LATN_RS.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_sv_SE.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_tr_TR.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_uk_UA.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_zh_CN.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/messages_zh_TW.properties

@@ -457,6 +457,7 @@ login.oauth2InvalidUserInfoResponse=Invalid User Info Response
 login.oauth2invalidRequest=Invalid Request
 login.oauth2AccessDenied=Access Denied
 login.oauth2InvalidTokenResponse=Invalid Token Response
+login.oauth2InvalidIdToken=Invalid Id Token
 
 
 #auto-redact

src/main/resources/static/3rdPartyLicenses.json

@@ -343,6 +343,13 @@
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.servlet:jakarta.servlet-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "6.0.0",
+            "moduleLicense": "GPL2 w/ CPE",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.transaction:jakarta.transaction-api",
             "moduleUrl": "https://projects.eclipse.org/projects/ee4j.jta",
@@ -357,6 +364,20 @@
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "jakarta.websocket:jakarta.websocket-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "2.1.1",
+            "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
+        {
+            "moduleName": "jakarta.websocket:jakarta.websocket-client-api",
+            "moduleUrl": "https://www.eclipse.org",
+            "moduleVersion": "2.1.1",
+            "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
+            "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
+        },
         {
             "moduleName": "jakarta.xml.bind:jakarta.xml.bind-api",
             "moduleUrl": "https://www.eclipse.org",
@@ -452,13 +473,6 @@
             "moduleLicense": "Apache-2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0.txt"
         },
-        {
-            "moduleName": "org.apache.tomcat.embed:tomcat-embed-core",
-            "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.19",
-            "moduleLicense": "Eclipse Public License - v 2.0",
-            "moduleLicenseUrl": "https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt"
-        },
         {
             "moduleName": "org.apache.tomcat.embed:tomcat-embed-el",
             "moduleUrl": "https://tomcat.apache.org/",
@@ -466,13 +480,6 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
-        {
-            "moduleName": "org.apache.tomcat.embed:tomcat-embed-websocket",
-            "moduleUrl": "https://tomcat.apache.org/",
-            "moduleVersion": "10.1.19",
-            "moduleLicense": "Apache License, Version 2.0",
-            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
-        },
         {
             "moduleName": "org.apache.xmlgraphics:batik-all",
             "moduleVersion": "1.17",
@@ -540,6 +547,188 @@
             "moduleLicense": "GNU General Public License, version 2 with the GNU Classpath Exception",
             "moduleLicenseUrl": "https://www.gnu.org/software/classpath/license.html"
         },
+        {
+            "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jetty-server",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-annotations",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-plus",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlet",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-servlets",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.ee10:jetty-ee10-webapp",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-client",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-common",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-core-server",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-api",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty.websocket:jetty-websocket-jetty-common",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-alpn-client",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-client",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-http",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-io",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-jndi",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-plus",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-security",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-server",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-session",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-util",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
+        {
+            "moduleName": "org.eclipse.jetty:jetty-xml",
+            "moduleUrl": "https://eclipse.dev/jetty/",
+            "moduleVersion": "12.0.7",
+            "moduleLicense": "Eclipse Public License - Version 2.0",
+            "moduleLicenseUrl": "https://www.eclipse.org/legal/epl-2.0/"
+        },
         {
             "moduleName": "org.glassfish.jaxb:jaxb-core",
             "moduleUrl": "https://www.eclipse.org",
@@ -599,7 +788,21 @@
         {
             "moduleName": "org.ow2.asm:asm",
             "moduleUrl": "http://asm.ow2.org",
-            "moduleVersion": "9.3",
+            "moduleVersion": "9.6",
+            "moduleLicense": "The Apache Software License, Version 2.0",
+            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+            "moduleName": "org.ow2.asm:asm-commons",
+            "moduleUrl": "http://asm.ow2.org",
+            "moduleVersion": "9.6",
+            "moduleLicense": "The Apache Software License, Version 2.0",
+            "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+        },
+        {
+            "moduleName": "org.ow2.asm:asm-tree",
+            "moduleUrl": "http://asm.ow2.org",
+            "moduleVersion": "9.6",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -705,6 +908,13 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
+        {
+            "moduleName": "org.springframework.boot:spring-boot-starter-jetty",
+            "moduleUrl": "https://spring.io/projects/spring-boot",
+            "moduleVersion": "3.2.4",
+            "moduleLicense": "Apache License, Version 2.0",
+            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
+        },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-json",
             "moduleUrl": "https://spring.io/projects/spring-boot",
@@ -740,13 +950,6 @@
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
-        {
-            "moduleName": "org.springframework.boot:spring-boot-starter-tomcat",
-            "moduleUrl": "https://spring.io/projects/spring-boot",
-            "moduleVersion": "3.2.4",
-            "moduleLicense": "Apache License, Version 2.0",
-            "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
-        },
         {
             "moduleName": "org.springframework.boot:spring-boot-starter-web",
             "moduleUrl": "https://spring.io/projects/spring-boot",

src/main/resources/templates/misc/flatten.html

@@ -25,7 +25,6 @@
                   <input type="checkbox" id="flattenOnlyForms" name="flattenOnlyForms">
                   <label for="flattenOnlyForms" th:text="#{flatten.flattenOnlyForms}" ></label>
                 </div>         
-                </div>
                 <br>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{flatten.submit}"></button>
               </form>