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/04/07 06:51:36 UTC
[syncope] 01/03: Merge branch 'master' of github.com:apache/syncope
into SYNCOPE-163-1
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 90cd990a1700d685e61ef79d5d5df83e75f02e8c
Merge: d3256e0 eaaf545
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Apr 6 19:45:48 2020 +0430
Merge branch 'master' of github.com:apache/syncope into SYNCOPE-163-1
# Conflicts:
# pom.xml
.../console/panels/GatewayRouteDirectoryPanel.java | 4 +-
...AnyDirectoryPanelAdditionalActionsProvider.java | 4 +-
.../console/panels/LinkedAccountModalPanel.java | 4 +-
.../console/panels/RemediationDirectoryPanel.java | 4 +-
.../policies/ProvisioningPolicyModalPanel.java | 2 +-
.../client/console/status/ReconTaskPanel.java | 2 +-
.../console/topology/TopologyTogglePanel.java | 12 +--
.../wizards/resources/AbstractConnConfPanel.java | 2 +-
.../wizards/resources/ResourceProvisionPanel.java | 6 +-
.../ui/commons/StyledNotificationBehavior.java | 6 +-
.../commons/markup/html/form/AjaxPaletteConf.java | 37 --------
.../commons/markup/html/form/AjaxPalettePanel.java | 16 +++-
.../ui/commons/panels/NotificationPanel.java | 6 +-
.../ui/commons/panels/NotificationPanel.html | 10 +-
.../syncope/client/console/batch/BatchContent.java | 2 +-
.../notifications/MailTemplateDirectoryPanel.java | 4 +-
.../notifications/NotificationDirectoryPanel.java | 2 +-
.../console/notifications/TemplateModal.java | 2 +-
.../syncope/client/console/pages/Realms.java | 4 +-
.../client/console/panels/AbstractLogsPanel.java | 2 +-
.../console/panels/AccessTokenDirectoryPanel.java | 2 +-
.../console/panels/AnyObjectDirectoryPanel.java | 4 +-
.../client/console/panels/AnyTypeClassesPanel.java | 4 +-
.../client/console/panels/AnyTypesPanel.java | 4 +-
.../console/panels/ApplicationDirectoryPanel.java | 2 +-
.../console/panels/ApplicationModalPanel.java | 2 +-
.../panels/DisplayAttributesModalPanel.java | 2 +-
.../panels/DomainAdminCredentialsPanel.java | 4 +-
.../console/panels/DomainDirectoryPanel.java | 2 +-
.../console/panels/DomainPoolModalPanel.java | 2 +-
.../console/panels/DynRealmDirectoryPanel.java | 2 +-
.../client/console/panels/DynRealmModalPanel.java | 2 +-
.../client/console/panels/GroupDirectoryPanel.java | 9 +-
.../panels/ImplementationDirectoryPanel.java | 2 +-
.../console/panels/ImplementationModalPanel.java | 2 +-
.../console/panels/ParametersDirectoryPanel.java | 2 +-
.../console/panels/PrivilegeDirectoryPanel.java | 2 +-
.../console/panels/RelationshipTypesPanel.java | 4 +-
.../client/console/panels/RoleDirectoryPanel.java | 4 +-
.../client/console/panels/SchemaTypePanel.java | 2 +-
.../panels/SecurityQuestionsModalPanel.java | 2 +-
.../console/panels/SecurityQuestionsPanel.java | 2 +-
.../client/console/panels/StartAtTogglePanel.java | 2 +-
.../panels/TypeExtensionDirectoryPanel.java | 2 +-
.../client/console/panels/UserDirectoryPanel.java | 8 +-
.../console/policies/PolicyDirectoryPanel.java | 2 +-
.../console/policies/PolicyModalPanelBuilder.java | 2 +-
.../console/policies/PolicyRuleDirectoryPanel.java | 2 +-
.../console/reports/ReportDirectoryPanel.java | 2 +-
.../reports/ReportTemplateDirectoryPanel.java | 4 +-
.../console/reports/ReportletDirectoryPanel.java | 2 +-
.../client/console/status/ChangePasswordModal.java | 2 +-
.../console/tasks/ExecutionsDirectoryPanel.java | 2 +-
.../tasks/NotificationTaskDirectoryPanel.java | 4 +-
.../tasks/PropagationTaskDirectoryPanel.java | 4 +-
.../console/tasks/SchedTaskDirectoryPanel.java | 2 +-
.../console/tasks/TaskStartAtTogglePanel.java | 2 +-
.../client/console/widgets/JobActionPanel.java | 4 +-
.../syncope/client/console/widgets/JobWidget.java | 2 +-
.../console/widgets/ReconciliationWidget.java | 2 +-
.../client/console/wizards/WizardMgtPanel.java | 2 +-
core/provisioning-api/pom.xml | 6 ++
.../provisioning/api/jexl/ClassFreeUberspect.java | 41 --------
.../provisioning/api/jexl/EmptyClassLoader.java | 1 -
.../core/provisioning/api/jexl/JexlUtils.java | 5 +-
.../provisioning/api/jexl/SandboxUberspect.java | 105 +++++++++++++++++++++
.../provisioning/api}/jexl/MailTemplateTest.java | 65 ++++++++-----
.../core/provisioning/api}/jexl/MappingTest.java | 55 +++--------
.../src/test/resources/simplelogger.properties | 21 +++++
.../notification/DefaultNotificationManager.java | 2 +-
docker/wa/pom.xml | 2 +-
.../console/panels/CamelRoutesDirectoryPanel.java | 3 +-
.../console/panels/BpmnProcessDirectoryPanel.java | 4 +-
.../client/console/panels/NewBpmnProcess.java | 2 +-
.../console/panels/UserRequestDirectoryPanel.java | 2 +-
.../panels/UserRequestFormDirectoryPanel.java | 4 +-
.../console/panels/UserRequestFormModal.java | 2 +-
.../panels/OIDCProvidersDirectoryPanel.java | 2 +-
.../client/console/panels/ImportMetadata.java | 2 +-
.../console/panels/SAML2IdPsDirectoryPanel.java | 2 +-
.../syncope/client/console/pages/SCIMConfPage.java | 2 +-
.../apache/syncope/fit/core/PullTaskITCase.java | 3 +-
.../org/apache/syncope/fit/ui/AbstractUITCase.java | 6 +-
fit/wa-reference/pom.xml | 26 ++---
pom.xml | 21 +++--
wa/pom.xml | 2 +-
86 files changed, 348 insertions(+), 284 deletions(-)
diff --cc docker/wa/pom.xml
index c85a2ee,c85a2ee..d971fb7
--- a/docker/wa/pom.xml
+++ b/docker/wa/pom.xml
@@@ -34,7 -34,7 +34,7 @@@ under the License
<packaging>war</packaging>
<properties>
-- <opensaml.version>3.4.5</opensaml.version>
++ <opensaml.version>4.0.0</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
diff --cc fit/wa-reference/pom.xml
index e9973a5,e9973a5..5483bfa
--- a/fit/wa-reference/pom.xml
+++ b/fit/wa-reference/pom.xml
@@@ -34,7 -34,7 +34,7 @@@ under the License
<packaging>war</packaging>
<properties>
-- <opensaml.version>3.4.5</opensaml.version>
++ <opensaml.version>4.0.0</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
<ianal.skip>true</ianal.skip>
@@@ -144,18 -144,18 +144,18 @@@
<context>syncope</context>
</properties>
</deployable>
-- <deployable>
-- <location>${basedir}/../console-reference/target/syncope-fit-console-reference-${project.version}</location>
-- <properties>
-- <context>syncope-console</context>
-- </properties>
-- </deployable>
-- <deployable>
-- <location>${basedir}/../enduser-reference/target/syncope-fit-enduser-reference-${project.version}</location>
-- <properties>
-- <context>syncope-enduser</context>
-- </properties>
-- </deployable>
++<!-- <deployable>-->
++<!-- <location>${basedir}/../console-reference/target/syncope-fit-console-reference-${project.version}</location>-->
++<!-- <properties>-->
++<!-- <context>syncope-console</context>-->
++<!-- </properties>-->
++<!-- </deployable>-->
++<!-- <deployable>-->
++<!-- <location>${basedir}/../enduser-reference/target/syncope-fit-enduser-reference-${project.version}</location>-->
++<!-- <properties>-->
++<!-- <context>syncope-enduser</context>-->
++<!-- </properties>-->
++<!-- </deployable>-->
<deployable>
<location>${project.build.directory}/${project.build.finalName}</location>
<properties>
diff --cc pom.xml
index b740e4f,6e8742b..df66a6e
--- a/pom.xml
+++ b/pom.xml
@@@ -2022,6 -1982,6 +2028,7 @@@ under the License
<version>9.4.20.v20190813</version>
<scope>test</scope>
</dependency>
++
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
diff --cc wa/pom.xml
index 474e323,474e323..aabd08d
--- a/wa/pom.xml
+++ b/wa/pom.xml
@@@ -33,7 -33,7 +33,7 @@@ under the License
<packaging>pom</packaging>
<properties>
-- <opensaml.version>3.4.5</opensaml.version>
++ <opensaml.version>4.0.0</opensaml.version>
<bootstrap.version>4.4.1</bootstrap.version>
<rootpom.basedir>${basedir}/..</rootpom.basedir>