From ba28a0649d60b7f13cccd7e6df2dd67570542d34 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 5 Oct 2024 15:16:58 +0200
Subject: [PATCH] update dependency org.webjars:datatables to 2.1.0
---
BudgetMasterServer/pom.xml | 2 +-
.../src/main/resources/languages/base_de.properties | 2 +-
.../src/main/resources/languages/base_en.properties | 2 +-
.../resources/templates/transactions/transactionImport.ftl | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index 3728323f0..948a2d428 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -40,7 +40,7 @@
<vanilla-picker.version>2.12.3</vanilla-picker.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<opencsv.version>5.9</opencsv.version>
- <datatables.version>1.13.5</datatables.version>
+ <datatables.version>2.1.0</datatables.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
<junit-jupiter-engine.version>5.11.2</junit-jupiter-engine.version>
diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index d36cf6914..6137e7ab0 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_de.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -1,7 +1,7 @@
locale=de
# DEFAULT
-credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>spring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 1.13.5<br>
+credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>spring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/1
github.url=https://github.com/deadlocker8/BudgetMaster
diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
index bcadd2be5..8743c9362 100644
--- a/BudgetMasterServer/src/main/resources/languages/base_en.properties
+++ b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -1,7 +1,7 @@
locale=en
# DEFAULT
-credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>pring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 1.13.5<br>
+credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.3.4<br>spring-boot-devtools 3.3.4<br>spring-boot-starter-web 3.3.4<br>spring-boot-starter-test 3.3.4<br>spring-boot-starter-security 3.3.4<br>pring-boot-starter-freemarker 3.3.4<br>spring-boot-starter-validation 3.3.4<br>spring-boot-starter-data-jpa 3.3.4<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.2<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.5.2<br>Google Material Icons<br>Vanilla-picker 2.12.3<br>SortableJS 1.15.3<br>jlibs 3.2.0<br>itextpdf 5.5.13.4<br>mousetrap 1.6.5<br>plotly 2.35.2<br>momentjs 2.30.1<br>codemirror 5.62.2<br>webjars-locator 0.52<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 7.0.0.202409031743-r<br>opencsv 5.9<br>datatables 2.1.0<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/2
github.url=https://github.com/deadlocker8/BudgetMaster
diff --git a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
index 21f8a5099..c8f4ea6a7 100644
--- a/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/transactions/transactionImport.ftl
@@ -8,7 +8,7 @@
<@header.style "transactionImport"/>
<@header.style "collapsible"/>
<#import "/spring.ftl" as s>
- <link rel="stylesheet" href="<@s.url '/webjars/datatables/1.13.5/css/jquery.dataTables.min.css'/>"/>
+ <link rel="stylesheet" href="<@s.url '/webjars/datatables/2.1.0/css/dataTables.dataTables.min.css'/>"/>
</head>
<@header.body>
<#import "../helpers/navbar.ftl" as navbar>
@@ -73,7 +73,7 @@
<!-- Scripts-->
<#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
- <script src="<@s.url '/webjars/datatables/1.13.5/js/jquery.dataTables.min.js'/>"></script>
+ <script src="<@s.url '/webjars/datatables/2.1.0/js/dataTables.min.js'/>"></script>
<script src="<@s.url '/js/transactionImport.js'/>"></script>
</@header.body>
</html>
--
GitLab