Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-04-08 01:16:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump com.h2database:h2 from 2.1.214 to 2.3.232 (#2314)

Browse Source
This commit is contained in:
Ludy 2024-11-24 15:36:53 +01:00 committed by GitHub
parent 8445f2719b
commit 8f4709d82e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle
View File

@ -145,9 +145,8 @@ dependencies {
implementation 'org.springframework.security:spring-security-saml2-service-provider:6.4.1' implementation 'org.springframework.security:spring-security-saml2-service-provider:6.4.1'
implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5' implementation 'com.unboundid.product.scim2:scim2-sdk-client:2.3.5'
//2.2.x requires rebuild of DB file.. need migration path // Don't upgrade h2database
runtimeOnly "com.h2database:h2:2.1.214" runtimeOnly "com.h2database:h2:2.3.232"
// runtimeOnly "com.h2database:h2:2.3.232"
constraints { constraints {
implementation "org.opensaml:opensaml-core" implementation "org.opensaml:opensaml-core"
implementation "org.opensaml:opensaml-saml-api" implementation "org.opensaml:opensaml-saml-api"

3
src/main/java/stirling/software/SPDF/config/security/SecurityConfiguration.java
View File

@ -245,7 +245,8 @@ public class SecurityConfiguration {
} }
// Handle SAML // Handle SAML
if (applicationProperties.getSecurity().isSaml2Activ()) { if (applicationProperties.getSecurity().isSaml2Activ()
&& applicationProperties.getSystem().getEnableAlphaFunctionality()) {
http.authenticationProvider(samlAuthenticationProvider()); http.authenticationProvider(samlAuthenticationProvider());
http.saml2Login( http.saml2Login(
saml2 -> saml2 ->

4
src/main/java/stirling/software/SPDF/controller/web/DatabaseWebController.java
View File

@ -34,7 +34,9 @@ public class DatabaseWebController {
} }
List<FileInfo> backupList = databaseBackupHelper.getBackupList(); List<FileInfo> backupList = databaseBackupHelper.getBackupList();
model.addAttribute("systemUpdate", backupList); model.addAttribute("backupFiles", backupList);
model.addAttribute("databaseVersion", databaseBackupHelper.getH2Version());
return "database"; return "database";
} }

2
src/main/resources/application.properties
View File

@ -35,7 +35,7 @@ spring.mvc.async.request-timeout=${SYSTEM_CONNECTIONTIMEOUTMILLISECONDS:1200000}
#spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/ #spring.thymeleaf.prefix=file:/customFiles/templates/,classpath:/templates/
#spring.thymeleaf.cache=false #spring.thymeleaf.cache=false
spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE spring.datasource.url=jdbc:h2:file:./configs/stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
spring.datasource.driver-class-name=org.h2.Driver spring.datasource.driver-class-name=org.h2.Driver
spring.datasource.username=sa spring.datasource.username=sa
spring.datasource.password= spring.datasource.password=

7
src/main/resources/templates/database.html
View File

@ -14,7 +14,7 @@
<div class="col-md-9 bg-card"> <div class="col-md-9 bg-card">
<div class="tool-header"> <div class="tool-header">
<span class="material-symbols-rounded tool-header-icon organize">database</span> <span class="material-symbols-rounded tool-header-icon organize">database</span>
<span class="tool-header-text" text="#{database.title}">Database Im-/Export</span> <span class="tool-header-text" th:text="#{database.title}">Database Im-/Export</span>
</div> </div>
<p th:if="${error}" th:text="#{'database.' + ${error}}" class="alert alert-danger text-center"></p> <p th:if="${error}" th:text="#{'database.' + ${error}}" class="alert alert-danger text-center"></p>
<p th:if="${infoMessage}" th:text="#{'database.' + ${infoMessage}}" class="alert alert-success text-center"></p> <p th:if="${infoMessage}" th:text="#{'database.' + ${infoMessage}}" class="alert alert-success text-center"></p>
@ -31,7 +31,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="backup : ${systemUpdate}"> <tr th:each="backup : ${backupFiles}">
<td th:text="${backup.fileName}"></td> <td th:text="${backup.fileName}"></td>
<td th:text="${backup.formattedCreationDate}"></td> <td th:text="${backup.formattedCreationDate}"></td>
<td th:text="${backup.formattedFileSize}"></td> <td th:text="${backup.formattedFileSize}"></td>
@ -41,10 +41,11 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
<h6 class="text-end"><span class="badge bg-dark" th:text="${databaseVersion}">DB-Version</span></h6>
</div> </div>
<hr> <hr>
<form th:action="@{'/api/v1/database/import-database'}" method="post" enctype="multipart/form-data" class="bg-card mt-3 mb-3"> <form th:action="@{'/api/v1/database/import-database'}" method="post" enctype="multipart/form-data" class="bg-card mt-3 mb-3">
<div style="background: var(--md-sys-color-error-container);padding: .8rem;border-radius: 2rem;" class="mb-3"> <div style="background: var(--md-sys-color-error-container);border-radius: 2rem;" class="mb-3 p-3">
<p th:text="#{database.info_1}"></p> <p th:text="#{database.info_1}"></p>
<p th:text="#{database.info_2}"></p> <p th:text="#{database.info_2}"></p>
</div> </div>