From 82a93fb46885074969bc8b1dd793f96574b15a2d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 25 Jul 2021 17:07:45 +0200
Subject: [PATCH] #599 - updated dependencies
---
pom.xml | 24 +++++--------------
.../resources/languages/base_de.properties | 2 +-
.../resources/languages/base_en.properties | 2 +-
.../resources/templates/charts/newChart.ftl | 6 ++---
.../resources/templates/helpers/header.ftl | 2 +-
5 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2cd2cbef0..a364acb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,17 +58,17 @@
<jlibs.version>3.2.0</jlibs.version>
<versionizer.version>3.0.1</versionizer.version>
- <webjars-locator.version>0.40</webjars-locator.version>
+ <webjars-locator.version>0.41</webjars-locator.version>
<jquery.version>3.6.0</jquery.version>
<materializecss.version>1.0.0</materializecss.version>
- <fontawesome.version>5.15.2</fontawesome.version>
+ <fontawesome.version>5.15.3</fontawesome.version>
<sortablejs.version>1.13.0</sortablejs.version>
<mousetrap.version>1.6.5</mousetrap.version>
- <codemirror.version>5.50.0</codemirror.version>
+ <codemirror.version>5.62.0</codemirror.version>
<selenium.version>3.141.59</selenium.version>
- <assertj-core.version>3.19.0</assertj-core.version>
- <jgit.version>5.11.0.202103091610-r</jgit.version>
- <natorder.version>1.0.1</natorder.version>
+ <assertj-core.version>3.20.2</assertj-core.version>
+ <jgit.version>5.12.0.202106070339-r</jgit.version>
+ <natorder.version>1.0.2</natorder.version>
<h2database.version>1.4.199</h2database.version>
<itextpdf.version>5.5.13.2</itextpdf.version>
<usertype-core.version>6.0.1.GA</usertype-core.version>
@@ -247,18 +247,6 @@
<version>${assertj-core.version}</version>
<scope>test</scope>
</dependency>
-
-<!-- <dependency>-->
-<!-- <groupId>org.junit.vintage</groupId>-->
-<!-- <artifactId>junit-vintage-engine</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>org.hamcrest</groupId>-->
-<!-- <artifactId>hamcrest-core</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
-<!-- </dependency>-->
</dependencies>
<build>
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index 8db1695df..bac90eaa6 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.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.50.0<br>webjars-locator 0.40<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.1<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.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>
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 39fe482b3..81a22d9f6 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.50.0<br>webjars-locator 0.40<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.0.1<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.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>
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 e80874102..cb9a563cc 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.50.0/lib/codemirror.css"/>">
+ <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.62.0/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.50.0/lib/codemirror.js'/>"></script>
- <script src="<@s.url '/webjars/codemirror/5.50.0/mode/javascript/javascript.js'/>"></script>
+ <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 '/js/charts.js'/>"></script>
</@header.body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index 927776432..e70186b27 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -21,7 +21,7 @@
<#import "/spring.ftl" as s>
<title>${title}</title>
<meta charset="UTF-8"/>
- <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.15.2/css/all.min.css'/>">
+ <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.15.3/css/all.min.css'/>">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="<@s.url "/webjars/materializecss/1.0.0/css/materialize.min.css"/>">
<@style "colors"/>
--
GitLab