diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index c3f27b9eac2a22b5e5e1132af4de4518b3be3fb1..79c59b80bc95170264e63122d97a43447eb49c7d 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -26,23 +26,23 @@ <properties> <jlibs.version>3.2.0</jlibs.version> <versionizer.version>3.0.1</versionizer.version> - <webjars-locator.version>0.47</webjars-locator.version> + <webjars-locator.version>0.50</webjars-locator.version> <jquery.version>3.7.1</jquery.version> <materializecss.version>1.0.0</materializecss.version> <fontawesome.version>6.4.2</fontawesome.version> - <sortablejs.version>1.15.0</sortablejs.version> + <sortablejs.version>1.15.1</sortablejs.version> <mousetrap.version>1.6.5</mousetrap.version> <codemirror.version>5.62.2</codemirror.version> - <selenium.version>4.13.0</selenium.version> + <selenium.version>4.15.0</selenium.version> <jgit.version>6.7.0.202309050840-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.11</jacoco-maven-plugin.version> - <opencsv.version>5.8</opencsv.version> + <opencsv.version>5.9</opencsv.version> <datatables.version>1.13.5</datatables.version> <jakarta.xml.bind-api.version>4.0.1</jakarta.xml.bind-api.version> - <junit-jupiter-engine.version>5.10.0</junit-jupiter-engine.version> + <junit-jupiter-engine.version>5.10.1</junit-jupiter-engine.version> <project.outputDirectory>${project.build.directory}/../build/${project.version}</project.outputDirectory> <project.artifactName>${project.artifactId}-v${project.version}</project.artifactName> @@ -235,7 +235,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.2.1</version> + <version>3.2.2</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 89eb35773479b28ae86b5f0feec439ef76537a61..52eb3ba64190968e7c15b69e57e6bf3077dfbf16 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.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>spring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.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.27.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.7.0.202309050840-r<br>opencsv 5.8<br>datatables 1.13.5<br> +credits=Verwendete Schriftarten: Roboto<br>Verwendete Bibliotheken:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>spring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.1<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.50<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.9<br>datatables 1.13.5<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 c48a684c5e52b0b45bf81a20ee531a642896f440..83076275e35126cb035313568c4ec72a4618fac7 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.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>pring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.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.27.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.7.0.202309050840-r<br>opencsv 5.8<br>datatables 1.13.5<br> +credits=Fonts used: Roboto<br>Libraries used:<br>spring-boot-starter-parent 3.1.5<br>spring-boot-devtools 3.1.5<br>spring-boot-starter-web 3.1.5<br>spring-boot-starter-test 3.1.5<br>spring-boot-starter-security 3.1.5<br>pring-boot-starter-freemarker 3.1.5<br>spring-boot-starter-validation 3.1.5<br>spring-boot-starter-data-jpa 3.1.5<br>hibernate-jpamodelgen 6.1.7.Final<br>jakarta.xml.bind-api 4.0.1<br>maven-surefire-plugin 2.22.2<br>launch4j-maven-plugin 1.7.25<br>jquery 3.7.1<br>materialize 1.0.0<br>fontawesome 6.4.2<br>Google Material Icons<br>Vanilla-picker 2.12.1<br>SortableJS 1.15.1<br>jlibs 3.2.0<br>itextpdf 5.5.13.3<br>mousetrap 1.6.5<br>plotly 2.27.0<br>momentjs 2.29.4<br>codemirror 5.62.2<br>webjars-locator 0.50<br>libUtils 3.2.7<br>libStorage 3.2.3<br>natorder 1.1.3<br>jgit 6.7.0.202309050840-r<br>opencsv 5.9<br>datatables 1.13.5<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/reports/reports.ftl b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl index 679e7f00ae0a913468a4fd605a6eb31447ed0661..407a14d11c6a2707044d6348666c22bd0b2be1a1 100644 --- a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl +++ b/BudgetMasterServer/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.15.0/Sortable.min.js'/>"></script> + <script src="<@s.url '/webjars/sortablejs/1.15.1/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> diff --git a/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl b/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl index 5b43c357171d6f3827fe31f968fc9e5fe998ef26..beb3f6ee9480aec448413376af1fc2422c04cddd 100644 --- a/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl +++ b/BudgetMasterServer/src/main/resources/templates/templates/templates.ftl @@ -53,7 +53,7 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/sortablejs/1.15.0/Sortable.min.js'/>"></script> + <script src="<@s.url '/webjars/sortablejs/1.15.1/Sortable.min.js'/>"></script> <script src="<@s.url '/js/templates.js'/>"></script> </@header.body> </html> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 380ef70e77f66da827b59f8fa501f6a01b125984..48e1cdf9a191157cb76c71c5432f27aa1e3abd9e 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ <app.versionCode>46</app.versionCode> <app.author>Robert Goldmann</app.author> - <testcontainer.version>1.19.1</testcontainer.version> + <testcontainer.version>1.19.3</testcontainer.version> <assertj-core.version>3.24.2</assertj-core.version> </properties>