From db0f05a46e279eb70bb742509d0c48b4263500a0 Mon Sep 17 00:00:00 2001 From: r1gm Date: Tue, 10 Sep 2024 10:17:59 +0700 Subject: [PATCH 01/14] update bootstrap italia to version 2.8.7 --- bootstrap-themes/pom.xml | 22 +++++++++++-------- .../markup/html/italia/ItaliaTheme.java | 8 +++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/bootstrap-themes/pom.xml b/bootstrap-themes/pom.xml index 1afc51fda..9cd3673fa 100644 --- a/bootstrap-themes/pom.xml +++ b/bootstrap-themes/pom.xml @@ -14,8 +14,7 @@ bootstrap-themes - 1.6.2 - 3.6.12 + 2.8.7 @@ -40,16 +39,21 @@ - org.webjars + org.webjars.npm bootstrap-italia ${bootstrap-italia.version} + + + org.webjars.npm + video.js + + + org.webjars.npm + design-tokens-italia + + - - - org.webjars - splide - ${splide.version} - + diff --git a/bootstrap-themes/src/main/java/de/agilecoders/wicket/themes/markup/html/italia/ItaliaTheme.java b/bootstrap-themes/src/main/java/de/agilecoders/wicket/themes/markup/html/italia/ItaliaTheme.java index 68578c699..df59e9fbc 100644 --- a/bootstrap-themes/src/main/java/de/agilecoders/wicket/themes/markup/html/italia/ItaliaTheme.java +++ b/bootstrap-themes/src/main/java/de/agilecoders/wicket/themes/markup/html/italia/ItaliaTheme.java @@ -44,16 +44,16 @@ public ItaliaTheme() { public List getDependencies() { List references = new ArrayList<>(); references.add( - CssHeaderItem.forReference(new WebjarsCssResourceReference("splide/current/css/splide-core.min.css"))); + CssHeaderItem.forReference(new WebjarsCssResourceReference("splidejs__splide/current/dist/css/splide-core.min.css"))); references.add(CssHeaderItem .forReference( - new WebjarsCssResourceReference("bootstrap-italia/current/css/bootstrap-italia.min.css")) + new WebjarsCssResourceReference("bootstrap-italia/current/dist/css/bootstrap-italia.min.css")) .setId(BOOTSTRAP_THEME_MARKUP_ID)); references.add(new PriorityHeaderItem(JavaScriptHeaderItem .forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference()))); - references.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("splide/current/js/splide.js"))); + references.add(JavaScriptHeaderItem.forReference(new WebjarsJavaScriptResourceReference("splidejs__splide/current/dist/js/splide.min.js"))); - WebjarsJavaScriptResourceReference italiaJsReference = new WebjarsJavaScriptResourceReference("bootstrap-italia/current/js/bootstrap-italia.min.js"); + WebjarsJavaScriptResourceReference italiaJsReference = new WebjarsJavaScriptResourceReference("bootstrap-italia/current/dist/js/bootstrap-italia.min.js"); CharSequence urlForJs = RequestCycle.get().urlFor(italiaJsReference, null); From 181af71913a55ff151a04fa64ef48a608123d6d4 Mon Sep 17 00:00:00 2001 From: r1gm Date: Tue, 10 Sep 2024 10:22:02 +0700 Subject: [PATCH 02/14] typo fix --- bootstrap-themes/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-themes/pom.xml b/bootstrap-themes/pom.xml index 9cd3673fa..d4cf07610 100644 --- a/bootstrap-themes/pom.xml +++ b/bootstrap-themes/pom.xml @@ -47,7 +47,7 @@ org.webjars.npm video.js - + org.webjars.npm design-tokens-italia From d9c98f7958be36a47106cb3dcd51419fcb1b8049 Mon Sep 17 00:00:00 2001 From: r1gm Date: Tue, 10 Sep 2024 16:07:36 +0700 Subject: [PATCH 03/14] exclude dependency, use current wicket-bootstrap webjar version --- bootstrap-themes/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap-themes/pom.xml b/bootstrap-themes/pom.xml index d4cf07610..a9b0e1d0f 100644 --- a/bootstrap-themes/pom.xml +++ b/bootstrap-themes/pom.xml @@ -43,14 +43,15 @@ bootstrap-italia ${bootstrap-italia.version} + + org.webjars.npm + bootstrap + org.webjars.npm video.js - - org.webjars.npm - design-tokens-italia - + From 410a67db12fbeb676a36fec47231fd40af649d29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:00:01 +0300 Subject: [PATCH 04/14] Bump org.webjars.npm:eonasdan__tempus-dominus from 6.9.9 to 6.9.10 (#1142) Bumps [org.webjars.npm:eonasdan__tempus-dominus](https://github.com/Eonasdan/tempus-dominus) from 6.9.9 to 6.9.10. - [Release notes](https://github.com/Eonasdan/tempus-dominus/releases) - [Commits](https://github.com/Eonasdan/tempus-dominus/compare/v6.9.9...v6.9.10) --- updated-dependencies: - dependency-name: org.webjars.npm:eonasdan__tempus-dominus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bootstrap-extensions/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-extensions/pom.xml b/bootstrap-extensions/pom.xml index c427e0340..35d9e2c77 100644 --- a/bootstrap-extensions/pom.xml +++ b/bootstrap-extensions/pom.xml @@ -25,7 +25,7 @@ 2.30.1 1.14.0-beta3 5.39.0 - 6.9.9 + 6.9.10 3.0.5 From ff7be79743069dc2aad542659ecf881f2552d185 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:00:59 +0300 Subject: [PATCH 05/14] Bump ch.qos.logback:logback-classic from 1.5.7 to 1.5.8 (#1141) Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.5.7 to 1.5.8. - [Commits](https://github.com/qos-ch/logback/compare/v_1.5.7...v_1.5.8) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ec5eb2e85..a26074994 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ 1.11.0 5.11.1 3.0 - 1.5.7 + 1.5.8 2.8.3-1 5.12.0 5.0.0 From e2e9cf04ccba75e240b75a92fbf95466b1d3d5e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:01:29 +0300 Subject: [PATCH 06/14] Bump jetty.version from 11.0.23 to 11.0.24 (#1139) Bumps `jetty.version` from 11.0.23 to 11.0.24. Updates `org.eclipse.jetty:jetty-server` from 11.0.23 to 11.0.24 Updates `org.eclipse.jetty:jetty-webapp` from 11.0.23 to 11.0.24 Updates `org.eclipse.jetty:jetty-maven-plugin` from 11.0.23 to 11.0.24 --- updated-dependencies: - dependency-name: org.eclipse.jetty:jetty-server dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-webapp dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.eclipse.jetty:jetty-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a26074994..844799f48 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.0 v20231112 - 11.0.23 + 11.0.24 1.0.1 3.7.1 5.11.0 From 81e793f5d8c33de16e7a5d69e5119ae8e99724f8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:03:21 +0300 Subject: [PATCH 07/14] Bump org.webjars:jquery-ui from 1.13.3 to 1.14.0 (#1140) Bumps [org.webjars:jquery-ui](https://github.com/webjars/jquery-ui) from 1.13.3 to 1.14.0. - [Commits](https://github.com/webjars/jquery-ui/compare/jquery-ui-1.13.3...jquery-ui-1.14.0) --- updated-dependencies: - dependency-name: org.webjars:jquery-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bootstrap-extensions/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-extensions/pom.xml b/bootstrap-extensions/pom.xml index 35d9e2c77..7a9d24b66 100644 --- a/bootstrap-extensions/pom.xml +++ b/bootstrap-extensions/pom.xml @@ -15,7 +15,7 @@ 5.0.9 - 1.13.3 + 1.14.0 0.10.5-1 1.5.1-1 2.1.0 From 0c403ce06c531aaec14abaf8ab5fe051204da33f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:03:52 +0300 Subject: [PATCH 08/14] Bump org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0 (#1137) Bumps org.apache.commons:commons-lang3 from 3.16.0 to 3.17.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 844799f48..09418b21c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 1.1.2 - 3.16.0 + 3.17.0 2.4.3 1.0 From 2c25f07c1e62bbaafd849cc4e59495ab65c0e4d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:04:14 +0300 Subject: [PATCH 09/14] Bump maven-surefire-plugin.version from 3.4.0 to 3.5.0 (#1136) Bumps `maven-surefire-plugin.version` from 3.4.0 to 3.5.0. Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) Updates `org.apache.maven.surefire:surefire-junit47` from 3.4.0 to 3.5.0 --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.maven.surefire:surefire-junit47 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 09418b21c..fb5b349be 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 3.2.5 2.7 4.3.0 - 3.4.0 + 3.5.0 3.1.3 3.8.0 1.8 From ce1f068032d10b5aa15bd05138c0a57052566561 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:04:37 +0300 Subject: [PATCH 10/14] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10.0 (#1135) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.8.0 to 3.10.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.8.0...maven-javadoc-plugin-3.10.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb5b349be..bb041197f 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 4.3.0 3.5.0 3.1.3 - 3.8.0 + 3.10.0 1.8 3.2.0 2.3 From 521083774e108c8dd4a71b501a1f2e1435a010d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:05:00 +0300 Subject: [PATCH 11/14] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.4.0 to 3.5.0 (#1134) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.4.0 to 3.5.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.4.0...surefire-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- bootstrap-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap-core/pom.xml b/bootstrap-core/pom.xml index 93e17c2a2..ebcc0be31 100644 --- a/bootstrap-core/pom.xml +++ b/bootstrap-core/pom.xml @@ -153,7 +153,7 @@ maven-failsafe-plugin - 3.4.0 + 3.5.0 org.apache.maven.surefire From f5001e5ebe91fd4ccc348ed85c2e8bcb895936a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:05:23 +0300 Subject: [PATCH 12/14] Bump org.mockito:mockito-core from 5.12.0 to 5.13.0 (#1133) Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 5.12.0 to 5.13.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v5.12.0...v5.13.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb041197f..2e3c23e8b 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 3.0 1.5.8 2.8.3-1 - 5.12.0 + 5.13.0 5.0.0 2.0.16 10.1.0 From 7c73d1c5fb49900b57eaf7c425b3d5798a3a9ed9 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Fri, 13 Sep 2024 12:17:07 +0300 Subject: [PATCH 13/14] Exclude org,webjars.npm:design-tokens-italia for bootstrap-italia theme Signed-off-by: Martin Tzvetanov Grigorov --- bootstrap-themes/pom.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bootstrap-themes/pom.xml b/bootstrap-themes/pom.xml index a9b0e1d0f..a1ad5045a 100644 --- a/bootstrap-themes/pom.xml +++ b/bootstrap-themes/pom.xml @@ -46,12 +46,15 @@ org.webjars.npm bootstrap - + org.webjars.npm video.js - - + + + org.webjars.npm + design-tokens-italia + From 046c0155394aa40480a8f956cc87d296f2b66b11 Mon Sep 17 00:00:00 2001 From: r1gm Date: Thu, 17 Oct 2024 10:26:58 +0700 Subject: [PATCH 14/14] revert problematic code to the good old code, Arrays.asList is unmodifiable, toolbarOptions need modifiable list. --- .../html/bootstrap/editor/SummernoteConfig.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteConfig.java b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteConfig.java index fa02d60d7..a94a9be83 100644 --- a/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteConfig.java +++ b/bootstrap-extensions/src/main/java/de/agilecoders/wicket/extensions/markup/html/bootstrap/editor/SummernoteConfig.java @@ -1,6 +1,6 @@ package de.agilecoders.wicket.extensions.markup.html.bootstrap.editor; -import java.util.Arrays; +import com.google.common.collect.Lists; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.List; @@ -55,14 +55,14 @@ public class SummernoteConfig extends AbstractConfig { private static final IKey>> ToolbarOptions = newKey("ToolbarOptions", null); - private Map> toolbarOptions = new LinkedHashMap<>() { + private final Map> toolbarOptions = new LinkedHashMap<>() { private static final long serialVersionUID = 1L; { - put("Style", Arrays.asList("style", "fontname", "fontsize", "color", "bold", "italic", "underline", "strikethrough", "clear")); - put("Layout", Arrays.asList("ul", "ol", "paragraph", "height")); - put("Insert", Arrays.asList("picture", "link", "video", "table", "hr")); - put("Misc", Arrays.asList("fullscreen", "codeview", "undo", "redo", "help")); + put("Style", Lists.newArrayList("style", "fontname", "fontsize", "color", "bold", "italic", "underline", "strikethrough", "clear")); + put("Layout", Lists.newArrayList("ul", "ol", "paragraph", "height")); + put("Insert", Lists.newArrayList("picture", "link", "video", "table", "hr")); + put("Misc", Lists.newArrayList("fullscreen", "codeview", "undo", "redo", "help")); } };