You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/05/14 08:09:08 UTC
[syncope] branch 2_1_X updated (5be460d -> 39130e5)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 5be460d Fix console tests
new a95e754 [SYNCOPE-1560] Missing update for SAML metadata import
new 39130e5 Upgrading Elasticsearch, Log4J, FOP
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../syncope/client/console/panels/ImportMetadata.java | 19 ++++++++++---------
pom.xml | 6 +++---
2 files changed, 13 insertions(+), 12 deletions(-)
[syncope] 01/02: [SYNCOPE-1560] Missing update for SAML metadata
import
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit a95e7549951d38cdb0b54cb37abc2edbed9a8c65
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 09:21:44 2020 +0200
[SYNCOPE-1560] Missing update for SAML metadata import
---
.../syncope/client/console/panels/ImportMetadata.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
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 dd4dfe0..e5cdd86 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
@@ -23,6 +23,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.fileinput.Fil
import java.io.ByteArrayInputStream;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Locale;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
@@ -44,21 +45,21 @@ public class ImportMetadata extends TogglePanel<Serializable> {
private final SAML2IdPsRestClient restClient = new SAML2IdPsRestClient();
- private final Form<?> form;
-
public ImportMetadata(final String id, final WebMarkupContainer container, final PageReference pageRef) {
super(id, pageRef);
- form = new Form<>("metadataForm");
+ Form<?> form = new Form<>("metadataForm");
addInnerObject(form);
- final Model<byte[]> metadata = new Model<>();
+ Model<byte[]> metadata = new Model<>();
- FileInputConfig config = new FileInputConfig();
- config.showUpload(false);
- config.showRemove(false);
- config.showPreview(false);
- final BootstrapFileInputField fileUpload =
+ FileInputConfig config = new FileInputConfig().
+ showUpload(false).showRemove(false).showPreview(false);
+ String language = SyncopeConsoleSession.get().getLocale().getLanguage();
+ if (!Locale.ENGLISH.getLanguage().equals(language)) {
+ config.withLocale(language);
+ }
+ BootstrapFileInputField fileUpload =
new BootstrapFileInputField("fileUpload", new ListModel<>(new ArrayList<>()), config);
fileUpload.setOutputMarkupId(true);
fileUpload.add(new AjaxFormSubmitBehavior(Constants.ON_CHANGE) {
[syncope] 02/02: Upgrading Elasticsearch, Log4J, FOP
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 39130e54b0bf58df56cf4355a93c9deee925ecc6
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 10:04:26 2020 +0200
Upgrading Elasticsearch, Log4J, FOP
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 663cb47..5bde9ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,12 +430,12 @@ under the License.
<slf4j.version>1.7.30</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>6.8.8</elasticsearch.version>
+ <elasticsearch.version>6.8.9</elasticsearch.version>
<apacheds.version>2.0.0.AM26</apacheds.version>
<apachedirapi.version>2.0.0</apachedirapi.version>
- <log4j.version>2.13.2</log4j.version>
+ <log4j.version>2.13.3</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
<commons-io.version>2.6</commons-io.version>
@@ -1202,7 +1202,7 @@ under the License.
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>fop</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>