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:35 UTC
[syncope] branch SYNCOPE-163-1 updated (f1e3b82 -> 93dd93b)
This is an automated email from the ASF dual-hosted git repository.
mmoayyed pushed a change to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from f1e3b82 [SYNCOPE-160] Some new tests for authentication modules
add f305efe Upgrading CXF and Elasticsearch
add 6e322cc Upgrading Spring Security
add a6ad400 Upgrading Swagger Core
add 4e0f696 [SYNCOPE-1466] Attempting to make PullTaskITCase#reconcileFromLDAP more stable
add da8bd88 [SYNCOPE-1466] Further attempt to make PullTaskITCase#reconcileFromLDAP more stable
add 012dfac Sandboxing JEXL (#171)
add 572a173 Upgrading gmavenplus-plugin
add cfded7f Upgrading greenmail and bcpkix-jdk15on
add 0308336 [SYNCOPE-1551] info and success are not the same anymore
add 0cf03be Upgrading Camel
add eaaf545 [SYNCOPE-1551] Missing update
new 90cd990 Merge branch 'master' of github.com:apache/syncope into SYNCOPE-163-1
new 27cce8f Merge branch 'SYNCOPE-163-1' of github.com:apache/syncope into SYNCOPE-163-1
new 93dd93b fix issues with merge
The 3 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:
.../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 | 1 -
.../notification/DefaultNotificationManager.java | 2 +-
docker/wa/pom.xml | 2 +-
docker/wa/src/main/resources/wa.properties | 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 ++---
fit/wa-reference/src/main/resources/wa.properties | 2 +-
pom.xml | 18 ++--
wa/pom.xml | 2 +-
wa/starter/src/main/resources/wa.properties | 2 +-
89 files changed, 325 insertions(+), 290 deletions(-)
delete mode 100644 client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPaletteConf.java
delete mode 100644 core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/ClassFreeUberspect.java
create mode 100644 core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java
rename core/{provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java => provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api}/jexl/MailTemplateTest.java (58%)
rename core/{provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java => provisioning-api/src/test/java/org/apache/syncope/core/provisioning/api}/jexl/MappingTest.java (54%)
copy core/{persistence-jpa-json => provisioning-api}/src/test/resources/simplelogger.properties (92%)
[syncope] 03/03: fix issues with merge
Posted by mm...@apache.org.
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 93dd93bff63e792fea6e4b49e1a510f120526101
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Apr 6 22:06:31 2020 +0430
fix issues with merge
---
docker/wa/src/main/resources/wa.properties | 2 +-
fit/wa-reference/src/main/resources/wa.properties | 2 +-
pom.xml | 9 +--------
wa/starter/src/main/resources/wa.properties | 2 +-
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/docker/wa/src/main/resources/wa.properties b/docker/wa/src/main/resources/wa.properties
index a208075..c44b04e 100644
--- a/docker/wa/src/main/resources/wa.properties
+++ b/docker/wa/src/main/resources/wa.properties
@@ -22,4 +22,4 @@ useGZIPCompression=true
# Conf directories
conf.directory=${conf.directory}
cas.standalone.configurationDirectory=${conf.directory}
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
diff --git a/fit/wa-reference/src/main/resources/wa.properties b/fit/wa-reference/src/main/resources/wa.properties
index b04cb13..30c0e6d 100644
--- a/fit/wa-reference/src/main/resources/wa.properties
+++ b/fit/wa-reference/src/main/resources/wa.properties
@@ -27,7 +27,7 @@ cas.server.name=http://localhost:8080
cas.server.prefix=${cas.server.name}/syncope-wa
cas.server.scope=syncope.org
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
cas.authn.samlIdp.entityId=https://syncope.apache.org/saml
cas.authn.samlIdp.metadata.location=file:${conf.directory}
diff --git a/pom.xml b/pom.xml
index df66a6e..a8ed627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1990,11 +1990,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.64</version>
+ <version>1.65</version>
</dependency>
<!-- TEST -->
@@ -2017,12 +2016,6 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>1.65</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
<version>9.4.20.v20190813</version>
diff --git a/wa/starter/src/main/resources/wa.properties b/wa/starter/src/main/resources/wa.properties
index 3f68633..2640374 100644
--- a/wa/starter/src/main/resources/wa.properties
+++ b/wa/starter/src/main/resources/wa.properties
@@ -27,7 +27,7 @@ cas.server.name=http://localhost:8080
cas.server.prefix=${cas.server.name}/syncope-wa
cas.server.scope=syncope.org
-cas.authn.oidc.jwksFile=file:${conf.directory}/oidc.keystore
+cas.authn.oidc.jwks.jwksFile=file:${conf.directory}/oidc.keystore
cas.authn.samlIdp.entityId=https://syncope.apache.org/saml
cas.authn.samlIdp.metadata.location=file:${conf.directory}
[syncope] 01/03: Merge branch 'master' of github.com:apache/syncope
into SYNCOPE-163-1
Posted by mm...@apache.org.
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>
[syncope] 02/03: Merge branch 'SYNCOPE-163-1' of
github.com:apache/syncope into SYNCOPE-163-1
Posted by mm...@apache.org.
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 27cce8fcbd2f40126f7356c3302ee2c84a9834d2
Merge: 90cd990 f1e3b82
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Apr 6 19:46:29 2020 +0430
Merge branch 'SYNCOPE-163-1' of github.com:apache/syncope into SYNCOPE-163-1
.../core/persistence/jpa/inner/AuthModuleTest.java | 129 ++++++++++++++
.../apache/syncope/fit/core/AuthModuleITCase.java | 187 ++++++++++++++++++++-
2 files changed, 314 insertions(+), 2 deletions(-)