This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 12c019bcb3fdb0d1861e3e2b25629957b01f5f9f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Nov 10 22:35:57 2026 +0000
Bump wicket-bootstrap.version from 7.0.16 to 8.0.0
Bumps `wicket-bootstrap.version` from 7.0.16 to 8.0.0.
Updates `de.agilecoders.wicket:wicket-bootstrap-core` from 7.0.16 to 8.0.0
-
[Commits](https://github.com/l0rdn1kk0n/wicket-bootstrap/compare/bootstrap-parent-7.0.16...bootstrap-parent-8.0.0)
Updates `de.agilecoders.wicket:wicket-bootstrap-extensions` from 7.0.16 to
8.0.0
-
[Commits](https://github.com/martin-g/wicket-bootstrap/compare/bootstrap-parent-7.0.16...bootstrap-parent-8.0.0)
---
updated-dependencies:
- dependency-name: de.agilecoders.wicket:wicket-bootstrap-core
dependency-version: 8.0.0
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: de.agilecoders.wicket:wicket-bootstrap-extensions
dependency-version: 8.0.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
---
.../main/java/org/apache/syncope/client/console/panels/OIDC.java | 5 ++---
.../apache/syncope/client/console/rest/AuthProfileRestClient.java | 4 ++--
.../apache/syncope/client/enduser/rest/AuthProfileRestClient.java | 4 ++--
.../org/apache/syncope/client/console/chartjs/ChartJSPanel.java | 6 ++++--
.../src/main/java/org/apache/syncope/client/console/pages/Anys.java | 2 +-
pom.xml | 2 +-
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/OIDC.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/OIDC.java
index a35d45201a..9f3b583e81 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/panels/OIDC.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/panels/OIDC.java
@@ -18,9 +18,7 @@
*/
package org.apache.syncope.client.console.panels;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import org.apache.commons.lang3.mutable.Mutable;
@@ -46,6 +44,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import tools.jackson.databind.json.JsonMapper;
public class OIDC extends Panel {
@@ -106,7 +105,7 @@ public class OIDC extends Panel {
try {
pretty =
MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(
MAPPER.readTree(Base64.getDecoder().decode(oidcOpEntity.get().getJWKS())));
- } catch (IOException e) {
+ } catch (Exception e) {
LOG.error("Could not pretty-print", e);
pretty = new String(Base64.getDecoder().decode(
oidcOpEntity.get().getJWKS()),
StandardCharsets.UTF_8);
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AuthProfileRestClient.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AuthProfileRestClient.java
index 6093a178a0..6957639a50 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AuthProfileRestClient.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/AuthProfileRestClient.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.console.rest;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.io.IOException;
@@ -32,6 +30,8 @@ import
org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.to.AuthProfileTO;
import org.apache.syncope.common.rest.api.beans.AuthProfileQuery;
import org.apache.syncope.common.rest.api.service.AuthProfileService;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.json.JsonMapper;
public class AuthProfileRestClient extends BaseRestClient {
diff --git
a/client/am/enduser/src/main/java/org/apache/syncope/client/enduser/rest/AuthProfileRestClient.java
b/client/am/enduser/src/main/java/org/apache/syncope/client/enduser/rest/AuthProfileRestClient.java
index 0f59438f1f..0424e5951a 100644
---
a/client/am/enduser/src/main/java/org/apache/syncope/client/enduser/rest/AuthProfileRestClient.java
+++
b/client/am/enduser/src/main/java/org/apache/syncope/client/enduser/rest/AuthProfileRestClient.java
@@ -18,8 +18,6 @@
*/
package org.apache.syncope.client.enduser.rest;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.io.IOException;
@@ -31,6 +29,8 @@ import
org.apache.syncope.client.enduser.SyncopeWebApplication;
import org.apache.syncope.common.keymaster.client.api.model.NetworkService;
import org.apache.syncope.common.lib.to.AuthProfileTO;
import org.apache.syncope.common.rest.api.service.AuthProfileSelfService;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.json.JsonMapper;
public class AuthProfileRestClient extends BaseRestClient {
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
index f51a0d5c22..311d22c8b5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/chartjs/ChartJSPanel.java
@@ -19,12 +19,12 @@
package org.apache.syncope.client.console.chartjs;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import tools.jackson.databind.json.JsonMapper;
public class ChartJSPanel extends Panel {
@@ -33,7 +33,9 @@ public class ChartJSPanel extends Panel {
private static final Logger LOG =
LoggerFactory.getLogger(ChartJSPanel.class);
private static final JsonMapper MAPPER = JsonMapper.builder().
-
findAndAddModules().defaultPropertyInclusion(JsonInclude.Value.ALL_NON_NULL).build();
+ findAndAddModules().
+ changeDefaultPropertyInclusion(incl ->
incl.withValueInclusion(JsonInclude.Include.NON_NULL)).
+ build();
private final IModel<Chart> model;
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Anys.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Anys.java
index a9bbd097da..f6f97a23b3 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Anys.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Anys.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.console.pages;
-import com.fasterxml.jackson.databind.json.JsonMapper;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import java.util.List;
import org.apache.syncope.client.console.BookmarkablePageLinkBuilder;
@@ -41,6 +40,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
+import tools.jackson.databind.json.JsonMapper;
public class Anys extends BasePage {
diff --git a/pom.xml b/pom.xml
index 1a2fc393ed..eceacd9da4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -485,7 +485,7 @@ under the License.
<wicket.version>11.0.0</wicket.version>
<wicketstuff.version>11.0.0-SNAPSHOT</wicketstuff.version>
- <wicket-bootstrap.version>7.0.16</wicket-bootstrap.version>
+ <wicket-bootstrap.version>8.0.0</wicket-bootstrap.version>
<wicket-spring-boot.version>5.0.0</wicket-spring-boot.version>
<antlr4.version>4.13.2</antlr4.version>