You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/16 15:56:17 UTC
[syncope] 31/36: Merge branch 'SYNCOPE-1545' of
github.com:apache/syncope into SYNCOPE-1545
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-1545
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1083f7b14b9272dc6b2ee7209a55d3cae8c40ecc
Merge: 2dbd417 264b270
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 16 10:43:35 2020 +0330
Merge branch 'SYNCOPE-1545' of github.com:apache/syncope into SYNCOPE-1545
# Conflicts:
# pom.xml
# wa/pom.xml
# wa/src/main/java/org/apache/syncope/wa/config/SyncopeWAConfiguration.java
archetype/pom.xml | 32 +++++
.../META-INF/maven/archetype-metadata.xml | 13 ++
.../main/resources/archetype-resources/fit/pom.xml | 12 +-
.../main/resources/archetype-resources/wa/pom.xml | 134 +++++++++++++++++++++
.../wa/src/test/resources/keymaster.properties | 19 +++
archetype/src/main/resources/meta-pom.xml | 7 ++
...AnyDirectoryPanelAdditionalActionsProvider.java | 25 ++--
.../console/wizards/CSVPushWizardBuilder.java | 16 ++-
.../client/ui/commons/HttpResourceStream.java | 44 ++-----
.../ResponseHolder.java} | 51 ++------
.../client/ui/commons/wizards/AjaxWizard.java | 97 ++++++++-------
.../ui/commons/wizards/AjaxWizardBuilder.java | 19 ++-
.../client/console/SerializableSupplier.java | 26 ----
.../syncope/client/console/pages/BasePage.java | 5 +-
.../console/reports/ReportExecutionDetails.java | 21 ++--
.../console/tasks/SchedTaskDirectoryPanel.java | 14 ++-
.../wicket/ajax/form/AjaxDownloadBehavior.java | 19 ++-
.../wicket/markup/html/form/BinaryFieldPanel.java | 3 +-
.../wicket/markup/html/link/VeilPopupSettings.java | 3 +-
.../enduser/markup/html/form/BinaryFieldPanel.java | 4 +-
.../enduser/wizards/any/AnyWizardBuilder.java | 5 +-
.../client/lib/SyncopeClientFactoryBean.java | 1 +
.../core/provisioning/java/VirAttrHandlerImpl.java | 2 +-
.../client/console/panels/SAML2SPPanel.java | 5 +-
pom.xml | 24 ++--
wa/pom.xml | 6 +-
.../syncope/wa/config/SyncopeWAConfiguration.java | 11 +-
27 files changed, 394 insertions(+), 224 deletions(-)
diff --cc pom.xml
index 6ebf813,bfc1ce0..439c774
--- a/pom.xml
+++ b/pom.xml
@@@ -444,9 -445,7 +445,8 @@@ under the License
<commons-lang.version>3.9</commons-lang.version>
<commons-text.version>1.8</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
-
+ <batik.version>1.10</batik.version>
+ <tika.version>1.23</tika.version>
-
<joda.version>2.10.5</joda.version>
<cas.version>6.2.0-SNAPSHOT</cas.version>
diff --cc wa/pom.xml
index 56c3193,fe7a713..a4ced9b
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@@ -423,3 -422,3 +422,4 @@@ under the License
</repository>
</repositories>
</project>
++</project>