diff --git a/pom.xml b/pom.xml index 64934d1a36f8b5a6a9f191b76381d04dd0ad09eb..fa143cb5b172a768318253d2c798e337b6825739 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.2.5.RELEASE</version> + <version>2.2.11.RELEASE</version> <relativePath/> </parent> @@ -56,17 +56,17 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>11</java.version> - <jlibs.version>2.0.6</jlibs.version> - <versionizer.version>1.2.1</versionizer.version> - <webjars-locator.version>0.39</webjars-locator.version> - <jquery.version>3.4.1</jquery.version> + <jlibs.version>3.2.0</jlibs.version> + <versionizer.version>3.0.1</versionizer.version> + <webjars-locator.version>0.40</webjars-locator.version> + <jquery.version>3.5.1</jquery.version> <materializecss.version>1.0.0</materializecss.version> - <fontawesome.version>5.12.0</fontawesome.version> - <sortablejs.version>1.8.3</sortablejs.version> - <mousetrap.version>1.6.1</mousetrap.version> + <fontawesome.version>5.15.1</fontawesome.version> + <sortablejs.version>1.10.2</sortablejs.version> + <mousetrap.version>1.6.5</mousetrap.version> <codemirror.version>5.50.0</codemirror.version> <selenium.version>3.141.59</selenium.version> - <assertj-core.version>3.15.0</assertj-core.version> + <assertj-core.version>3.17.1</assertj-core.version> <app.versionDate>${maven.build.timestamp}</app.versionDate> <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format> diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl index 32f53897f0640c7e9f7ff485e4267f99c6257579..c9f77b6cd2e771280c7e97de614b54fb98f4386d 100644 --- a/src/main/resources/templates/helpers/header.ftl +++ b/src/main/resources/templates/helpers/header.ftl @@ -11,7 +11,7 @@ <#import "/spring.ftl" as s> <title>${title}</title> <meta charset="UTF-8"/> - <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.12.0/css/all.min.css'/>"> + <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.15.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 "style"/> diff --git a/src/main/resources/templates/helpers/scripts.ftl b/src/main/resources/templates/helpers/scripts.ftl index 072702884a187f47300d7921806c830041ec9ba7..eb063fabd35ea8a0dba7f9ea4b09a9b907616bf1 100644 --- a/src/main/resources/templates/helpers/scripts.ftl +++ b/src/main/resources/templates/helpers/scripts.ftl @@ -1,8 +1,8 @@ <#macro scripts> <#import "/spring.ftl" as s> -<script src="<@s.url '/webjars/jquery/3.4.1/jquery.min.js'/>"></script> +<script src="<@s.url '/webjars/jquery/3.5.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.1/mousetrap.js'/>"></script> +<script src="<@s.url '/webjars/mousetrap/1.6.5/mousetrap.js'/>"></script> <script> rootURL = "<@s.url ''/>" </script> diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index 314acf1ce80e422663efc0d5ab67662ed6b9e5f4..56081a90e0ecba4d284c453e3d3166366c4303b7 100644 --- a/src/main/resources/templates/reports/reports.ftl +++ b/src/main/resources/templates/reports/reports.ftl @@ -111,7 +111,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/sortablejs/1.8.3/Sortable.min.js'/>"></script> + <script src="<@s.url '/webjars/sortablejs/1.10.2/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/src/test/java/de/deadlocker8/budgetmaster/integration/DateRepairTest.java b/src/test/java/de/deadlocker8/budgetmaster/integration/DateRepairTest.java index 7a8ae0e546be0921e18afd315d44ab2e8086da59..828541c0461c9ac3cfa27f95e58fdabeff1c5d5a 100644 --- a/src/test/java/de/deadlocker8/budgetmaster/integration/DateRepairTest.java +++ b/src/test/java/de/deadlocker8/budgetmaster/integration/DateRepairTest.java @@ -62,7 +62,7 @@ public class DateRepairTest assertThat(transactions.stream() .map(t -> t.getTags().stream() .map(Tag::getName).toArray(String[]::new)) - .toArray(String[][]::new)) + .collect(Collectors.toList())) .containsOnly(new String[]{"0815", "abc"}, new String[0]); }