From ec5dd9cde43439351372ffeb0e22239c5c5e2609 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 21 Jan 2023 17:15:53 +0100
Subject: [PATCH] #726 - updated dependencies
---
BudgetMasterServer/pom.xml | 9 ++++-----
.../src/main/resources/languages/base_de.properties | 2 +-
.../src/main/resources/languages/base_en.properties | 2 +-
.../src/main/resources/templates/helpers/header.ftl | 2 +-
.../src/main/resources/templates/helpers/scripts.ftl | 2 +-
.../templates/settings/containers/settingsContainer.ftl | 2 +-
pom.xml | 4 ++--
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml
index 3235b531d..0c5f96249 100644
--- a/BudgetMasterServer/pom.xml
+++ b/BudgetMasterServer/pom.xml
@@ -27,20 +27,19 @@
<jlibs.version>3.2.0</jlibs.version>
<versionizer.version>3.0.1</versionizer.version>
<webjars-locator.version>0.46</webjars-locator.version>
- <jquery.version>3.6.1</jquery.version>
+ <jquery.version>3.6.3</jquery.version>
<materializecss.version>1.0.0</materializecss.version>
- <fontawesome.version>6.2.0</fontawesome.version>
+ <fontawesome.version>6.2.1</fontawesome.version>
<sortablejs.version>1.15.0</sortablejs.version>
<mousetrap.version>1.6.5</mousetrap.version>
<codemirror.version>5.62.2</codemirror.version>
- <selenium.version>4.7.1</selenium.version>
- <assertj-core.version>3.23.1</assertj-core.version>
+ <selenium.version>4.7.2</selenium.version>
<jgit.version>6.4.0.202211300538-r</jgit.version>
<natorder.version>1.1.3</natorder.version>
<itextpdf.version>5.5.13.3</itextpdf.version>
<vanilla-picker.version>2.12.1</vanilla-picker.version>
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
- <opencsv.version>5.3</opencsv.version>
+ <opencsv.version>5.7.1</opencsv.version>
<datatables.version>1.13.1</datatables.version>
<project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory>
diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
index 034522844..492e73809 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 2.7.8<br>spring-boot-devtools 2.7.8<br>spring-boot-starter-web 2.7.8<br>spring-boot-starter-test 2.7.8<br>spring-boot-starter-security 2.7.8<br>spring-boot-starter-tomcat 2.7.8<br>spring-boot-starter-freemarker 2.7.8<br>spring-boot-starter-validation 2.7.8<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.1<br>materialize 1.0.0<br>fontawesome 6.2.0<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.17.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.4.0.202211300538-r<br>opencsv 5.3<br>datatables 1.13.1<br>
+credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 2.7.8<br>spring-boot-devtools 2.7.8<br>spring-boot-starter-web 2.7.8<br>spring-boot-starter-test 2.7.8<br>spring-boot-starter-security 2.7.8<br>spring-boot-starter-tomcat 2.7.8<br>spring-boot-starter-freemarker 2.7.8<br>spring-boot-starter-validation 2.7.8<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.3<br>materialize 1.0.0<br>fontawesome 6.2.1<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.17.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.4.0.202211300538-r<br>opencsv 5.7.1<br>datatables 1.13.1<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 7c82af3fd..72746060f 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 2.7.8<br>spring-boot-devtools 2.7.8<br>spring-boot-starter-web 2.7.8<br>spring-boot-starter-test 2.7.8<br>spring-boot-starter-security 2.7.8<br>spring-boot-starter-tomcat 2.7.8<br>spring-boot-starter-freemarker 2.7.8<br>spring-boot-starter-validation 2.7.8<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.1<br>materialize 1.0.0<br>fontawesome 6.2.0<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.17.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.4.0.202211300538-r<br>opencsv 5.3<br>datatables 1.13.1<br>
+credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 2.7.8<br>spring-boot-devtools 2.7.8<br>spring-boot-starter-web 2.7.8<br>spring-boot-starter-test 2.7.8<br>spring-boot-starter-security 2.7.8<br>spring-boot-starter-tomcat 2.7.8<br>spring-boot-starter-freemarker 2.7.8<br>spring-boot-starter-validation 2.7.8<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.3<br>materialize 1.0.0<br>fontawesome 6.2.1<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.0<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.17.1<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.46<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.4.0.202211300538-r<br>opencsv 5.7.1<br>datatables 1.13.1<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/helpers/header.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
index a0ca9e805..54338de95 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl
+++ b/BudgetMasterServer/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/6.2.0/css/all.min.css'/>">
+ <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/6.2.1/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"/>
diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl
index be3c75756..99b4f01bf 100644
--- a/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl
@@ -1,6 +1,6 @@
<#macro scripts>
<#import "/spring.ftl" as s>
- <script src="<@s.url '/webjars/jquery/3.6.1/jquery.min.js'/>"></script>
+ <script src="<@s.url '/webjars/jquery/3.6.3/jquery.min.js'/>"></script>
<script src="<@s.url '/webjars/materializecss/1.0.0/js/materialize.min.js'/>"></script>
<script src="<@s.url '/webjars/mousetrap/1.6.5/mousetrap.js'/>"></script>
<script>
diff --git a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
index 8f4e118db..34bb56d24 100644
--- a/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
+++ b/BudgetMasterServer/src/main/resources/templates/settings/containers/settingsContainer.ftl
@@ -12,7 +12,7 @@
</div>
<#if importScripts>
- <script src="<@s.url '/webjars/jquery/3.6.1/jquery.min.js'/>"></script>
+ <script src="<@s.url '/webjars/jquery/3.6.3/jquery.min.js'/>"></script>
<script src="<@s.url '/webjars/materializecss/1.0.0/js/materialize.min.js'/>"></script>
<script>
initSettingsContainer('${formName}', '${containerId}');
diff --git a/pom.xml b/pom.xml
index 904dcd29c..7e0901780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,9 +55,9 @@
<app.author>Robert Goldmann</app.author>
<testcontainer.version>1.17.6</testcontainer.version>
- <assertj-core.version>3.23.1</assertj-core.version>
+ <assertj-core.version>3.24.2</assertj-core.version>
- <dependency-check-maven.version>7.4.1</dependency-check-maven.version>
+ <dependency-check-maven.version>8.0.1</dependency-check-maven.version>
</properties>
<dependencies>
--
GitLab