From 11073043a2d18ecd264c859238463f0c0d157741 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 8 Mar 2020 15:24:18 +0100 Subject: [PATCH] Fixed #483 - update pom dependencies --- pom.xml | 15 +++++++-------- src/main/resources/templates/charts/newChart.ftl | 4 ++-- src/main/resources/templates/helpers/scripts.ftl | 2 +- src/main/resources/templates/reports/reports.ftl | 2 +- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index ee2d3f442..18c85ccab 100644 --- a/pom.xml +++ b/pom.xml @@ -56,16 +56,15 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>1.8</java.version> - <jlibs.version>2.0.5</jlibs.version> - <versionizer.version>1.1.0</versionizer.version> - <webjars-locator.version>0.36</webjars-locator.version> - <jquery.version>3.3.1</jquery.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> <materializecss.version>1.0.0</materializecss.version> - <fontawesome.version>5.0.10</fontawesome.version> - <sortablejs.version>1.8.1</sortablejs.version> + <fontawesome.version>5.12.0</fontawesome.version> + <sortablejs.version>1.8.3</sortablejs.version> <mousetrap.version>1.6.1</mousetrap.version> - <codemirror.version>5.45.0</codemirror.version> - <webdrivermanager.version>2.2.1</webdrivermanager.version> + <codemirror.version>5.50.0</codemirror.version> <selenium.version>3.141.59</selenium.version> <assertj-core.version>3.15.0</assertj-core.version> diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl index 6bda7ecac..1e8f6b433 100644 --- a/src/main/resources/templates/charts/newChart.ftl +++ b/src/main/resources/templates/charts/newChart.ftl @@ -94,8 +94,8 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/codemirror/5.45.0/lib/codemirror.js'/>"></script> - <script src="<@s.url '/webjars/codemirror/5.45.0/mode/javascript/javascript.js'/>"></script> + <script src="<@s.url '/webjars/codemirror/5.50.0/lib/codemirror.js'/>"></script> + <script src="<@s.url '/webjars/codemirror/5.50.0/mode/javascript/javascript.js'/>"></script> <script src="<@s.url '/js/charts.js'/>"></script> </body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/helpers/scripts.ftl b/src/main/resources/templates/helpers/scripts.ftl index 38f2d1bd3..072702884 100644 --- a/src/main/resources/templates/helpers/scripts.ftl +++ b/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.3.1/jquery.min.js'/>"></script> +<script src="<@s.url '/webjars/jquery/3.4.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> diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index 84ce11ad1..a917de441 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.1/Sortable.min.js'/>"></script> + <script src="<@s.url '/webjars/sortablejs/1.8.3/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> -- GitLab