Repository: syncope Updated Branches: refs/heads/master 1f69db678 -> 3e48002cb
http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java index 625506c..802b34c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java @@ -93,7 +93,7 @@ public abstract class TemplatesTogglePanel extends TogglePanel<Serializable> { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { try { final AjaxWizard.NewItemActionEvent<AnyTO> payload = new AjaxWizard.NewItemActionEvent<>(null, target); @@ -170,7 +170,7 @@ public abstract class TemplatesTogglePanel extends TogglePanel<Serializable> { } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java index 6948aca..69ede94 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java @@ -200,13 +200,13 @@ public class BaseModal<T extends Serializable> extends Modal<T> { private static final long serialVersionUID = -5783994974426198290L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { - SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onSubmit(target, form); + protected void onSubmit(final AjaxRequestTarget target) { + SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onSubmit(target); } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { - SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onError(target, form); + protected void onError(final AjaxRequestTarget target) { + SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onError(target); } }; http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java index 19f112b..6d3be21 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java @@ -92,7 +92,7 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List< private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { //Add current component model.getObject().add(newModelObject()); @@ -104,9 +104,9 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List< } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { + protected void onError(final AjaxRequestTarget target) { SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR)); - super.onError(target, form); + super.onError(target); ((BasePage) getPage()).getNotificationPanel().refresh(target); } @@ -157,7 +157,7 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List< private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { //Drop current component model.getObject().remove(item.getModelObject()); clearInput(panel); @@ -170,8 +170,8 @@ public abstract class AbstractMultiPanel<INNER> extends AbstractFieldPanel<List< } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { - onSubmit(target, form); + protected void onError(final AjaxRequestTarget target) { + onSubmit(target); } }; http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java index e5fafb0..59478b5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java @@ -175,8 +175,8 @@ public class AjaxPalettePanel<T extends Serializable> extends AbstractFieldPanel private static final long serialVersionUID = -1765773642975892072L; @Override - protected void onAfterSubmit(final AjaxRequestTarget target, final Form<?> form) { - super.onAfterSubmit(target, form); + protected void onAfterSubmit(final AjaxRequestTarget target) { + super.onAfterSubmit(target); target.add(palette); } }); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java index 631496c..38676f2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java @@ -26,8 +26,8 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.Fil import de.agilecoders.wicket.jquery.JQuery; import de.agilecoders.wicket.jquery.function.IFunction; import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Base64; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; @@ -55,7 +55,6 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.util.ListModel; -import org.apache.wicket.util.crypt.Base64; import org.apache.wicket.util.lang.Bytes; public class BinaryFieldPanel extends FieldPanel<String> { @@ -198,7 +197,7 @@ public class BinaryFieldPanel extends FieldPanel<String> { ((BasePage) getPageReference().getPage()).getNotificationPanel().refresh(target); } else { final byte[] uploadedBytes = uploadedFile.getBytes(); - final String uploaded = new String(Base64.encodeBase64(uploadedBytes), StandardCharsets.UTF_8); + final String uploaded = Base64.getEncoder().encodeToString(uploadedBytes); field.setModelObject(uploaded); target.add(field); @@ -245,7 +244,7 @@ public class BinaryFieldPanel extends FieldPanel<String> { } private Response buildResponse() { - return Response.ok(new ByteArrayInputStream(Base64.decodeBase64(getModelObject()))). + return Response.ok(new ByteArrayInputStream(Base64.getMimeDecoder().decode(getModelObject()))). type(StringUtils.isBlank(mimeType) ? MediaType.APPLICATION_OCTET_STREAM : mimeType).build(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java index 796c825..9958a69 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java @@ -18,9 +18,9 @@ */ package org.apache.syncope.client.console.wicket.markup.html.form.preview; +import java.util.Base64; import org.apache.wicket.Component; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.util.crypt.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public abstract class AbstractBinaryPreviewer extends Panel { } public Component preview(final String uploaded) { - return preview(Base64.decodeBase64(uploaded)); + return preview(Base64.getMimeDecoder().decode(uploaded)); } public abstract Component preview(final byte[] uploadedBytes); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java index a06f589..8a8a15e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java @@ -53,13 +53,13 @@ public class LoadWidget extends BaseWidget { line.getOptions().setShowScale(false); line.getOptions().setMultiTooltipTemplate("<%= datasetLabel %>"); - for (SystemInfo.LoadInstant instant : systeminfo.getLoad()) { + systeminfo.getLoad().forEach(instant -> { line.getData().getLabels().add(DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT. format(systeminfo.getStartTime() + instant.getUptime())); cpuValues.add(instant.getSystemLoadAverage() * 1000); memValues.add(instant.getTotalMemory()); - } + }); LineDataSet cpuDataSet = new LineDataSet(cpuValues); cpuDataSet.setLabel("CPU"); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java index 36cf21b..023596b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java @@ -106,7 +106,7 @@ public class NumberWidget extends BaseWidget { responsePage = Realms.class; } - AjaxEventBehavior clickToRealms = new AjaxEventBehavior("onmousedown") { + AjaxEventBehavior clickToRealms = new AjaxEventBehavior("mousedown") { private static final long serialVersionUID = -7133385027739964990L; http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java index 1d1dc2d..18170d7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java @@ -47,7 +47,6 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; @@ -371,7 +370,7 @@ public abstract class AbstractMappingPanel extends Panel { private static final long serialVersionUID = -4804368561204623354L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { model.getObject().add(new ItemTO()); target.add(AbstractMappingPanel.this); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java index 1f14d8f..2552b4c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java @@ -41,7 +41,6 @@ import org.apache.wicket.extensions.wizard.IWizardStep; import org.apache.wicket.extensions.wizard.Wizard; import org.apache.wicket.extensions.wizard.WizardModel; import org.apache.wicket.extensions.wizard.WizardStep; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.Logger; @@ -172,7 +171,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard */ @Override public final void onCancel() { - final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); + AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null); try { onCancelInternal(); if (eventSink == null) { @@ -193,18 +192,18 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard */ @Override public final void onFinish() { - final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); + AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null); try { final Serializable res = onApply(target); if (eventSink == null) { - send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemFinishEvent<>(item, target).setResult(res)); + send(this, Broadcast.BUBBLE, new NewItemFinishEvent<>(item, target).setResult(res)); } else { send(eventSink, Broadcast.EXACT, new NewItemFinishEvent<>(item, target).setResult(res)); } } catch (TimeoutException te) { LOG.warn("Operation applying took to long", te); if (eventSink == null) { - send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemCancelEvent<>(item, target)); + send(this, Broadcast.BUBBLE, new NewItemCancelEvent<>(item, target)); } else { send(eventSink, Broadcast.EXACT, new NewItemCancelEvent<>(item, target)); } @@ -361,7 +360,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard } @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { try { onApply(target); } catch (TimeoutException te) { @@ -373,7 +372,7 @@ public abstract class AjaxWizard<T extends Serializable> extends Wizard } @Override - public void onError(final AjaxRequestTarget target, final Form<?> form) { + public void onError(final AjaxRequestTarget target) { ((BasePage) getPage()).getNotificationPanel().refresh(target); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java index c93d6b0..662272f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java @@ -32,7 +32,6 @@ import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.extensions.wizard.WizardModel.ICondition; import org.apache.wicket.extensions.wizard.WizardStep; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.ResourceModel; @@ -63,7 +62,7 @@ public abstract class AbstractConnConfPanel<T extends AbstractBaseBean> extends private static final long serialVersionUID = -7978723352517770644L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { final Pair<Boolean, String> result = check(target); if (result.getLeft()) { SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java index 1aa783f..ca5b038 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java @@ -104,7 +104,7 @@ public class ItemTransformersTogglePanel extends TogglePanel<Serializable> { private static final long serialVersionUID = 5538299138211283825L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { toggle(target, false); target.add(container); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java index 6a85d96..fdbab71 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java @@ -62,7 +62,7 @@ public class JEXLTransformersTogglePanel extends TogglePanel<Serializable> { private static final long serialVersionUID = 4617041491286858973L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { toggle(target, false); target.add(container); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java index d1f72ec..46b99b3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java @@ -59,7 +59,7 @@ public abstract class ObjectTypeTogglePanel extends TogglePanel<Serializable> { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { ObjectTypeTogglePanel.this.onSubmit(typeModel.getObject(), target); target.add(form); toggle(target, false); @@ -68,7 +68,7 @@ public abstract class ObjectTypeTogglePanel extends TogglePanel<Serializable> { } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java index 4976641..b3c8b33 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.event.Broadcast; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -276,7 +275,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (resourceTO.getOrgUnit() != null) { checkConnObjectKeyCount(SyncopeConstants.REALM_ANYTYPE, resourceTO.getOrgUnit().getItems()); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java index d1ab28e..00d784d 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java @@ -21,8 +21,8 @@ package org.apache.syncope.client.enduser.util; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.util.Base64; import javax.xml.bind.DatatypeConverter; -import org.apache.wicket.util.crypt.Base64; public final class SaltGenerator { @@ -36,7 +36,7 @@ public final class SaltGenerator { try { md = MessageDigest.getInstance("MD2"); return DatatypeConverter.printHexBinary( - md.digest((input + Base64.encodeBase64String(salt)).getBytes())); + md.digest((input + Base64.getMimeEncoder().encodeToString(salt)).getBytes())); } catch (final NoSuchAlgorithmException e) { throw new IllegalArgumentException(e); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java index 6b32959..cddb413 100644 --- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java +++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java @@ -42,7 +42,6 @@ import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -124,7 +123,7 @@ public class CamelRoutesDirectoryPanel extends DirectoryPanel< private static final long serialVersionUID = 5488080606102212554L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + public void onSubmit(final AjaxRequestTarget target) { try { restClient.update(anyTypeKind, route); info(getString(Constants.OPERATION_SUCCEEDED)); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java ---------------------------------------------------------------------- diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java index 857948b..cbc8234 100644 --- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java +++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java @@ -81,7 +81,7 @@ public class ImportMetadata extends TogglePanel<Serializable> { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) { + protected void onSubmit(final AjaxRequestTarget target) { if (ArrayUtils.isNotEmpty(metadata.getObject())) { try { restClient.importIdPs(new ByteArrayInputStream(metadata.getObject())); @@ -101,7 +101,7 @@ public class ImportMetadata extends TogglePanel<Serializable> { } @Override - protected void onError(final AjaxRequestTarget target, final Form<?> form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java index f46a5f8..e4dd9fd 100644 --- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java +++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java @@ -21,6 +21,7 @@ package org.apache.syncope.client.console.panels; import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import java.io.Serializable; import java.util.ArrayList; +import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -67,7 +68,6 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; -import org.apache.wicket.util.crypt.Base64; public class SAML2IdPsDirectoryPanel extends DirectoryPanel< SAML2IdPTO, SAML2IdPTO, SAML2IdPsProvider, SAML2IdPsRestClient> { @@ -214,7 +214,7 @@ public class SAML2IdPsDirectoryPanel extends DirectoryPanel< metadataModal.header(Model.of(object.getName() + " - Metadata")); metadataModal.setContent(new XMLEditorPanel( metadataModal, - Model.of(new String(Base64.decodeBase64(object.getMetadata()))), + Model.of(new String(Base64.getMimeDecoder().decode(object.getMetadata()))), true, pageRef)); metadataModal.show(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java index 9d8beaf..e318a57 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java @@ -21,6 +21,7 @@ package org.apache.syncope.fit.console; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.lang.reflect.InvocationTargetException; +import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.pages.Logs; import org.apache.syncope.common.lib.log.LoggerTO; import org.apache.wicket.Component; @@ -64,7 +65,8 @@ public class LogsITCase extends AbstractConsoleITCase { result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "6"); TESTER.assertComponent( result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", DropDownChoice.class); - TESTER.executeAjaxEvent(result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "onchange"); + TESTER.executeAjaxEvent( + result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", Constants.ON_CHANGE); TESTER.assertInfoMessages("Operation executed successfully"); } @@ -75,7 +77,7 @@ public class LogsITCase extends AbstractConsoleITCase { TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:1:link"); TESTER.assertComponent(CONTAINER_PATH, WebMarkupContainer.class); - assertNotNull(searchLog(KEY, CONTAINER_PATH, "org.apache.syncope.fit")); + assertNotNull(searchLog(KEY, CONTAINER_PATH, "org.apache.wicket")); } @Test @@ -83,12 +85,13 @@ public class LogsITCase extends AbstractConsoleITCase { TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:1:link"); TESTER.assertComponent(CONTAINER_PATH, WebMarkupContainer.class); - Component result = searchLog(KEY, CONTAINER_PATH, "org.apache.syncope.fit"); + Component result = searchLog(KEY, CONTAINER_PATH, "org.apache.wicket"); assertNotNull(result); TESTER.getRequest().addParameter( result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "6"); - TESTER.executeAjaxEvent(result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "onchange"); + TESTER.executeAjaxEvent( + result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", Constants.ON_CHANGE); TESTER.assertInfoMessages("Operation executed successfully"); } http://git-wip-us.apache.org/repos/asf/syncope/blob/3e48002c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 98b668b..9c9b83d 100644 --- a/pom.xml +++ b/pom.xml @@ -441,9 +441,9 @@ under the License. <jsplumb.version>2.0.7</jsplumb.version> <chartjs.version>1.0.2</chartjs.version> - <wicket.version>7.10.0</wicket.version> - <wicket-jqueryui.version>7.10.2</wicket-jqueryui.version> - <wicket-bootstrap.version>0.10.17</wicket-bootstrap.version> + <wicket.version>8.0.0</wicket.version> + <wicket-jqueryui.version>8.0.0</wicket-jqueryui.version> + <wicket-bootstrap.version>2.0.2</wicket-bootstrap.version> <angular.version>1.7.0</angular.version> <angular-ui-router.version>0.3.2</angular-ui-router.version> @@ -1157,7 +1157,7 @@ under the License. <version>${wicket.version}</version> </dependency> <dependency> - <groupId>org.apache.wicket</groupId> + <groupId>org.wicketstuff</groupId> <artifactId>wicket-datetime</artifactId> <version>${wicket.version}</version> </dependency> @@ -1195,6 +1195,16 @@ under the License. <groupId>de.agilecoders.wicket</groupId> <artifactId>wicket-bootstrap-core</artifactId> <version>${wicket-bootstrap.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>de.agilecoders.wicket</groupId> @@ -1202,6 +1212,14 @@ under the License. <version>${wicket-bootstrap.version}</version> <exclusions> <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-request</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-util</artifactId> + </exclusion> + <exclusion> <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> </exclusion> @@ -1218,428 +1236,428 @@ under the License. <artifactId>momentjs</artifactId> </exclusion> </exclusions> - </dependency> - <!-- /Wicket --> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>com.lmax</groupId> - <artifactId>disruptor</artifactId> - <version>${disruptor.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${log4j.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <version>${slf4j.version}</version> </dependency> + <!-- /Wicket --> - <dependency> - <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox</artifactId> - <version>2.0.9</version> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>com.lmax</groupId> + <artifactId>disruptor</artifactId> + <version>${disruptor.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + <version>${slf4j.version}</version> + </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery</artifactId> - <version>${jquery.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery-ui</artifactId> - <version>${jquery-ui.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery-ui-themes</artifactId> - <version>${jquery-ui.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jQuery-slimScroll</artifactId> - <version>${jquery-slimscroll.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootstrap</artifactId> - <version>${bootstrap.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootstrap-select</artifactId> - <version>${bootstrap-select.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>bootstrap-fileinput</artifactId> - <version>${bootstrap-fileinput.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars.bower</groupId> - <artifactId>jquery</artifactId> - </exclusion> - <exclusion> - <groupId>org.webjars.bower</groupId> - <artifactId>bootstrap</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>font-awesome</artifactId> - <version>${font-awesome.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>bootbox</artifactId> - <version>${bootbox.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>ionicons</artifactId> - <version>${ionicons.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>highlightjs</artifactId> - <version>${highlightjs.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>codemirror</artifactId> - <version>${codemirror.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>google-diff-match-patch</artifactId> - <version>${googlediffmatchpath.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jsplumb</artifactId> - <version>${jsplumb.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>chart.js</artifactId> - <version>${chartjs.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>jquery-cookie</artifactId> - <version>${jquery-cookie.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular</artifactId> - <version>${angular.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-resource</artifactId> - <version>${angular.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-cookies</artifactId> - <version>${angular.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-ui-router</artifactId> - <version>${angular-ui-router.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars</groupId> - <artifactId>angularjs</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-animate</artifactId> - <version>${angular.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-bootstrap</artifactId> - <version>${angular-ui-bootstrap.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars</groupId> - <artifactId>angularjs</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>angular-ui-select</artifactId> - <version>${angular-ui-select.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars</groupId> - <artifactId>angularjs</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-sanitize</artifactId> - <version>${angular.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-treasure-overlay-spinner</artifactId> - <version>${angular-treasure-overlay-spinner.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-translate</artifactId> - <version>${angular-translate.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-translate-loader-partial</artifactId> - <version>${angular-translate.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>angular-translate-storage-cookie</artifactId> - <version>${angular-translate.version}</version> - </dependency> - - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>ng-password-strength</artifactId> - <version>${ng-password-strength.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars.bower</groupId> - <artifactId>lodash</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>lodash</artifactId> - <version>${lodash.version}</version> - </dependency> - <dependency> - <groupId>org.webjars</groupId> - <artifactId>kendo-ui-core</artifactId> - <version>${kendo-ui-core.version}</version> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>select2</artifactId> - <version>${select2.version}</version> - <exclusions> - <exclusion> - <groupId>org.webjars.bower</groupId> - <artifactId>jquery</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.webjars.bower</groupId> - <artifactId>FileSaver.js</artifactId> - <version>${fileSaver.version}</version> - </dependency> - - <dependency> - <groupId>org.codehaus.izpack</groupId> - <artifactId>izpack-compiler</artifactId> - <version>${izpack.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.izpack</groupId> - <artifactId>izpack-panel</artifactId> - <version>${izpack.version}</version> - <exclusions> - <exclusion> - <groupId>org.icepdf.os</groupId> - <artifactId>icepdf-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.icepdf.os</groupId> - <artifactId>icepdf-viewer</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>2.0.9</version> + </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-invoker</artifactId> - <version>${maven-invoker.version}</version> - </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery</artifactId> + <version>${jquery.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui</artifactId> + <version>${jquery-ui.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery-ui-themes</artifactId> + <version>${jquery-ui.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jQuery-slimScroll</artifactId> + <version>${jquery-slimscroll.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap</artifactId> + <version>${bootstrap.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootstrap-select</artifactId> + <version>${bootstrap-select.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>bootstrap-fileinput</artifactId> + <version>${bootstrap-fileinput.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>jquery</artifactId> + </exclusion> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>bootstrap</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>font-awesome</artifactId> + <version>${font-awesome.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>bootbox</artifactId> + <version>${bootbox.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>ionicons</artifactId> + <version>${ionicons.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>highlightjs</artifactId> + <version>${highlightjs.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>codemirror</artifactId> + <version>${codemirror.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>google-diff-match-patch</artifactId> + <version>${googlediffmatchpath.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jsplumb</artifactId> + <version>${jsplumb.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>chart.js</artifactId> + <version>${chartjs.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>jquery-cookie</artifactId> + <version>${jquery-cookie.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular</artifactId> + <version>${angular.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-resource</artifactId> + <version>${angular.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-cookies</artifactId> + <version>${angular.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-ui-router</artifactId> + <version>${angular-ui-router.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-animate</artifactId> + <version>${angular.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-bootstrap</artifactId> + <version>${angular-ui-bootstrap.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>angular-ui-select</artifactId> + <version>${angular-ui-select.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars</groupId> + <artifactId>angularjs</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-sanitize</artifactId> + <version>${angular.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-treasure-overlay-spinner</artifactId> + <version>${angular-treasure-overlay-spinner.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-translate</artifactId> + <version>${angular-translate.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-translate-loader-partial</artifactId> + <version>${angular-translate.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>angular-translate-storage-cookie</artifactId> + <version>${angular-translate.version}</version> + </dependency> + + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>ng-password-strength</artifactId> + <version>${ng-password-strength.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>lodash</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>lodash</artifactId> + <version>${lodash.version}</version> + </dependency> + <dependency> + <groupId>org.webjars</groupId> + <artifactId>kendo-ui-core</artifactId> + <version>${kendo-ui-core.version}</version> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>select2</artifactId> + <version>${select2.version}</version> + <exclusions> + <exclusion> + <groupId>org.webjars.bower</groupId> + <artifactId>jquery</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.webjars.bower</groupId> + <artifactId>FileSaver.js</artifactId> + <version>${fileSaver.version}</version> + </dependency> + + <dependency> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-compiler</artifactId> + <version>${izpack.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.izpack</groupId> + <artifactId>izpack-panel</artifactId> + <version>${izpack.version}</version> + <exclusions> + <exclusion> + <groupId>org.icepdf.os</groupId> + <artifactId>icepdf-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.icepdf.os</groupId> + <artifactId>icepdf-viewer</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${httpclient.version}</version> - </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-invoker</artifactId> + <version>${maven-invoker.version}</version> + </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-api-annotations-common</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-windows</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-util</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-util-ui</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-util-lookup</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-awt</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-modules-settings</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-io</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-nodes</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-text</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-filesystems</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-openide-loaders</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-core-multiview</artifactId> - <version>${netbeans.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-modules-editor-lib2</artifactId> - <version>${netbeans.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-api-progress</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.api</groupId> - <artifactId>org-netbeans-api-progress-nb</artifactId> - <version>${netbeans.version}</version> - </dependency> - <dependency> - <groupId>org.netbeans.external</groupId> - <artifactId>asm-all-5.0.1</artifactId> - <version>${netbeans.version}</version> - </dependency> - - <dependency> - <groupId>org.antlr</groupId> - <artifactId>antlr4-runtime</artifactId> - <version>${antlr4.version}</version> - </dependency> - - <!-- TEST --> - <dependency> - <groupId>com.github.detro</groupId> - <artifactId>phantomjsdriver</artifactId> - <version>${phantomjs.driver.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.icegreen</groupId> - <artifactId>greenmail</artifactId> - <version>1.5.7</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> - <version>1.59</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <version>${spring.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpclient.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${httpclient.version}</version> + </dependency> + + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-api-annotations-common</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-windows</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-util</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-util-ui</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-util-lookup</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-awt</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-modules-settings</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-io</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-nodes</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-text</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-filesystems</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-openide-loaders</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-core-multiview</artifactId> + <version>${netbeans.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-modules-editor-lib2</artifactId> + <version>${netbeans.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-api-progress</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.api</groupId> + <artifactId>org-netbeans-api-progress-nb</artifactId> + <version>${netbeans.version}</version> + </dependency> + <dependency> + <groupId>org.netbeans.external</groupId> + <artifactId>asm-all-5.0.1</artifactId> + <version>${netbeans.version}</version> + </dependency> + + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr4-runtime</artifactId> + <version>${antlr4.version}</version> + </dependency> + + <!-- TEST --> + <dependency> + <groupId>com.github.detro</groupId> + <artifactId>phantomjsdriver</artifactId> + <version>${phantomjs.driver.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.icegreen</groupId> + <artifactId>greenmail</artifactId> + <version>1.5.7</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.59</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + <version>${spring.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> @@ -2268,7 +2286,7 @@ under the License. <link>http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/</link> <link>http://www.javadoc.io/doc/org.apache.camel/camel-core/2.21.1/</link> <link>http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.21.1/</link> - <link>https://ci.apache.org/projects/wicket/apidocs/7.x/</link> + <link>https://ci.apache.org/projects/wicket/apidocs/8.x/</link> <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link> <link>https://commons.apache.org/proper/commons-io/javadocs/api-2.6/</link> <link>https://commons.apache.org/proper/commons-jexl/apidocs/</link>
