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:04 UTC
[syncope] branch master updated (a2abb31 -> 8cabc12)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from a2abb31 SYNCOPE-1559: Support GoogleAuth MFA configuration (#187)
new bd0c0d5 [SYNCOPE-1560] Missing update for SAML metadata import
new 8cabc12 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:
.../client/console/panels/ImportMetadata.java | 20 ++++++++++----------
pom.xml | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
[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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 8cabc12320144c71173d734ff042eea097de644f
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 09:41:39 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 7a7ea3f..ddee365 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,12 +433,12 @@ under the License.
<slf4j.version>2.0.0-alpha1</slf4j.version>
<opensaml.version>3.3.1</opensaml.version>
- <elasticsearch.version>7.6.2</elasticsearch.version>
+ <elasticsearch.version>7.7.0</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-jexl.version>3.1</commons-jexl.version>
@@ -1374,7 +1374,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>
[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 master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit bd0c0d5c280b9582059c76fce283971006d4f8af
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu May 14 09:21:44 2020 +0200
[SYNCOPE-1560] Missing update for SAML metadata import
---
.../client/console/panels/ImportMetadata.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 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 a7beeec..f8c831d 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.ui.commons.Constants;
@@ -42,22 +43,21 @@ public class ImportMetadata extends TogglePanel<Serializable> {
private static final long serialVersionUID = 6959177759869415782L;
- 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);
- config.browseClass("btn btn-success");
- config.browseIcon("<i class=\"fas fa-folder-open\"></i> ");
+ FileInputConfig config = new FileInputConfig().
+ showUpload(false).showRemove(false).showPreview(false).
+ browseClass("btn btn-success").browseIcon("<i class=\"fas fa-folder-open\"></i> ");
+ 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);