diff --git a/README.md b/README.md index 4b6afec3..159a6e8e 100644 --- a/README.md +++ b/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) | diff --git a/cucumber/requirements.txt b/cucumber/requirements.txt index 52f20fd2..e5da3c1b 100644 --- a/cucumber/requirements.txt +++ b/cucumber/requirements.txt @@ -1,4 +1,5 @@ behave requests PyPDF2 -reportlab \ No newline at end of file +reportlab +PyCryptodome diff --git a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java b/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java index b0490fb5..904a8ba0 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java +++ b/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; } diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties index 18b8e74c..85cdc661 100644 --- a/src/main/resources/messages_ar_AR.properties +++ b/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 diff --git a/src/main/resources/messages_bg_BG.properties b/src/main/resources/messages_bg_BG.properties index 7f164568..012f2136 100644 --- a/src/main/resources/messages_bg_BG.properties +++ b/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 diff --git a/src/main/resources/messages_ca_CA.properties b/src/main/resources/messages_ca_CA.properties index 814e8bbf..c09e158d 100644 --- a/src/main/resources/messages_ca_CA.properties +++ b/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 diff --git a/src/main/resources/messages_cs_CZ.properties b/src/main/resources/messages_cs_CZ.properties index 3e25e4a7..ef8858d8 100644 --- a/src/main/resources/messages_cs_CZ.properties +++ b/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 diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties index 6a5cc4ce..457ed462 100644 --- a/src/main/resources/messages_de_DE.properties +++ b/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 diff --git a/src/main/resources/messages_el_GR.properties b/src/main/resources/messages_el_GR.properties index 335a1339..6677f478 100644 --- a/src/main/resources/messages_el_GR.properties +++ b/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 diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties index cf4b6cf3..760cf23e 100644 --- a/src/main/resources/messages_en_GB.properties +++ b/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 diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties index 5a2258b4..041296e1 100644 --- a/src/main/resources/messages_en_US.properties +++ b/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 diff --git a/src/main/resources/messages_es_ES.properties b/src/main/resources/messages_es_ES.properties index 4f186c40..c7682dca 100644 --- a/src/main/resources/messages_es_ES.properties +++ b/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 diff --git a/src/main/resources/messages_eu_ES.properties b/src/main/resources/messages_eu_ES.properties index 4784293c..d3ad41d5 100644 --- a/src/main/resources/messages_eu_ES.properties +++ b/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 diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties index ec640cd8..eb3780c1 100644 --- a/src/main/resources/messages_fr_FR.properties +++ b/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 diff --git a/src/main/resources/messages_hi_IN.properties b/src/main/resources/messages_hi_IN.properties index 9cb61c44..183148f4 100644 --- a/src/main/resources/messages_hi_IN.properties +++ b/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 diff --git a/src/main/resources/messages_hu_HU.properties b/src/main/resources/messages_hu_HU.properties index 49366bed..7604de8e 100644 --- a/src/main/resources/messages_hu_HU.properties +++ b/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 diff --git a/src/main/resources/messages_id_ID.properties b/src/main/resources/messages_id_ID.properties index f1678612..45006806 100644 --- a/src/main/resources/messages_id_ID.properties +++ b/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 diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index bd1fd5d3..2fc60fd1 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/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 diff --git a/src/main/resources/messages_ja_JP.properties b/src/main/resources/messages_ja_JP.properties index 30bdb928..527736b8 100644 --- a/src/main/resources/messages_ja_JP.properties +++ b/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 diff --git a/src/main/resources/messages_ko_KR.properties b/src/main/resources/messages_ko_KR.properties index 8af64f62..8bfed7ee 100644 --- a/src/main/resources/messages_ko_KR.properties +++ b/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 diff --git a/src/main/resources/messages_nl_NL.properties b/src/main/resources/messages_nl_NL.properties index bdc0f8a7..0a1f75a6 100644 --- a/src/main/resources/messages_nl_NL.properties +++ b/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 diff --git a/src/main/resources/messages_pl_PL.properties b/src/main/resources/messages_pl_PL.properties index 5f61a111..6a7fdd9d 100644 --- a/src/main/resources/messages_pl_PL.properties +++ b/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 diff --git a/src/main/resources/messages_pt_BR.properties b/src/main/resources/messages_pt_BR.properties index b1fe46ca..853ac33f 100644 --- a/src/main/resources/messages_pt_BR.properties +++ b/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 diff --git a/src/main/resources/messages_pt_PT.properties b/src/main/resources/messages_pt_PT.properties index 439e8d36..1ee8657d 100644 --- a/src/main/resources/messages_pt_PT.properties +++ b/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 diff --git a/src/main/resources/messages_ro_RO.properties b/src/main/resources/messages_ro_RO.properties index 439c75fb..4032943e 100644 --- a/src/main/resources/messages_ro_RO.properties +++ b/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 diff --git a/src/main/resources/messages_ru_RU.properties b/src/main/resources/messages_ru_RU.properties index 27b9fd8a..b87c23b3 100644 --- a/src/main/resources/messages_ru_RU.properties +++ b/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 diff --git a/src/main/resources/messages_sk_SK.properties b/src/main/resources/messages_sk_SK.properties index 9d5f5ed9..f488f459 100644 --- a/src/main/resources/messages_sk_SK.properties +++ b/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 diff --git a/src/main/resources/messages_sr_LATN_RS.properties b/src/main/resources/messages_sr_LATN_RS.properties index 8adf67bf..f6e4543d 100644 --- a/src/main/resources/messages_sr_LATN_RS.properties +++ b/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 diff --git a/src/main/resources/messages_sv_SE.properties b/src/main/resources/messages_sv_SE.properties index 621bdbe1..127d3718 100644 --- a/src/main/resources/messages_sv_SE.properties +++ b/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 diff --git a/src/main/resources/messages_tr_TR.properties b/src/main/resources/messages_tr_TR.properties index 560501b2..f277a083 100644 --- a/src/main/resources/messages_tr_TR.properties +++ b/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 diff --git a/src/main/resources/messages_uk_UA.properties b/src/main/resources/messages_uk_UA.properties index bef38428..75336bc5 100644 --- a/src/main/resources/messages_uk_UA.properties +++ b/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 diff --git a/src/main/resources/messages_zh_CN.properties b/src/main/resources/messages_zh_CN.properties index 2d7cd4b5..cda654d6 100644 --- a/src/main/resources/messages_zh_CN.properties +++ b/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 diff --git a/src/main/resources/messages_zh_TW.properties b/src/main/resources/messages_zh_TW.properties index 2afd7e61..120bff9d 100644 --- a/src/main/resources/messages_zh_TW.properties +++ b/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 diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index 97025001..472d6528 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/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", diff --git a/src/main/resources/templates/misc/flatten.html b/src/main/resources/templates/misc/flatten.html index a5ca814e..bf6c7382 100644 --- a/src/main/resources/templates/misc/flatten.html +++ b/src/main/resources/templates/misc/flatten.html @@ -25,7 +25,6 @@ -