From fffe956d3fabe3875bb861555828622731e0393a Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 24 Oct 2021 21:48:18 +0200
Subject: [PATCH] #631 - updated webjar dependencies
---
pom.xml | 6 +++---
src/main/resources/languages/base_de.properties | 2 +-
src/main/resources/languages/base_en.properties | 2 +-
src/main/resources/templates/charts/newChart.ftl | 6 +++---
src/main/resources/templates/reports/reports.ftl | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index eff4ad1f5..5435fee98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,13 +58,13 @@
<jlibs.version>3.2.0</jlibs.version>
<versionizer.version>3.0.1</versionizer.version>
- <webjars-locator.version>0.41</webjars-locator.version>
+ <webjars-locator.version>0.42</webjars-locator.version>
<jquery.version>3.6.0</jquery.version>
<materializecss.version>1.0.0</materializecss.version>
<fontawesome.version>5.15.3</fontawesome.version>
- <sortablejs.version>1.13.0</sortablejs.version>
+ <sortablejs.version>1.14.0</sortablejs.version>
<mousetrap.version>1.6.5</mousetrap.version>
- <codemirror.version>5.62.0</codemirror.version>
+ <codemirror.version>5.62.2</codemirror.version>
<selenium.version>3.141.59</selenium.version>
<assertj-core.version>3.20.2</assertj-core.version>
<jgit.version>5.12.0.202106070339-r</jgit.version>
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index 7635b6699..76b9958b5 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/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 2.4.5<br>spring-boot-devtools 2.4.5<br>spring-boot-starter-web 2.4.5<br>spring-boot-starter-test 2.4.5<br>spring-boot-starter-data-jpa 2.4.5<br>spring-boot-starter-security 2.4.5<br>spring-boot-starter-tomcat 2.4.5<br>spring-boot-starter-freemarker 2.4.5<br>spring-boot-starter-validation 2.4.5<br>h2 1.4.199<br>joda-time 2.10.10<br>usertype.core 6.0.1.GA<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.0<br>materialize 1.0.0<br>fontawesome 5.15.3<br>Google Material Icons<br>Spectrum Colorpicker 1.8.0<br>SortableJS 1.13.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.2<br>mousetrap 1.6.5<br>plotly 1.58.4<br>momentjs 2.29.1<br>codemirror 5.62.0<br>webjars-locator 0.41<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.2<br>jgit 5.12.0.202106070339-r<br>
+credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 2.4.5<br>spring-boot-devtools 2.4.5<br>spring-boot-starter-web 2.4.5<br>spring-boot-starter-test 2.4.5<br>spring-boot-starter-data-jpa 2.4.5<br>spring-boot-starter-security 2.4.5<br>spring-boot-starter-tomcat 2.4.5<br>spring-boot-starter-freemarker 2.4.5<br>spring-boot-starter-validation 2.4.5<br>h2 1.4.199<br>joda-time 2.10.10<br>usertype.core 6.0.1.GA<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.0<br>materialize 1.0.0<br>fontawesome 5.15.3<br>Google Material Icons<br>Spectrum Colorpicker 1.8.0<br>SortableJS 1.14.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.2<br>mousetrap 1.6.5<br>plotly 1.58.4<br>momentjs 2.29.1<br>codemirror 5.62.2<br>webjars-locator 0.41<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.2<br>jgit 5.12.0.202106070339-r<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/1
github.url=https://github.com/deadlocker8/BudgetMaster
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index e467f8dba..09b19c1ce 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/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 2.4.5<br>spring-boot-devtools 2.4.5<br>spring-boot-starter-web 2.4.5<br>spring-boot-starter-test 2.4.5<br>spring-boot-starter-data-jpa 2.4.5<br>spring-boot-starter-security 2.4.5<br>spring-boot-starter-tomcat 2.4.5<br>spring-boot-starter-freemarker 2.4.5<br>spring-boot-starter-validation 2.4.5<br>h2 1.4.199<br>joda-time 2.10.10<br>usertype.core 6.0.1.GA<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.0<br>materialize 1.0.0<br>fontawesome 5.15.2<br>Google Material Icons<br>Spectrum Colorpicker 1.8.0<br>SortableJS 1.13.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.2<br>mousetrap 1.6.5<br>plotly 1.58.4<br>momentjs 2.29.1<br>codemirror 5.62.0<br>webjars-locator 0.41<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.2<br>jgit 5.12.0.202106070339-r<br>
+credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 2.4.5<br>spring-boot-devtools 2.4.5<br>spring-boot-starter-web 2.4.5<br>spring-boot-starter-test 2.4.5<br>spring-boot-starter-data-jpa 2.4.5<br>spring-boot-starter-security 2.4.5<br>spring-boot-starter-tomcat 2.4.5<br>spring-boot-starter-freemarker 2.4.5<br>spring-boot-starter-validation 2.4.5<br>h2 1.4.199<br>joda-time 2.10.10<br>usertype.core 6.0.1.GA<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.0<br>materialize 1.0.0<br>fontawesome 5.15.2<br>Google Material Icons<br>Spectrum Colorpicker 1.8.0<br>SortableJS 1.14.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.2<br>mousetrap 1.6.5<br>plotly 1.58.4<br>momentjs 2.29.1<br>codemirror 5.62.2<br>webjars-locator 0.41<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.2<br>jgit 5.12.0.202106070339-r<br>
folder=Deadlocker/BudgetMaster
roadmap.url=https://roadmaps.thecodelabs.de/roadmap/2
github.url=https://github.com/deadlocker8/BudgetMaster
diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl
index ca039397e..614f86152 100644
--- a/src/main/resources/templates/charts/newChart.ftl
+++ b/src/main/resources/templates/charts/newChart.ftl
@@ -11,7 +11,7 @@
<@header.header "BudgetMaster - ${title}"/>
<#import "/spring.ftl" as s>
- <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.62.0/lib/codemirror.css"/>">
+ <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.62.2/lib/codemirror.css"/>">
<@header.style "charts"/>
</head>
<@header.body>
@@ -102,8 +102,8 @@
<!-- Scripts-->
<#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
- <script src="<@s.url '/webjars/codemirror/5.62.0/lib/codemirror.js'/>"></script>
- <script src="<@s.url '/webjars/codemirror/5.62.0/mode/javascript/javascript.js'/>"></script>
+ <script src="<@s.url '/webjars/codemirror/5.62.2/lib/codemirror.js'/>"></script>
+ <script src="<@s.url '/webjars/codemirror/5.62.2/mode/javascript/javascript.js'/>"></script>
<script src="<@s.url '/js/charts.js'/>"></script>
</@header.body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index b5fd9e248..90a77634c 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -109,7 +109,7 @@
<!-- Scripts-->
<#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
- <script src="<@s.url '/webjars/sortablejs/1.13.0/Sortable.min.js'/>"></script>
+ <script src="<@s.url '/webjars/sortablejs/1.14.0/Sortable.min.js'/>"></script>
<script src="<@s.url '/js/reports.js'/>"></script>
<script src="<@s.url '/js/globalDatePicker.js'/>"></script>
<script src="<@s.url '/js/filter.js'/>"></script>
--
GitLab