diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index 1b45e0459a9694ab26cfd7b26682569fee3f3c70..735c9635ddf399bd3cc9fa90d21ecfb26c804e5c 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -26,17 +26,17 @@ <properties> <jlibs.version>3.2.0</jlibs.version> <versionizer.version>3.0.1</versionizer.version> - <webjars-locator.version>0.45</webjars-locator.version> - <jquery.version>3.6.0</jquery.version> + <webjars-locator.version>0.46</webjars-locator.version> + <jquery.version>3.6.1</jquery.version> <materializecss.version>1.0.0</materializecss.version> - <fontawesome.version>6.1.2</fontawesome.version> + <fontawesome.version>6.2.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.4.0</selenium.version> + <selenium.version>4.7.1</selenium.version> <assertj-core.version>3.23.1</assertj-core.version> - <jgit.version>6.2.0.202206071550-r</jgit.version> - <natorder.version>1.1.2</natorder.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> @@ -246,7 +246,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> + <version>3.0.0-M6</version> <configuration> <junitArtifactName>junit:junit</junitArtifactName> <argLine>${surefireArgLine} -Dfile.encoding=UTF-8</argLine> diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties index c8161df65247432f582048e0156531284107ef36..94a215431a0ae005722f4e064f42ac08ce85f161 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.0<br>spring-boot-devtools 2.7.0<br>spring-boot-starter-web 2.7.0<br>spring-boot-starter-test 2.7.0<br>spring-boot-starter-security 2.7.0<br>spring-boot-starter-tomcat 2.7.0<br>spring-boot-starter-freemarker 2.7.0<br>spring-boot-starter-validation 2.7.0<br>h2 1.4.199<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 6.1.2<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.14.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.45<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.2<br>jgit 6.2.0.202206071550-r<br> +credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 2.7.0<br>spring-boot-devtools 2.7.0<br>spring-boot-starter-web 2.7.0<br>spring-boot-starter-test 2.7.0<br>spring-boot-starter-security 2.7.0<br>spring-boot-starter-tomcat 2.7.0<br>spring-boot-starter-freemarker 2.7.0<br>spring-boot-starter-validation 2.7.0<br>h2 1.4.199<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.14.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> 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 8d02985866fbac25ad02f968e343ad4b636341df..32148b4393a67187ceca9350343a1e2195482507 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.0<br>spring-boot-devtools 2.7.0<br>spring-boot-starter-web 2.7.0<br>spring-boot-starter-test 2.7.0<br>spring-boot-starter-security 2.7.0<br>spring-boot-starter-tomcat 2.7.0<br>spring-boot-starter-freemarker 2.7.0<br>spring-boot-starter-validation 2.7.0<br>h2 1.4.199<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 6.1.2<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.14.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.45<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.0<br>jgit 6.2.0.202206071550-r<br> +credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 2.7.0<br>spring-boot-devtools 2.7.0<br>spring-boot-starter-web 2.7.0<br>spring-boot-starter-test 2.7.0<br>spring-boot-starter-security 2.7.0<br>spring-boot-starter-tomcat 2.7.0<br>spring-boot-starter-freemarker 2.7.0<br>spring-boot-starter-validation 2.7.0<br>h2 1.4.199<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.14.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> 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 7a884854b8674f267095f9d1f5a081028cf77e76..a0ca9e8057ab03121304c99f061875e2396f3cb6 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.1.2/css/all.min.css'/>"> + <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/6.2.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 cf6778142b510b7f9257ff6dee62459bfc443f8a..be3c75756f8053d768d9eaad41eb410a783921ec 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.0/jquery.min.js'/>"></script> + <script src="<@s.url '/webjars/jquery/3.6.1/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 9e5df4dee203aa52f1c4077936eb74afc7f18336..8f4e118db3d0be975bf4c59f0c8275bec28d3436 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.0/jquery.min.js'/>"></script> + <script src="<@s.url '/webjars/jquery/3.6.1/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 b4c1b5f293d09ca5e19a16a955c2b19313e38c2e..8b9044e084797dcb01e74944fb4bd455cf509278 100644 --- a/pom.xml +++ b/pom.xml @@ -54,10 +54,10 @@ <app.versionCode>40</app.versionCode> <app.author>Robert Goldmann</app.author> - <testcontainer.version>1.17.3</testcontainer.version> + <testcontainer.version>1.17.6</testcontainer.version> <assertj-core.version>3.23.1</assertj-core.version> - <dependency-check-maven.version>7.1.1</dependency-check-maven.version> + <dependency-check-maven.version>7.4.1</dependency-check-maven.version> </properties> <dependencies>