From 16b7aaf2bdd9b646a3b1cd92d67341e29488be47 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Mon, 24 Apr 2023 23:38:26 +0200 Subject: [PATCH] #734 - updated dependencies --- BudgetMasterServer/pom.xml | 12 ++++++------ .../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 +- .../settings/containers/settingsContainer.ftl | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index efb708fde..38a25023b 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -27,18 +27,18 @@ <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.3</jquery.version> + <jquery.version>3.6.4</jquery.version> <materializecss.version>1.0.0</materializecss.version> - <fontawesome.version>6.3.0</fontawesome.version> + <fontawesome.version>6.4.0</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.8.1</selenium.version> - <jgit.version>6.4.0.202211300538-r</jgit.version> + <selenium.version>4.9.0</selenium.version> + <jgit.version>6.5.0.202303070854-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> + <jacoco-maven-plugin.version>0.8.9</jacoco-maven-plugin.version> <opencsv.version>5.7.1</opencsv.version> <datatables.version>1.13.2</datatables.version> <jakarta.xml.bind-api.version>4.0.0</jakarta.xml.bind-api.version> @@ -241,7 +241,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M9</version> + <version>3.0.0</version> <dependencies> <dependency> <groupId>org.junit.jupiter</groupId> diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties index 166c4ae2e..794897c02 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.0.3<br>spring-boot-devtools 3.0.3<br>spring-boot-starter-web 3.0.3<br>spring-boot-starter-test 3.0.3<br>spring-boot-starter-security 3.0.3<br>spring-boot-starter-freemarker 3.0.3<br>spring-boot-starter-validation 3.0.3<br>spring-boot-starter-data-jpa 3.0.3<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.0<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.3.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.21.0<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.2<br> +credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.0.3<br>spring-boot-devtools 3.0.3<br>spring-boot-starter-web 3.0.3<br>spring-boot-starter-test 3.0.3<br>spring-boot-starter-security 3.0.3<br>spring-boot-starter-freemarker 3.0.3<br>spring-boot-starter-validation 3.0.3<br>spring-boot-starter-data-jpa 3.0.3<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.0<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.4<br>materialize 1.0.0<br>fontawesome 6.4.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.21.0<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.5.0.202303070854-r<br>opencsv 5.7.1<br>datatables 1.13.2<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 1ced25981..462a0d29d 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.0.3<br>spring-boot-devtools 3.0.3<br>spring-boot-starter-web 3.0.3<br>spring-boot-starter-test 3.0.3<br>spring-boot-starter-security 3.0.3<br>pring-boot-starter-freemarker 3.0.3<br>spring-boot-starter-validation 3.0.3<br>spring-boot-starter-data-jpa 3.0.3<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.0<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.3.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.21.0<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.2<br> +credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.0.3<br>spring-boot-devtools 3.0.3<br>spring-boot-starter-web 3.0.3<br>spring-boot-starter-test 3.0.3<br>spring-boot-starter-security 3.0.3<br>pring-boot-starter-freemarker 3.0.3<br>spring-boot-starter-validation 3.0.3<br>spring-boot-starter-data-jpa 3.0.3<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.0<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.6.4<br>materialize 1.0.0<br>fontawesome 6.4.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.21.0<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.5.0.202303070854-r<br>opencsv 5.7.1<br>datatables 1.13.2<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 094800aa0..4b8ee3807 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.3.0/css/all.min.css'/>"> + <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/6.4.0/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 99b4f01bf..fc0aba3cb 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.3/jquery.min.js'/>"></script> + <script src="<@s.url '/webjars/jquery/3.6.4/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 34bb56d24..1b162a3c1 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.3/jquery.min.js'/>"></script> + <script src="<@s.url '/webjars/jquery/3.6.4/jquery.min.js'/>"></script> <script src="<@s.url '/webjars/materializecss/1.0.0/js/materialize.min.js'/>"></script> <script> initSettingsContainer('${formName}', '${containerId}'); -- GitLab