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 2022/01/23 17:59:21 UTC

[syncope] branch master updated: Adjusting website for upcoming release

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


The following commit(s) were added to refs/heads/master by this push:
     new f029f8e  Adjusting website for upcoming release
f029f8e is described below

commit f029f8e6a3aa549af10b665809b08f0d95128788
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Sun Jan 23 18:59:08 2022 +0100

    Adjusting website for upcoming release
---
 NOTICE                                             |   2 +-
 client/idrepo/console/NOTICE                       |   2 +-
 .../syncope/core/rest/cxf/AddETagFilter.java       |   2 +-
 .../provisioning/java/ProvisioningContext.java     |   3 +-
 docker/console/NOTICE                              |   2 +-
 docker/core/NOTICE                                 |   2 +-
 docker/enduser/NOTICE                              |   2 +-
 docker/wa/NOTICE                                   |   2 +-
 fit/build-tools/NOTICE                             |   2 +-
 pom.xml                                            |  29 +--
 sra/NOTICE                                         |   2 +-
 .../asciidoc/getting-started/introduction.adoc     |   4 +-
 .../reference-guide/architecture/core.adoc         |   6 +-
 .../reference-guide/concepts/extensions.adoc       |   4 +-
 .../reference-guide/concepts/workflow.adoc         |  16 +-
 src/site/site.xml                                  |  17 +-
 src/site/xdoc/architecture.xml                     |  36 ++-
 src/site/xdoc/building.xml                         |  66 +++--
 src/site/xdoc/contributing.xml                     |  22 +-
 src/site/xdoc/demo.xml                             |  50 ++--
 src/site/xdoc/docs/index.xml                       |  38 ++-
 src/site/xdoc/downloads.xml                        | 189 +++++----------
 src/site/xdoc/iam-scenario.xml                     |  10 +-
 src/site/xdoc/index.xml                            |  47 ++--
 src/site/xdoc/integration.xml                      |   8 +-
 src/site/xdoc/mailing-lists.xml                    |   9 +-
 src/site/xdoc/release-process.xml                  | 266 ++++++++-------------
 src/site/xdoc/security.xml                         | 205 ++++++++++++++--
 standalone/NOTICE                                  |   2 +-
 29 files changed, 520 insertions(+), 525 deletions(-)

diff --git a/NOTICE b/NOTICE
index 7f61565..20545c5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/client/idrepo/console/NOTICE b/client/idrepo/console/NOTICE
index aca8d35..bde9318 100644
--- a/client/idrepo/console/NOTICE
+++ b/client/idrepo/console/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/AddETagFilter.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/AddETagFilter.java
index 98b1db2..044be62 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/AddETagFilter.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/AddETagFilter.java
@@ -31,7 +31,7 @@ import org.apache.syncope.common.lib.to.EntityTO;
 import org.apache.syncope.common.lib.to.ProvisioningResult;
 
 /**
- * Adds the {@code ETag} header to any response containing an instance of {@link AbstractAnnotatedBean} as entity.
+ * Adds the {@code ETag} header to any response containing an instance of {@link AnyTO} as entity.
  * The actual ETag value is computed on the basis of last change date (or creation date if not available).
  */
 @Provider
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
index c3f267b..7581dbb 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
@@ -219,7 +219,8 @@ public class ProvisioningContext {
 
     /**
      * Annotated as {@code @Primary} because it will be used by {@code @Async} in {@link AsyncConnectorFacade}.
-     *
+     * @param provisioningProperties configuration properties
+     * 
      * @return executor
      */
     @Bean
diff --git a/docker/console/NOTICE b/docker/console/NOTICE
index c225d43..31bfec0e 100644
--- a/docker/console/NOTICE
+++ b/docker/console/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/docker/core/NOTICE b/docker/core/NOTICE
index 84f79a0..85b8b06 100644
--- a/docker/core/NOTICE
+++ b/docker/core/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/docker/enduser/NOTICE b/docker/enduser/NOTICE
index 5ccb5c5..accf9c5 100644
--- a/docker/enduser/NOTICE
+++ b/docker/enduser/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/docker/wa/NOTICE b/docker/wa/NOTICE
index 7f61565..20545c5 100644
--- a/docker/wa/NOTICE
+++ b/docker/wa/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/fit/build-tools/NOTICE b/fit/build-tools/NOTICE
index 30ad96c..e0e1f08 100644
--- a/fit/build-tools/NOTICE
+++ b/fit/build-tools/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index 62b8014..1935696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2665,6 +2665,7 @@ under the License.
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctor-maven-plugin</artifactId>
             <version>2.2.1</version>
+            <inherited>false</inherited>
             <dependencies>
               <dependency>
                 <groupId>org.asciidoctor</groupId>
@@ -2704,7 +2705,7 @@ under the License.
                 <configuration>
                   <sourceDocumentName>getting-started/getting-started.adoc</sourceDocumentName>
                   <baseDir>${rootpom.basedir}/src/main/asciidoc/getting-started</baseDir>
-                  <backend>html</backend>
+                  <backend>html5</backend>
                   <attributes>
                     <title>Apache Syncope ${project.version} - Getting Started</title>
                     <imagesdir>images</imagesdir>
@@ -2737,7 +2738,7 @@ under the License.
                 <configuration>
                   <sourceDocumentName>reference-guide/reference-guide.adoc</sourceDocumentName>
                   <baseDir>${rootpom.basedir}/src/main/asciidoc/reference-guide</baseDir>
-                  <backend>html</backend>
+                  <backend>html5</backend>
                   <attributes>
                     <title>Apache Syncope ${project.version} - Reference Guide</title>
                     <imagesdir>images</imagesdir>
@@ -2773,30 +2774,6 @@ under the License.
               <generateProjectInfo>false</generateProjectInfo>
             </configuration>
           </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>fix-FacebookLike-width</id>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <phase>post-site</phase>
-                <configuration>
-                  <target>
-                    <replace dir="${rootpom.basedir}/target/site" token="48px" value="72px">
-                      <include name="**/*.html" />
-                    </replace>
-                    <replace dir="${rootpom.basedir}/target/site" token="dropdown-toggle&quot;" value="dropdown-toggle&quot; data-toggle=&quot;dropdown&quot;">
-                      <include name="**/*.html" />
-                    </replace>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/sra/NOTICE b/sra/NOTICE
index 7f61565..20545c5 100644
--- a/sra/NOTICE
+++ b/sra/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/src/main/asciidoc/getting-started/introduction.adoc b/src/main/asciidoc/getting-started/introduction.adoc
index 769f17f..d0c941a 100644
--- a/src/main/asciidoc/getting-started/introduction.adoc
+++ b/src/main/asciidoc/getting-started/introduction.adoc
@@ -139,10 +139,10 @@ features (notifications, reports and auditing)
 representation of Users, Groups and Any Objects. +
 This component often needs to be tailored to meet the requirements of a specific deployment, as it is the crucial decision 
 point for defining and enforcing the consistency and transformations between internal and external data. The default
-all-Java implementation can be extended for this purpose. In addition, an http://camel.apache.org/[Apache Camel^]-based 
+all-Java implementation can be extended for this purpose. In addition, an https://camel.apache.org/[Apache Camel^]-based 
 implementation is also available as an extension, which brings all the power of runtime changes and adaptation.
  * *_Workflow_*  is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred engine
-from a provided list - including one based on http://www.flowable.org/[Flowable^], the reference open source
+from a provided list - including one based on https://www.flowable.org/[Flowable^], the reference open source
 http://www.bpmn.org/[BPMN 2.0^] implementations - or define new, custom ones. 
  * *_Persistence_* manages all data (users, groups, attributes, resources, ...) at a high level 
 using a standard https://en.wikipedia.org/wiki/Java_Persistence_API[JPA 2.2^] approach. The data is persisted to an underlying 
diff --git a/src/main/asciidoc/reference-guide/architecture/core.adoc b/src/main/asciidoc/reference-guide/architecture/core.adoc
index b8ddaa1..ca4aa5b 100644
--- a/src/main/asciidoc/reference-guide/architecture/core.adoc
+++ b/src/main/asciidoc/reference-guide/architecture/core.adoc
@@ -62,7 +62,7 @@ The default implementation can be sometimes tailored to meet the requirements of
 it is the crucial decision point for defining and enforcing the consistency and transformations between internal and 
 external data.
 
-In addition, an http://camel.apache.org/[Apache Camel^]-based implementation is also available as an 
+In addition, an https://camel.apache.org/[Apache Camel^]-based implementation is also available as an 
 <<apache-camel-provisioning-manager,extension>>, which brings all the power of runtime changes and adaptation.
 
 [[workflow-layer]]
@@ -70,10 +70,10 @@ In addition, an http://camel.apache.org/[Apache Camel^]-based implementation is
 
 The Workflow layer is responsible for managing the internal lifecycle of Users, Groups and Any Objects.
 
-Besides the default engine, another engine is available based on http://www.flowable.org/[Flowable^], the 
+Besides the default engine, another engine is available based on https://www.flowable.org/[Flowable^], the 
 reference open source http://www.bpmn.org/[BPMN 2.0^] implementation. It enables advanced features such
 as approval management and new statuses definitions; a web-based GUI editor, the
-http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^], is also available.
+https://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^], is also available.
 
 [.text-center]
 image::userWorkflow.png[title="Default Flowable user workflow",alt="Default Flowable user workflow"] 
diff --git a/src/main/asciidoc/reference-guide/concepts/extensions.adoc b/src/main/asciidoc/reference-guide/concepts/extensions.adoc
index 04e7d55..ee8c32e 100644
--- a/src/main/asciidoc/reference-guide/concepts/extensions.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/extensions.adoc
@@ -36,7 +36,7 @@ ones detailed below;
 ==== Apache Camel Provisioning Manager
 
 This extension delegates the <<provisioning,provisioning>> process execution to a set of
-http://camel.apache.org[Apache Camel^] routes.
+https://camel.apache.org[Apache Camel^] routes.
 
 The pre-loaded routes can be dynamically changed at runtime via REST or admin console, and modifications are immediately
 made available for processing.
@@ -44,7 +44,7 @@ made available for processing.
 For example, on creating a new user, you may wish to send an email to an administrator; or if a user is
 reactivated, you may wish to reactivate the user's home page on a web server. +
 All these things and more are possible using the myriad of
-http://camel.apache.org/components.html[components^] that are available to be used in Apache Camel routes.
+https://camel.apache.org/components.html[components^] that are available to be used in Apache Camel routes.
 
 [NOTE]
 .Extension Sources
diff --git a/src/main/asciidoc/reference-guide/concepts/workflow.adoc b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
index 37ad355..69e7ec5 100644
--- a/src/main/asciidoc/reference-guide/concepts/workflow.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
@@ -99,7 +99,7 @@ endif::[]
 
 ==== Flowable User Workflow Adapter
 
-An advanced adapter is provided for Users, based on http://www.flowable.org/[Flowable^], one of reference open
+An advanced adapter is provided for Users, based on https://www.flowable.org/[Flowable^], one of reference open
 source http://www.bpmn.org/[BPMN 2.0^] implementations.
 
 The
@@ -120,11 +120,11 @@ and presents several advantages and more features, if compared to the default us
 
 . Besides mandatory statuses, which are modeled as BPMN `userTask` instances, more can be freely added
 at runtime, provided that adequate transitions and conditions are also inserted; more details about available BPMN
-constructs are available in the http://www.flowable.org/docs/userguide/index.html#bpmnConstructs[Flowable User Guide^]. +
+constructs are available in the https://www.flowable.org/docs/userguide/index.html#bpmnConstructs[Flowable User Guide^]. +
 Additional statuses and transitions allow the internal processes of Apache Syncope to better adapt to suit organizational flows.
 . Custom logic can be injected into the workflow process by providing BPMN `serviceTask` instances.
-. http://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^] are used for implementing <<approval,approval>>.
-. The http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^] is available with the
+. https://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^] are used for implementing <<approval,approval>>.
+. The https://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^] is available with the
 <<admin-console,admin console>>, thus allowing web-based graphical modeling of the workflow definition.
 
 [.text-center]
@@ -139,7 +139,7 @@ might not be allowed to 'plain' Users, as there could be conditions which requir
 Managers could also be asked to complete the information provided before the requested operation is finished.
 
 In order to define an approval form, a dedicated BPMN `userTask` needs to be defined, following the rules established
-for http://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^].
+for https://www.flowable.org/docs/userguide/index.html#forms[Flowable forms^].
 
 [NOTE]
 .What is required for administrators to manage approval?
@@ -153,7 +153,7 @@ The following conditions must be met, for an User `U` to act as administrator fo
 .. `USER_READ`
 . The BPMN `userTask` must either indicate `U` among `candidateUsers` or at least one of the groups assigned to `U`
 among `candidateGroups`, as required by
-http://www.flowable.org/docs/userguide/index.html#bpmnUserTaskUserAssignmentExtension[Flowable's task assignment rules^]
+https://www.flowable.org/docs/userguide/index.html#bpmnUserTaskUserAssignmentExtension[Flowable's task assignment rules^]
 
 The special super-user `admin` is entitled to manage all approvals, even those not specifying any
 `candidateUsers` or `candidateGroups`.
@@ -163,7 +163,7 @@ The special super-user `admin` is entitled to manage all approvals, even those n
 .Approving self-registration
 ====
 The snippet below shows how to define an approval form in XML; the same operation can be performed via the
-http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^].
+https://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^].
 
 [source,xml]
 ----
@@ -210,7 +210,7 @@ which might also include one or more <<approval,approval>> steps.
 .Assigning printer to user
 ====
 The BPMN process below shows how to define an user request in XML; the same operation can be performed via the
-http://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^].
+https://www.flowable.org/docs/userguide/index.html#flowableModelerApp[Flowable Modeler^].
 
 In this user request definition:
 
diff --git a/src/site/site.xml b/src/site/site.xml
index 335b102..b859f90 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -30,7 +30,7 @@ under the License.
   <skin>
     <groupId>org.apache.maven.skins</groupId>
     <artifactId>maven-fluido-skin</artifactId>
-    <version>1.5</version>
+    <version>1.10.0</version>
   </skin>
   <custom>
     <fluidoSkin>
@@ -46,13 +46,12 @@ under the License.
         <showFollowers>false</showFollowers>
       </twitter>
       <facebookLike/>
-      <googlePlusOne/>
     </fluidoSkin>
   </custom>
   
   <body>
     <breadcrumbs>
-      <item name="Apache" href="http://www.apache.org/"/>
+      <item name="Apache" href="https://www.apache.org/"/>
       <item name="Apache Syncope" href="https://syncope.apache.org/"/>
     </breadcrumbs>
         
@@ -70,7 +69,7 @@ under the License.
     </menu>
         
     <menu name="Development">
-      <item name="Roadmap" href="http://cwiki.apache.org/confluence/display/SYNCOPE/Roadmap"/>
+      <item name="Roadmap" href="https://cwiki.apache.org/confluence/display/SYNCOPE/Roadmap"/>
       <item name="How to contribute?" href="contributing"/>
       <item name="Source Repository" href="source-repository"/>
       <item name="Continuous Integration" href="integration"/>
@@ -80,15 +79,15 @@ under the License.
     </menu>
 
     <menu name="ASF">
-      <item name="How Apache Works" href="http://www.apache.org/foundation/how-it-works"/>
-      <item name="Foundation" href="http://www.apache.org/foundation/"/>
-      <item name="Sponsoring Apache" href="http://www.apache.org/foundation/sponsorship"/>
-      <item name="Thanks" href="http://www.apache.org/foundation/thanks"/>
+      <item name="How Apache Works" href="https://www.apache.org/foundation/how-it-works"/>
+      <item name="Foundation" href="https://www.apache.org/foundation/"/>
+      <item name="Sponsoring Apache" href="https://www.apache.org/foundation/sponsorship"/>
+      <item name="Thanks" href="https://www.apache.org/foundation/thanks"/>
     </menu>
 
     <footer>
       <![CDATA[
-Copyright &copy; 2021, the Apache Software Foundation.<br/>
+Copyright &copy; 2022, the Apache Software Foundation.<br/>
 Apache, Syncope, Apache Syncope, the Apache feather logo and the Apache Syncope project logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.
     
     <div class="pull-right">
diff --git a/src/site/xdoc/architecture.xml b/src/site/xdoc/architecture.xml
index 9082a1b..4fcaff5 100644
--- a/src/site/xdoc/architecture.xml
+++ b/src/site/xdoc/architecture.xml
@@ -35,6 +35,12 @@ under the License.
       
       <p>
         <strong>
+          <em>Keymaster</em>
+        </strong> allows for dynamic service discovery so that other components are able to find each other.
+      </p>
+
+      <p>
+        <strong>
           <em>Admin UI</em>
         </strong> is the web-based console for configuring and administering running deployments, with full support
         for delegated administration.
@@ -43,14 +49,21 @@ under the License.
       <p>
         <strong>
           <em>End-user UI</em>
-        </strong> is the web-based application for self-registration, self-service and password reset
+        </strong> is the web-based application for self-registration, self-service and password reset.
+      </p>
+
+      <p>
+        <strong>
+          <em>Web Access</em>
+        </strong> is the Access Management component, based on
+        <a target="_blank" href="https://apereo.github.io/cas/">Apereo CAS</a>.
       </p>
 
       <p>
         <strong>
-          <em>CLI</em>
-        </strong> is the command-line application for interacting with Apache Syncope from scripts, particularly 
-        useful for system administrators.
+          <em>Secure Remote Access</em>
+        </strong> allows to protect legacy applications by integrating with the Web Access or other third-party
+        Access Managers implementing standard protocols as OpenID Connect or SAML.
       </p>
 
       <p>
@@ -82,7 +95,7 @@ under the License.
             This component often needs to be tailored to meet the requirements of a specific deployment, as it is the 
             crucial decision point for defining and enforcing the consistency and transformations between internal and 
             external data. The default all-Java implementation can be extended for this purpose.
-            In addition, an <a target="_blank" href="http://camel.apache.org/">Apache Camel</a>-based
+            In addition, an <a target="_blank" href="https://camel.apache.org/">Apache Camel</a>-based
             implementation is also available as an extension, which brings all the power of runtime changes and 
             adaptation.
           </p>
@@ -93,8 +106,8 @@ under the License.
               <em>Workflow</em>
             </strong> is one of the pluggable aspects of Apache Syncope: this lets every deployment choose the preferred 
             engine from a provided list - including the one based on 
-            <a target="_blank" href="http://www.flowable.org/">Flowable BPM</a>, the reference open source
-            <a target="_blank" href="http://www.bpmn.org/">BPMN 2.0</a> implementation - or define new, custom ones.
+            <a target="_blank" href="https://www.flowable.org/">Flowable BPM</a>, the reference open source
+            <a target="_blank" href="https://www.bpmn.org/">BPMN 2.0</a> implementation - or define new, custom ones.
           </p>
         </li>
         <li>
@@ -102,15 +115,16 @@ under the License.
             <strong>
               <em>Persistence</em>
             </strong> manages all data (users, groups, attributes, resources, …&#8203;) at a high level
-            using a standard <a target="_blank" href="https://en.wikipedia.org/wiki/Java_Persistence_API">JPA 2.0</a> 
+            using a standard <a target="_blank" href="https://en.wikipedia.org/wiki/Java_Persistence_API">JPA 2.2</a> 
             approach. The data is persisted to an underlying database, referred to as <strong>
               <em>Internal Storage</em>
             </strong>. Consistency is ensured via the comprehensive
-            <a target="_blank" href="http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/transaction.html">transaction management</a>
+            <a target="_blank" href="https://docs.spring.io/spring-framework/docs/5.3.x/reference/html/data-access.html#transaction">transaction management</a>
             provided by the Spring Framework.<br/>
             Globally, this offers the ability to easily scale up to a million entities and at the same time allows great 
             portability with no code changes: MySQL, MariaDB, PostgreSQL, Oracle and MS SQL Server are fully supported 
-            deployment options.
+            deployment options.<br/>
+            Domains allow to manage data belonging to different tenants into separate database instances.
           </p>
         </li>
         <li>
@@ -125,7 +139,7 @@ under the License.
       
       <p>
         Third-party applications are provided full access to IdM services by leveraging the REST interface, either 
-        via the Java <em>SyncopeClient</em> library (the basis of Admin UI, End-user UI and CLI) or plain HTTP calls.
+        via the Java <em>SyncopeClient</em> library (the basis of Admin UI and End-user UI) or plain HTTP calls.
       </p>
       
       <subsection name="ConnId">
diff --git a/src/site/xdoc/building.xml b/src/site/xdoc/building.xml
index d61d6a4..5272b8f 100644
--- a/src/site/xdoc/building.xml
+++ b/src/site/xdoc/building.xml
@@ -35,9 +35,9 @@ under the License.
     <section name="Prerequisites">
       <p>
         <ul>
-          <li>JDK 7 or higher for &le; 2.0; JDK 8 or higher for later versions</li>
+          <li>JDK 8 or higher for &le; 2.1; JDK 11 or higher for later versions</li>
           <li>
-            Latest <a href="http://maven.apache.org/download.html">Apache Maven</a>
+            Latest <a href="https://maven.apache.org/download.html">Apache Maven</a>
           </li>
           <li>
             <a href="source-repository.html">Latest source code</a>
@@ -47,7 +47,7 @@ under the License.
 
       <subsection name="Additional tools">
         <p>
-          The <a href="http://www.gnu.org/software/patch/patch.html">patch</a> program is needed.
+          The <a href="https://www.gnu.org/software/patch/patch.html">patch</a> program is needed.
         </p>
         <p>
           For Debian GNU / Linux and derivatives (as Ubuntu), install with
@@ -73,18 +73,10 @@ under the License.
         Before building Syncope, you need to setup an environment variable to give Maven more memory.
       </p>
       <p>
-        On Unix with JDK 7
-        <source>export MAVEN_OPTS="-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m"</source>
-      </p>
-      <p>
         On Unix with JDK 8 or later
         <source>export MAVEN_OPTS="-Xms512m -Xmx1024m"</source>
       </p>
       <p>
-        On Windows with JDK 7
-        <source>set MAVEN_OPTS=-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</source>
-      </p>
-      <p>
         On Windows with JDK 8 or later
         <source>set MAVEN_OPTS=-Xms512m -Xmx1024m</source>
       </p>
@@ -130,9 +122,9 @@ under the License.
       </p>
       <subsection name="fit/core-reference">
         <h4>Other Content-Type values</h4>
-        By default, integration tests are run using <tt>application/json</tt> for both <tt>Accept</tt> and
-        <tt>Content-Type</tt> HTTP headers; it is possible, however, to use <tt>application/xml</tt> or
-        <tt>application/yaml</tt>.
+        By default, integration tests are run using <code>application/json</code> for both <code>Accept</code> and
+        <code>Content-Type</code> HTTP headers; it is possible, however, to use <code>application/xml</code> or
+        <code>application/yaml</code>.
         <source>$ mvn clean verify -DjaxrsContentType=application/xml</source>
         <source>$ mvn clean verify -DjaxrsContentType=application/yaml</source>
         
@@ -163,25 +155,23 @@ under the License.
         </div>
 
         <h5>PostgreSQL</h5>
-        Perform the full test suite against a real <a href="http://www.postgresql.org/">PostgreSQL</a> database via
-        <source>$ mvn -Ppostgres-it</source>
+        Perform the full test suite against a real <a href="https://www.postgresql.org/">PostgreSQL</a> database via
+        <source>$ mvn -Ppostgres-it</source> or <source>$ mvn -Ppgjsonb-it</source> (for JSONB support)
 
         <h5>MySQL</h5>
-        Perform the full test suite against a real <a href="http://www.mysql.com/">MySQL</a> database via
-        <source>$ mvn -Pmysql-it</source>
+        Perform the full test suite against a real <a href="https://www.mysql.com/">MySQL</a> database via
+        <source>$ mvn -Pmysql-it</source> or <source>$ mvn -Pmyjson-it</source> (for JSON support)
 
         <h5>MariaDB</h5>
-        Perform the full test suite against a <a href="https://mariadb.org/">MariaDB</a> database via
+        Perform the full test suite against a real <a href="https://mariadb.org/">MariaDB</a> database via
         <source>$ mvn -Pmariadb-it</source>
 
         <h5>Oracle database</h5>
-        After having <a href="http://www.mkyong.com/maven/how-to-add-oracle-jdbc-driver-in-your-maven-local-repository/">
-          set up the appropriate JDBC driver in your local Maven repository</a>, perform the full test suite
-        against a real <a href="http://www.oracle.com/products/database/">Oracle</a> database via
+        Perform the full test suite against a real <a href="https://www.oracle.com/products/database/">Oracle</a> database via
         <source>$ mvn -Poracle-it</source>
 
         <h5>MS SQL Server</h5>
-        Prform the full test suite against a real <a href="http://www.microsoft.com/sqlserver/en/us/default.aspx">MS SQL Server</a> database via
+        Prform the full test suite against a real <a href="https://www.microsoft.com/en-us/sql-server/">MS SQL Server</a> database via
         <source>$ mvn -Psqlserver-it</source>
 
         <h4>Java EE containers</h4>
@@ -204,11 +194,11 @@ under the License.
         Perform the full test suite relying on a real <a href="https://www.elastic.co/">Elasticsearch</a> instance via
         <source>$ mvn -Pelasticsearch-it</source>
       </subsection>
-      
+
       <subsection name="fit/console-reference">
         <h4>Debug</h4>
         Starts the full environment used by core's integration tests (with same components available when running new 
-        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, including console) and 
+        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, including Console) and 
         enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
         <source>$ mvn -Pdebug</source>
 
@@ -222,16 +212,10 @@ under the License.
       <subsection name="fit/enduser-reference">
         <h4>Debug</h4>
         Starts the full environment used by core's integration tests (with same components available when running new 
-        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, including console and 
-        enduser) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
+        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, including Console and 
+        Enduser) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
         <source>$ mvn -Pdebug</source>
 
-        <p>
-          Once started in debug mode, the test cases can be executed as follows:
-          <source>$ cd target/enduser-test &amp;&amp; nodejs/node/node nodejs/bin/protractor protractor-conf.js</source>
-          where the actual tests to be run can be selected by modifying the <tt>protractor-conf.js</tt> content.
-        </p>
-
         <h4>HotSwapAgent</h4>
         Similar to Debug, but with <a href="http://hotswapagent.org/">HotSwapAgent</a> features enabled (requires
         <a href="https://github.com/dcevm/dcevm">DCEVM Java</a> installed as "alternative JVM" and IDE of choice
@@ -239,12 +223,18 @@ under the License.
         <source>$ mvn -Photswap</source>
       </subsection>
 
-      <subsection name="ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests">
-        <h4>Eclipse IDE Plugin</h4>
+      <subsection name="fit/wa-reference">
+        <h4>Debug</h4>
         Starts the full environment used by core's integration tests (with same components available when running new 
-        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, and runs the Eclipse IDE
-        plugin tests against it. Cannot run headless.
-        <source>$ mvn -Peclipse-it</source>
+        project in <a href="docs/getting-started.html#paths-and-components">embedded mode</a>, including Console, 
+        Enduser and WA) and enables remote JPDA debugging on port 8000 in the running Java EE container (Tomcat).
+        <source>$ mvn -Pdebug</source>
+
+        <h4>HotSwapAgent</h4>
+        Similar to Debug, but with <a href="http://hotswapagent.org/">HotSwapAgent</a> features enabled (requires
+        <a href="https://github.com/dcevm/dcevm">DCEVM Java</a> installed as "alternative JVM" and IDE of choice
+        <a href="http://hotswapagent.org/mydoc_setup_netbeans.html">set up properly</a>).
+        <source>$ mvn -Photswap</source>
       </subsection>
     </section>
   </body>
diff --git a/src/site/xdoc/contributing.xml b/src/site/xdoc/contributing.xml
index 8927527..3fb348d 100644
--- a/src/site/xdoc/contributing.xml
+++ b/src/site/xdoc/contributing.xml
@@ -59,12 +59,12 @@ under the License.
 
       <subsection name="Documentation">
         <p>The website is managed via the 
-          <a href="http://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a> and the guides are being
-          maintained with <a href="http://asciidoctor.org/">Asciidoctor</a>, hence contributing site content or
+          <a href="https://maven.apache.org/plugins/maven-site-plugin/">maven-site-plugin</a> and the guides are being
+          maintained with <a href="https://asciidoctor.org/">Asciidoctor</a>, hence contributing site content or
           guides is similar to contributing <a href="#Code">source code</a>.
         </p>
         <p>The project 
-          <a href="http://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a> is also available to gather any other 
+          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a> is also available to gather any other 
           kind of documentation or contribution you would like to contribute, and does not require any GIT, Maven or 
           other technical skills.
         </p>
@@ -76,13 +76,13 @@ under the License.
         contributions over time are invited to become committers. The difference is that committers have direct write 
         access to the project GIT repositories, while contributors post their contributions to JIRA issues where they're
         first reviewed, and then committed by a committer to the project's GIT repository. See 
-        <a href="http://www.apache.org/dev/contributors.html">http://www.apache.org/dev/contributors.html</a> for a good
+        <a href="https://www.apache.org/dev/contributors.html">https://www.apache.org/dev/contributors.html</a> for a good
         overview of working as a contributor.
       </p>
       <p>We ask contributors of significant amounts of code to fill out and send into Apache, an 
-        <a href="http://www.apache.org/licenses/#clas">Individual Contributors License Agreement (ICLA)</a> 
+        <a href="https://www.apache.org/licenses/#clas">Individual Contributors License Agreement (ICLA)</a> 
         (and perhaps also a 
-        <a href="http://www.apache.org/licenses/#clas">Corporate Contributors License Agreement (CCLA)</a>).
+        <a href="https://www.apache.org/licenses/#clas">Corporate Contributors License Agreement (CCLA)</a>).
       </p>
       <p>If you're interested in committing to the project, you need to establish a history over time of successful 
         contributions to the project. After that, you may be invited to become a committer.
@@ -90,16 +90,16 @@ under the License.
       <ul>
         <li>
           You'll need to fill out some legal paperwork and go through a process to get an Apache committer account: See 
-          <a rel="nofollow" href="http://apache.org/dev/new-committers-guide.html"> New Committers Guide</a>, 
-          <a rel="nofollow" href="http://apache.org/dev/contributors.html"> Contributors</a>, and 
-          <a rel="nofollow" href="http://apache.org/dev/committers.html"> Committers</a> for more details.
+          <a rel="nofollow" href="https://apache.org/dev/new-committers-guide.html"> New Committers Guide</a>, 
+          <a rel="nofollow" href="https://apache.org/dev/contributors.html"> Contributors</a>, and 
+          <a rel="nofollow" href="https://apache.org/dev/committers.html"> Committers</a> for more details.
         </li>
         <li>
           After you've received an email from 
           <a href="mailto:root@apache.org">root@apache.org</a> with your committer account information, change your 
           initial password using the 
           <a href="https://id.apache.org">Apache Account Utility</a>. For more details see 
-          <a rel="nofollow" href="http://apache.org/dev/version-control.html">Committer GIT Access</a>.
+          <a rel="nofollow" href="https://apache.org/dev/version-control.html">Committer GIT Access</a>.
         </li>
       </ul>
       <p>All Committers and Contributors should:</p>
@@ -108,7 +108,7 @@ under the License.
           <a rel="nofollow" href="https://cwiki.apache.org/confluence/signup.action">Wiki</a> account.
         </li>
         <li>Sign up for an 
-          <a rel="nofollow" href="http://issues.apache.org/jira/">ASF JIRA</a> account.
+          <a rel="nofollow" href="https://issues.apache.org/jira/">ASF JIRA</a> account.
         </li>
       </ul>
     </section>
diff --git a/src/site/xdoc/demo.xml b/src/site/xdoc/demo.xml
index 030d651..838e791 100644
--- a/src/site/xdoc/demo.xml
+++ b/src/site/xdoc/demo.xml
@@ -55,40 +55,36 @@ under the License.
 
       <subsection name="Available components">
         <div class="btn-group">
-          <a class="btn btn-large dropdown-toggle" data-toggle="dropdown" href="#">
+          <button type="button" class="btn btn-large dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Apache Syncope Core
-            <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a href="https://syncope-vm.apache.org/syncope/">REST documentation</a>
-            </li>
-            <li>
-              <a href="https://syncope-vm.apache.org/syncope/swagger/">Swagger UI</a>
-            </li>
-          </ul>
+          </button>
+          <div class="dropdown-menu">
+            <a class="dropdown-item" href="https://syncope-vm.apache.org/syncope/">Swagger UI</a>
+          </div>                    
         </div>
         <div class="btn-group">
-          <a class="btn btn-large dropdown-toggle" data-toggle="dropdown" href="#">
+          <button type="button" class="btn btn-large dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Apache Syncope Console
-            <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a href="https://syncope-vm.apache.org/syncope-console/">Web UI</a>
-            </li>
-          </ul>
+          </button>
+          <div class="dropdown-menu">
+            <a class="dropdown-item" href="https://syncope-vm.apache.org/syncope-console/">Web UI</a>
+          </div>
         </div>
         <div class="btn-group">
-          <a class="btn btn-large dropdown-toggle" data-toggle="dropdown" href="#">
+          <button type="button" class="btn btn-large dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Apache Syncope Enduser
-            <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a href="https://syncope-vm.apache.org/syncope-enduser/">Web UI</a>
-            </li>
-          </ul>
+          </button>
+          <div class="dropdown-menu">
+            <a class="dropdown-item" href="https://syncope-vm.apache.org/syncope-enduser/">Web UI</a>
+          </div>
+        </div>
+        <div class="btn-group">
+          <button type="button" class="btn btn-large dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            Apache Syncope Web Access
+          </button>
+          <div class="dropdown-menu">
+            <a class="dropdown-item" href="https://syncope-vm.apache.org/syncope-wa/">Web UI</a>
+          </div>
         </div>
       </subsection>
     </section>
diff --git a/src/site/xdoc/docs/index.xml b/src/site/xdoc/docs/index.xml
index 9481ff7..159ae26 100644
--- a/src/site/xdoc/docs/index.xml
+++ b/src/site/xdoc/docs/index.xml
@@ -43,16 +43,12 @@ under the License.
       </p>
       
       <subsection name="Guides">
-        <div class="alert alert-warning">
-          <strong>Warning!</strong> The links below apply to Syncope &ge; 2.0; for prior versions please take a look at the <a class="externalLink" href="https://cwiki.apache.org/confluence/display/SYNCOPE">Wiki</a>.
-        </div>
-
         <table>
           <thead>
             <tr>
               <th>Name</th>
+              <th width="100">3.0</th>
               <th width="100">2.1</th>
-              <th width="100">2.0</th>
               <th width="100">dev</th>
             </tr>
           </thead>
@@ -60,29 +56,29 @@ under the License.
             <tr>
               <td>Getting Started</td>
               <td>
-                <a href="2.1/getting-started.html">
+                <a href="3.0/getting-started.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="2.1/getting-started.pdf">
+                <a href="3.0/getting-started.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
               <td>
-                <a href="2.0/getting-started.html">
+                <a href="2.1/getting-started.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="2.0/getting-started.pdf">
+                <a href="2.1/getting-started.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
               <td>
-                <a href="https://ci.apache.org/projects/syncope/2_1_X/getting-started.html">
+                <a href="https://nightlies.apache.org/syncope/master/getting-started.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="https://ci.apache.org/projects/syncope/2_1_X/getting-started.pdf">
+                <a href="https://nightlies.apache.org/syncope/master/getting-started.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
@@ -90,29 +86,29 @@ under the License.
             <tr>
               <td>Reference Guide</td>
               <td>
-                <a href="2.1/reference-guide.html">
+                <a href="3.0/reference-guide.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="2.1/reference-guide.pdf">
+                <a href="3.0/reference-guide.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
               <td>
-                <a href="2.0/reference-guide.html">
+                <a href="2.1/reference-guide.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="2.0/reference-guide.pdf">
+                <a href="2.1/reference-guide.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
               <td>
-                <a href="https://ci.apache.org/projects/syncope/2_1_X/reference-guide.html">
+                <a href="https://nightlies.apache.org/syncope/master/reference-guide.html">
                   <img src="../images/text-html.png"/>
                 </a>
                 &nbsp;
-                <a href="https://ci.apache.org/projects/syncope/2_1_X/reference-guide.pdf">
+                <a href="https://nightlies.apache.org/syncope/master/reference-guide.pdf">
                   <img src="../images/application-pdf.png"/>
                 </a> 
               </td>
@@ -142,17 +138,17 @@ under the License.
             <tr>
               <td>REST</td>
               <td>
-                <a href="../rest/2.1/index.html">2.1</a>
+                <a href="../rest/3.0/index.html">3.0</a>
                 &nbsp;&nbsp;
-                <a href="../rest/2.0/index.html">2.0</a> 
+                <a href="../rest/2.1/index.html">2.1</a> 
               </td>
             </tr>
             <tr>
               <td>Javadocs</td>
               <td>
-                <a href="../apidocs/2.1/index.html">2.1</a>
+                <a href="../apidocs/3.0/index.html">3.0</a>
                 &nbsp;&nbsp;
-                <a href="../apidocs/2.0/index.html">2.0</a> 
+                <a href="../apidocs/2.1/index.html">2.1</a> 
               </td>
             </tr>
           </tbody>
diff --git a/src/site/xdoc/downloads.xml b/src/site/xdoc/downloads.xml
index 6c69518..ba6e51d 100644
--- a/src/site/xdoc/downloads.xml
+++ b/src/site/xdoc/downloads.xml
@@ -36,22 +36,18 @@ under the License.
         It is good practice to <a href="#Verifying_Releases">verify the integrity</a> of the distribution files.
       </p>
 
-      <subsection name="2.1.5 Fusion">
-        <p>Release date: September 12th 2019</p>
+      <subsection name="3.0.0-M0 Maggiore">
+        <p>Release date: January xth 2022</p>
         <p>
-          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Fusion">Release notes</a>
+          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Maggiore">Release notes</a>
         </p>
 
         <div class="alert alert-info">
           <p><strong>Don't know what to download? Click the buttons below to get more information.</strong></p>
           <div class="btn-group">
-            <a href="docs/2.1/getting-started.html#maven-project" class="btn">Maven Project</a>
-            <a href="docs/2.1/getting-started.html#standalone" class="btn">Standalone</a>
-            <a href="docs/2.1/getting-started.html#debian-packages" class="btn">Debian Packages</a>
-            <a href="docs/2.1/getting-started.html#gui-installer" class="btn">GUI Installer</a>
-            <a href="docs/2.1/getting-started.html#docker" class="btn">Docker images</a>
-            <a href="docs/2.1/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a>
-            <a href="docs/2.1/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a>
+            <a href="docs/3.0/getting-started.html#maven-project" class="btn">Maven Project</a>
+            <a href="docs/3.0/getting-started.html#standalone" class="btn">Standalone</a>
+            <a href="docs/3.0/getting-started.html#docker" class="btn">Docker images</a>
           </div>
         </div>
 
@@ -65,114 +61,42 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-2.1.5-source-release.zip">syncope-2.1.5-source-release.zip</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-2.1.5-source-release.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-2.1.5-source-release.zip.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-standalone-2.1.5-distribution.zip">syncope-standalone-2.1.5-distribution.zip</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-standalone-2.1.5-distribution.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-standalone-2.1.5-distribution.zip.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/apache-syncope-2.1.5.deb">apache-syncope-2.1.5.deb</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-2.1.5.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-2.1.5.deb.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/apache-syncope-console-2.1.5.deb">apache-syncope-console-2.1.5.deb</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-console-2.1.5.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-console-2.1.5.deb.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/apache-syncope-enduser-2.1.5.deb">apache-syncope-enduser-2.1.5.deb</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/3.0.0-M0/syncope-3.0.0-M0-source-release.zip">syncope-3.0.0-M0-source-release.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-enduser-2.1.5.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/apache-syncope-enduser-2.1.5.deb.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/3.0.0-M0/syncope-3.0.0-M0-source-release.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/3.0.0-M0/syncope-3.0.0-M0-source-release.zip.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-installer-2.1.5-uber.jar">syncope-installer-2.1.5.jar</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/3.0.0-M0/syncope-standalone-3.0.0-M0-distribution.zip">syncope-standalone-3.0.0-M0-distribution.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-installer-2.1.5-uber.jar.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-installer-2.1.5-uber.jar.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-client-cli-2.1.5.zip">syncope-client-cli-2.1.5.zip</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-client-cli-2.1.5.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-client-cli-2.1.5.zip.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-core-upgrade-2.1.5.zip">syncope-core-upgrade-2.1.5.zip</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-core-upgrade-2.1.5.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-core-upgrade-2.1.5.zip.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/org.apache.syncope.ide.eclipse.site-2.1.5.zip">org.apache.syncope.ide.eclipse.site-2.1.5.zip</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/org.apache.syncope.ide.eclipse.site-2.1.5.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/org.apache.syncope.ide.eclipse.site-2.1.5.zip.sha512">sha512</a>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.5/syncope-ide-netbeans-2.1.5.nbm">syncope-ide-netbeans-2.1.5.nbm</a>
-              </td>
-              <td>
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-ide-netbeans-2.1.5.nbm.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.1.5/syncope-ide-netbeans-2.1.5.nbm.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/3.0.0-M0/syncope-standalone-3.0.0-M0-distribution.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/3.0.0-M0/syncope-standalone-3.0.0-M0-distribution.zip.sha512">sha512</a>
               </td>
             </tr>
           </tbody>
         </table>
       </subsection>
 
-      <subsection name="2.0.14 Jazz">
-        <p>Release date: September 12th 2019</p>
+      <subsection name="2.1.10 Fusion">
+        <p>Release date: October 8th 2021</p>
         <p>
-          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Jazz">Release notes</a>
+          <a href="https://cwiki.apache.org/confluence/display/SYNCOPE/Fusion">Release notes</a>
         </p>
-        
+
         <div class="alert alert-info">
           <p><strong>Don't know what to download? Click the buttons below to get more information.</strong></p>
           <div class="btn-group">
-            <a href="docs/2.0/getting-started.html#maven-project" class="btn">Maven Project</a>
-            <a href="docs/2.0/getting-started.html#standalone" class="btn">Standalone</a>
-            <a href="docs/2.0/getting-started.html#debian-packages" class="btn">Debian Packages</a>
-            <a href="docs/2.0/getting-started.html#gui-installer" class="btn">GUI Installer</a>
-            <a href="docs/2.0/getting-started.html#docker" class="btn">Docker images</a>
-            <a href="docs/2.0/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a>
-            <a href="docs/2.0/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a>
+            <a href="docs/2.1/getting-started.html#maven-project" class="btn">Maven Project</a>
+            <a href="docs/2.1/getting-started.html#standalone" class="btn">Standalone</a>
+            <a href="docs/2.1/getting-started.html#debian-packages" class="btn">Debian Packages</a>
+            <a href="docs/2.1/getting-started.html#gui-installer" class="btn">GUI Installer</a>
+            <a href="docs/2.1/getting-started.html#docker" class="btn">Docker images</a>
+            <a href="docs/2.1/getting-started.html#eclipse-ide-plugin" class="btn">Eclipse IDE Plugin</a>
+            <a href="docs/2.1/getting-started.html#netbeans-ide-plugin" class="btn">Netbeans IDE Plugin</a>
           </div>
         </div>
 
@@ -186,83 +110,92 @@ under the License.
           <tbody>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/syncope-2.0.14-source-release.zip">syncope-2.0.14-source-release.zip</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-2.1.10-source-release.zip">syncope-2.1.10-source-release.zip</a>
+              </td>
+              <td>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-2.1.10-source-release.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-2.1.10-source-release.zip.sha512">sha512</a>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-standalone-2.1.10-distribution.zip">syncope-standalone-2.1.10-distribution.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-2.0.14-source-release.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-2.0.14-source-release.zip.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-standalone-2.1.10-distribution.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-standalone-2.1.10-distribution.zip.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/syncope-standalone-2.0.14-distribution.zip">syncope-standalone-2.0.14-distribution.zip</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/apache-syncope-2.1.10.deb">apache-syncope-2.1.10.deb</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-standalone-2.0.14-distribution.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-standalone-2.0.14-distribution.zip.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-2.1.10.deb.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-2.1.10.deb.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/apache-syncope-2.0.14.deb">apache-syncope-2.0.14.deb</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/apache-syncope-console-2.1.10.deb">apache-syncope-console-2.1.10.deb</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-2.0.14.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-2.0.14.deb.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-console-2.1.10.deb.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-console-2.1.10.deb.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/apache-syncope-console-2.0.14.deb">apache-syncope-console-2.0.14.deb</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/apache-syncope-enduser-2.1.10.deb">apache-syncope-enduser-2.1.10.deb</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-console-2.0.14.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-console-2.0.14.deb.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-enduser-2.1.10.deb.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/apache-syncope-enduser-2.1.10.deb.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/apache-syncope-enduser-2.0.14.deb">apache-syncope-enduser-2.0.14.deb</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-installer-2.1.10-uber.jar">syncope-installer-2.1.10-uber.jar</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-enduser-2.0.14.deb.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/apache-syncope-enduser-2.0.14.deb.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-installer-2.1.10-uber.jar.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-installer-2.1.10-uber.jar.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/syncope-installer-2.0.14-uber.jar">syncope-installer-2.0.14.jar</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-client-cli-2.1.10.zip">syncope-client-cli-2.1.10.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-installer-2.0.14-uber.jar.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-installer-2.0.14-uber.jar.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-client-cli-2.1.10.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-client-cli-2.1.10.zip.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/syncope-client-cli-2.0.14.zip">syncope-client-cli-2.0.14.zip</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-core-upgrade-2.1.10.zip">syncope-core-upgrade-2.1.10.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-client-cli-2.0.14.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-client-cli-2.0.14.zip.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-core-upgrade-2.1.10.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-core-upgrade-2.1.10.zip.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/org.apache.syncope.ide.eclipse.site-2.0.14.zip">org.apache.syncope.ide.eclipse.site-2.0.14.zip</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/org.apache.syncope.ide.eclipse.site-2.1.10.zip">org.apache.syncope.ide.eclipse.site-2.1.10.zip</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/org.apache.syncope.ide.eclipse.site-2.0.14.zip.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/org.apache.syncope.ide.eclipse.site-2.0.14.zip.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/org.apache.syncope.ide.eclipse.site-2.1.10.zip.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/org.apache.syncope.ide.eclipse.site-2.1.10.zip.sha512">sha512</a>
               </td>
             </tr>
             <tr>
               <td>
-                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.0.14/syncope-ide-netbeans-2.0.14.nbm">syncope-ide-netbeans-2.0.14.nbm</a>
+                <a href="http://www.apache.org/dyn/closer.lua/syncope/2.1.10/syncope-ide-netbeans-2.1.10.nbm">syncope-ide-netbeans-2.1.10.nbm</a>
               </td>
               <td>
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-ide-netbeans-2.0.14.nbm.asc">asc</a> 
-                <a href="https://downloads.apache.org/syncope/2.0.14/syncope-ide-netbeans-2.0.14.nbm.sha512">sha512</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-ide-netbeans-2.1.10.nbm.asc">asc</a>
+                <a href="https://downloads.apache.org/syncope/2.1.10/syncope-ide-netbeans-2.1.10.nbm.sha512">sha512</a>
               </td>
             </tr>
           </tbody>
@@ -271,11 +204,11 @@ under the License.
     </section>
 
     <section name="Archives">
-      <p>All past releases can be fetched from ASF <a href="http://archive.apache.org/dist/syncope/">archives</a>.</p>
+      <p>All past releases can be fetched from ASF <a href="https://archive.apache.org/dist/syncope/">archives</a>.</p>
     </section>
     
     <section name="Verifying Releases">
-      <p>You can verify your download by following these <a href="http://www.apache.org/info/verification.html">procedures</a> and using these <a href="https://www.apache.org/dist/syncope/KEYS">KEYS</a>.</p>
+      <p>You can verify your download by following these <a href="https://www.apache.org/info/verification.html">procedures</a> and using these <a href="https://www.apache.org/dist/syncope/KEYS">KEYS</a>.</p>
     </section>
   </body>
 </document>
diff --git a/src/site/xdoc/iam-scenario.xml b/src/site/xdoc/iam-scenario.xml
index 5643e76..e195fae 100644
--- a/src/site/xdoc/iam-scenario.xml
+++ b/src/site/xdoc/iam-scenario.xml
@@ -60,21 +60,15 @@ under the License.
             of <u>authentication</u>
             (<a href="https://en.wikipedia.org/wiki/Single_sign-on" target="_blank">Single Sign-On</a>),
             <u>authorization</u>
-            (<a href="http://oauth.net/" target="_blank">OAuth</a>, 
+            (<a href="https://oauth.net/" target="_blank">OAuth</a>, 
             <a href="https://en.wikipedia.org/wiki/XACML">XACML</a>) and <u>federation</u>
             (<a href="https://en.wikipedia.org/wiki/Security_Assertion_Markup_Language" target="_blank">SAML</a>, 
-            <a href="http://openid.net/connect/" target="_blank">OpenID Connect</a>).
+            <a href="https://openid.net/connect/" target="_blank">OpenID Connect</a>).
           </li>
         </ul>
       </p>
 
       <hr/>
-      <p style="text-align:center;">
-        As you can notice,<b>
-          <u>Apache Syncope is primarily a provisioning engine</u>
-        </b>.
-      </p>
-      <hr/>
       
       <subsection name="Aren't Identity Stores enough?">
         One might suppose that a single identity store can solve all the identity needs inside an organization, but few
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 0a715df..edb3909 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -37,20 +37,20 @@ under the License.
       </p>
 
       <p>
-        <span style="font-weight: bold">Identity management</span> (or IdM) means to manage user data on systems and 
-        applications, using the combination of business processes and IT. IdM involves considering user attributes, 
-        roles, resources and entitlements in trying to answer the following thorny question:
-      </p>
-
-      <p style="text-align:center;">
-        <i>Who has access to What, When, How, and Why?</i>
+        Often, <span style="font-weight: bold">Identity Management</span> and
+        <span style="font-weight: bold">Access Management</span> are jointly referred, mainly because their two
+        management worlds likely coexist in the same project or in the same environment.<br/>
+        The two topics are however completely different: each one has its own context, its own rules, its own best
+        practices.<br/>
+        On the other hand, some products provide unorthodox implementations so it is indeed possible to do the same
+        thing with both of them.
       </p>
     </div>
     
     <div class="row" style="margin-bottom: 20px;">
       <div class="col-sm-offset-5 col-sm-2 text-center">
         <div class="btn-group" data-toggle="buttons">
-          <a class="btn btn-large btn-success center-block" style="width: 250px;" href="downloads">I want to build my IdM with<br/>Apache Syncope</a>
+          <a class="btn btn-large btn-success center-block" style="width: 250px;" href="downloads">I want to build my IAM with<br/>Apache Syncope</a>
         </div>
         <div class="btn-group" data-toggle="buttons">
           <a class="btn btn-large btn-info center-block" style="width: 250px;" href="contributing">I want to contribute to<br/>Apache Syncope</a>
@@ -58,35 +58,22 @@ under the License.
       </div>
     </div>
 
-    <h4>What is Identity Management, anyway?</h4>
     <dl>
-      <dt>Account</dt>
+      <dt>Identity Management</dt>
       <dd>
-        <p>Computers work with records of data about people. Such records contain technical information needed by 
-          the system for which the account is created and managed.</p>
+        <p>Tools and practices to keep identity data consistent and synchronized across repositories, data formats and
+          models.</p>
       </dd>
-      <dt>(Digital) Identity</dt>
+      <dt>Access Management</dt>
       <dd>
-        <p>A representation of a set of claims made by one digital subject about itself.
-          <strong>It’s you!</strong>
-        </p>
+        <p>Systems, protocols and technologies supporting user authentication (how Users are let accessing a given
+          system) and authorization (which capabilities each user owns on a given system).</p>
       </dd>
     </dl>
       
-    <p>Have you ever been hired by a company, entered an organization or just created a new Google account?
-      Companies, organizations and cloud entities work with applications that need your data to function properly:
-      username, password, e-mail, first name, surname, and more.</p>
-        
-    <p>Where is this information going to come from? And what happens when you need to be enabled for more 
-      applications? And what if you get promoted and acquire more rights on the applications you already had access 
-      to? Most importantly, what happens when you quit or they gently let you go?</p>
-        
-    <p>In brief, Identity Management takes care of managing identity data throughout what is called the 
-      <strong>Identity Lifecycle</strong>.</p>
-        
-    <p style="text-align:center;">
-      <img src="docs/images/identityLifecycle.png" alt="Identity lifecycle" width="500"/>
-    </p>
+    <p>From the definitions above, Identity Management and Access Management can be seen as complementary: very often,
+      the data synchronized by the former are then used by the latter to provide its features - e.g. authentication
+      and authorization.</p>
 
     <p>    
       <a href="https://www.apache.org/events/current-event">
diff --git a/src/site/xdoc/integration.xml b/src/site/xdoc/integration.xml
index 8e64791..ae8ba56 100644
--- a/src/site/xdoc/integration.xml
+++ b/src/site/xdoc/integration.xml
@@ -35,20 +35,20 @@ under the License.
     <section name="GitHub Actions">
       <p>
         <a href="https://github.com/apache/syncope/actions/workflows/crosschecks.yml">
-          <img src="https://github.com/apache/syncope/actions/workflows/crosschecks.yml/badge.svg" style="max-width:100%;">
+          <img src="https://github.com/apache/syncope/actions/workflows/crosschecks.yml/badge.svg" style="max-width:100%;"/>
         </a>
         <a href="https://github.com/apache/syncope/actions/workflows/codeql-analysis.yml">
-          <img src="https://github.com/apache/syncope/actions/workflows/codeql-analysis.yml/badge.svg" style="max-width:100%;">
+          <img src="https://github.com/apache/syncope/actions/workflows/codeql-analysis.yml/badge.svg" style="max-width:100%;"/>
         </a>
       </p>
     </section>
 
     <section name="Buildbot">
       <p>
-        <source><a href="https://ci.apache.org/builders/syncope-master-docs">https://ci.apache.org/builders/syncope-master-docs</a></source>
+        <source><a href="https://ci2.apache.org/#/builders/56">master</a></source>
       </p>
       <p>
-        <source><a href="https://ci.apache.org/builders/syncope-2_1_X-docs">https://ci.apache.org/builders/syncope-2_1_X-docs</a></source>
+        <source><a href="https://ci2.apache.org/#/builders/55">2_1_X</a></source>
       </p>
     </section>
   </body>
diff --git a/src/site/xdoc/mailing-lists.xml b/src/site/xdoc/mailing-lists.xml
index 308ea76..8460ab7 100644
--- a/src/site/xdoc/mailing-lists.xml
+++ b/src/site/xdoc/mailing-lists.xml
@@ -63,7 +63,7 @@ under the License.
             <td>-</td>
             <td>-</td>
             <td>
-              <a href="http://www.mail-archive.com/user@syncope.apache.org/">www.mail-archive.com</a>
+              <a href="https://www.mail-archive.com/user@syncope.apache.org/">www.mail-archive.com</a>
             </td>
           </tr>
           <tr class="a">
@@ -91,7 +91,7 @@ under the License.
             <td>-</td>
             <td>-</td>
             <td>
-              <a href="http://www.mail-archive.com/dev@syncope.apache.org/">www.mail-archive.com</a>
+              <a href="https://www.mail-archive.com/dev@syncope.apache.org/">www.mail-archive.com</a>
             </td>
           </tr>
           <tr class="b">
@@ -119,7 +119,7 @@ under the License.
             <td>-</td>
             <td>-</td>
             <td>
-              <a href="http://www.mail-archive.com/commits@syncope.apache.org/">www.mail-archive.com</a>
+              <a href="https://www.mail-archive.com/commits@syncope.apache.org/">www.mail-archive.com</a>
             </td>
           </tr>
         </tbody>
@@ -138,9 +138,6 @@ under the License.
       <p>
         Join the <strong>#apache-syncope</strong> channel on <a href="https://libera.chat/">Libera.Chat</a>.
       </p>
-    </section>
-
-    <section name="Slack">
       <p>
         Join the <strong>#syncope</strong> channel on <a href="https://the-asf.slack.com/archives/CEUPMC04T">Slack</a>.
       </p>
diff --git a/src/site/xdoc/release-process.xml b/src/site/xdoc/release-process.xml
index ca4ba25..1348ba3 100644
--- a/src/site/xdoc/release-process.xml
+++ b/src/site/xdoc/release-process.xml
@@ -37,7 +37,7 @@ under the License.
         <a href="https://repository.apache.org">Apache Nexus repository</a> for releasing SNAPSHOT and release artifacts.
         <br/>
         More details on
-        <a href="http://www.apache.org/dev/publishing-maven-artifacts.html#maven">releasing Maven artifacts</a>
+        <a href="https://www.apache.org/dev/publishing-maven-artifacts.html#maven">releasing Maven artifacts</a>
         at The Apache Software Foundation.
       </p>
     </section>
@@ -45,24 +45,24 @@ under the License.
     <section name="Prerequisites">
       <subsection name="GIT">
         <p>Install GIT; 
-          <a href="http://www.git-scm.com/downloads">binary packages</a> for various platforms are available.
+          <a href="https://www.git-scm.com/downloads">binary packages</a> for various platforms are available.
         </p>
       </subsection>
       
       <subsection name="GPG">
         <p>Install/Configure GPG - The artifacts that are deployed to the ASF central repository need to
           be signed. To do this you will need to have a public and private keypair. There is a very good
-          <a href="http://www.sonatype.com/people/2010/01/how-to-generate-pgp-signatures-with-maven/">guide</a> that 
+          <a href="https://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/">guide</a> that 
           will walk you though this.</p>
       </subsection>
 
       <subsection name="Apache Maven">
         <p>Install Apache Maven 3.0.3 or higher; we strongly encourage our committers to install 
-          the latest <a href="http://maven.apache.org/download.html">Apache Maven</a> version available.
+          the latest <a href="https://maven.apache.org/download.html">Apache Maven</a> version available.
         </p>
       
         <p>Maven allows you to encrypt your servers' passwords. We highly recommend that you follow this
-          <a href="http://maven.apache.org/guides/mini/guide-encryption.html">guide</a> to set your master password and
+          <a href="https://maven.apache.org/guides/mini/guide-encryption.html">guide</a> to set your master password and
           use it to encrypt your ASF password in the next section.
         </p>
       </subsection>
@@ -70,7 +70,7 @@ under the License.
       <subsection name="ASF settings">
         <p>Using the instructions from the previous step encrypt your Apache Nexus repository password and add the 
           following servers to your 
-          <tt>~/.m2/settings.xml</tt> file. You may already have other servers in this file, if not just create
+          <code>~/.m2/settings.xml</code> file. You may already have other servers in this file, if not just create
           the file.
         </p>
 
@@ -139,17 +139,6 @@ under the License.
         </dl>
       </p>
       
-      <subsection name="Verify DBMSes and Java EE containers">
-        <p>
-          This is an optional step.<br/>
-          These verifications take some time and have quite strong environment requirements. However, it is of 
-          fundamental importance to go through these at least once for every major release.
-        </p>
-        <p>
-          For more information please take a look at <a href="building#fit.2Fcore-reference">build instructions</a>.
-        </p>
-      </subsection>
-      
       <subsection name="Prepare the source for release">
         <ol>
           <li>Clean up JIRA so the <b>Fix Version</b> in issues resolved since the last
@@ -157,30 +146,13 @@ under the License.
             <b>Resolved</b> issues to the <b>Closed</b> state.
           </li>
           <li>
-            From <tt>$SYNCOPE_RELEASE_DIR</tt>, update the <tt>CHANGES</tt> file,
+            From <tt>$SYNCOPE_RELEASE_DIR</tt>, update the <tt>CHANGES</tt> file, 
             based on the text release reports from JIRA, then commit and push:
             <source><![CDATA[git commit -m "Updating CHANGES for release" CHANGES
 git push]]></source>
           </li>
           <li>
-            From <tt>$SYNCOPE_RELEASE_DIR</tt>, update
-            <ol>
-              <li>
-                <tt>ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF</tt>
-              </li>
-              <li>
-                <tt>ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF</tt>
-              </li>
-              <li>
-                <tt>ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml</tt>
-              </li>
-            </ol>
-            with <tt>$VERSION</tt>, then commit and push:
-            <source><![CDATA[git commit -a -m "Updating Eclipse files for release"
-git push]]></source>
-          </li>
-          <li>
-            From <tt>$SYNCOPE_SITE_DIR</tt>, update the <tt>src/site/xdoc/downloads.xml</tt>
+            From <tt>$SYNCOPE_SITE_DIR</tt>, update the <tt>src/site/xdoc/downloads.xml</tt> 
             site page by changing the relevant URLs, then commit and push:
             <source><![CDATA[git commit -m "Updating downloads site page for release" src/site/xdoc/downloads.xml
 git push]]></source>
@@ -192,59 +164,63 @@ git push]]></source>
         <p>Perform the steps below from <tt>$SYNCOPE_RELEASE_DIR</tt>.</p>
         <ol>
           <li>
-            Do a dry run of the <tt>release:prepare</tt> step.
-            <source>mvn -P apache-release release:prepare -Darguments="-P all,docker -DbuildNumber=syncope-$VERSION" -DdryRun=true</source>
-
-            The dry run will not commit any changes and gives you the opportunity to verify that the 
-            release process will complete as expected.
-          
-            <p>
-              <em>If you cancel a 
-                <tt>release:prepare</tt> before it updates the pom.xml versions, then use the
-                <tt>release:clean</tt> goal to just remove the extra files that were created.
-              </em>
-            </p>
+            Set release version
+            <source><![CDATA[mvn -T 1C -P all,docker,skipTests versions:set -DnewVersion=$VERSION
+mvn -T 1C -P all,docker,skipTests versions:commit]]></source>
           </li>
           <li>
-            Verify that the release process completed as expected:
-            <ol>
-              <li>The release plugin will create <tt>pom.xml.tag</tt> files which contain the changes that would
-                have been committed. The only differences between <tt>pom.xml.tag</tt> and its corresponding
-                <tt>pom.xml</tt> file should be the version number.
-              </li>
-              <li>
-                If other formatting changes have been made you should review the changes and then commit them:
-                <source>git commit -a -m "Fixing formatting for release"</source>
-              </li>
-              <li>
-                Assuming the <tt>.tag</tt> files look OK you may proceed and do any other validation you feel
-                necessary. The following list may be helpful:
-                <ol>
-                  <li>Check <tt>release.properties</tt> and make sure that the scm properties have the
-                    right version. Sometimes the scm location can be the previous version not the next version.
-                  </li>
-                  <li>
-                    Verify signatures: On Un*x platforms the following command can be executed:
-                    <source><![CDATA[
+            In the root <code>pom.xml</code>, replace
+            <source><![CDATA[<tag>HEAD</tag>]]></source>
+            with
+            <source><![CDATA[<tag>syncope-$VERSION</tag>]]></source>
+            then set
+            <source><![CDATA[<project.build.outputTimestamp>2021-07-16T09:00:00Z</project.build.outputTimestamp>]]></source>
+            to the current date and time (for reproducible builds).
+          </li>
+          <li>
+            Build artifacts for release
+            <source>mvn -T 1C -P apache-release,all,docker,skipTests -DbuildNumber=syncope-$VERSION</source>
+          </li>
+          <li>
+            Create release tag
+            <source><![CDATA[git commit -a -m "prepare release syncope-$VERSION"
+git tag syncope-$VERSION -a -m "copy for tag syncope-$VERSION"
+git push --tags]]></source>
+          </li>
+          <li>
+            Set next version
+            <source><![CDATA[mvn -T 1C -P all,docker,skipTests versions:set -DnewVersion=$VERSION+1-SNAPSHOT
+mvn -T 1C -P all,docker,skipTests versions:commit]]></source>
+          </li>
+          <li>
+            In the root <code>pom.xml</code>, replace
+            <source><![CDATA[<tag>syncope-$VERSION</tag>]]></source>
+            with
+            <source><![CDATA[<tag>HEAD</tag>]]></source>
+          </li>
+          <li>
+            Finally
+            <source><![CDATA[git commit -a -m "prepare for next development iteration"]]></source>
+          </li>
+          <li>
+            Verify signatures: On Un*x platforms the following command can be executed:
+            <source><![CDATA[
 for file in `find . -type f -iname '*.asc'`
 do
   gpg --verify ${file} 
 done]]></source>
-                    You'll need to look at the output to ensure it contains only good signatures:
-                    <source><![CDATA[
+            You'll need to look at the output to ensure it contains only good signatures:
+            <source><![CDATA[
 gpg: Good signature from ...
 gpg: Signature made ...]]></source>
-                  </li>
-                </ol>
-              </li>
-              <li>
-                Once any failures or required updates have been committed to GIT, rollback the release prepare files:
-                <source>mvn -P apache-release release:rollback</source>
-              </li>
-            </ol>
           </li>
           <li>
-            Run the <tt>release:prepare</tt> step for real this time. You'll be prompted for the same version
+            Create a <code>release.properties</code> file in the root directory, with content:
+           <source><![CDATA[scm.url=scm:git:https://gitbox.apache.org/repos/asf/syncope.git
+scm.tag=syncope-$VERSION]]></source>
+          </li>
+          <li>
+            Run the <code>release:prepare</code> step for real this time. You'll be prompted for the same version 
             information and optionally your GPG passphrase again.
             <source>mvn -P apache-release release:prepare -Darguments="-P all,docker -DbuildNumber=syncope-$VERSION"</source>
           </li>
@@ -273,6 +249,7 @@ cp $SYNCOPE_RELEASE_DIR/target/syncope-*-source-release.zip .
 cp $SYNCOPE_RELEASE_DIR/target/syncope-*-source-release.zip.asc .
 cp $SYNCOPE_RELEASE_DIR/standalone/target/syncope-standalone-*-distribution.zip .
 cp $SYNCOPE_RELEASE_DIR/standalone/target/syncope-standalone-*-distribution.zip.asc .
+# only for 2_1_X
 cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*-uber.jar .
 cp $SYNCOPE_RELEASE_DIR/installer/target/syncope-installer-*-uber.jar.asc .
 cp $SYNCOPE_RELEASE_DIR/deb/core/target/apache-syncope-*.deb .           
@@ -287,7 +264,6 @@ cp $SYNCOPE_RELEASE_DIR/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/t
 cp $SYNCOPE_RELEASE_DIR/ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/target/org.apache.syncope.ide.eclipse.site-*.zip.asc .
 cp $SYNCOPE_RELEASE_DIR/ide/netbeans/target/syncope-ide-netbeans-*.nbm .
 cp $SYNCOPE_RELEASE_DIR/ide/netbeans/target/syncope-ide-netbeans-*.nbm.asc .
-# only for 2_1_X
 cp $SYNCOPE_RELEASE_DIR/core/upgrade/target/syncope-core-upgrade-*.zip .
 cp $SYNCOPE_RELEASE_DIR/core/upgrade/target/syncope-core-upgrade-*.zip.asc .
               
@@ -312,26 +288,10 @@ cd syncope-$VERSION
 mvn -PskipTests,all
 
 cd standalone/target/standalone/apache-tomcat-* && chmod 755 bin/*.sh && ./bin/startup.sh
+curl -o /tmp/openapi.json http://localhost:9080/syncope/rest/openapi.json
+./bin/shutdown.sh && cd -
 
-curl -o /tmp/syncope.wadl http://localhost:9080/syncope/syncope.wadl
-
-curl -o /tmp/index.html http://localhost:9080/syncope/index.html
-sed -i 's/\/syncope\/webjars\/jquery\/3.3.1-1\/jquery.min.js/https:\/\/code.jquery.com\/jquery-3.3.1.min.js/' /tmp/index.html 
-sed -i 's/\/syncope\/webjars\/jquery-ui\/1.12.1\/jquery-ui.min.js/http:\/\/code.jquery.com\/ui\/1.12.1\/jquery-ui.min.js/' /tmp/index.html               
-sed -i 's/\/syncope\/webjars\/jquery-ui-themes\/1.12.1\/smoothness\/jquery-ui.min.css/https:\/\/code.jquery.com\/ui\/1.12.1\/themes\/smoothness\/jquery-ui.css/' /tmp/index.html 
-
-# if releasing from 2_0_X
-curl -o /tmp/schema_1_syncope2.html http://localhost:9080/syncope/schema_1_syncope2.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.10\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.10\/styles\/default.min.css/' /tmp/schema_1_syncope2.html 
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.10\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.10\/highlight.min.js/' /tmp/schema_1_syncope2.html 
-
-# else if releasing from 2_1_X
-curl -o /tmp/schema_1_syncope21.html http://localhost:9080/syncope/schema_1_syncope21.html
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.10\/styles\/default.min.css/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.10\/styles\/default.min.css/' /tmp/schema_1_syncope21.html 
-sed -i 's/\/syncope\/webjars\/highlightjs\/9.15.10\/highlight.min.js/http:\/\/cdnjs.cloudflare.com\/ajax\/libs\/highlight.js\/9.15.10\/highlight.min.js/' /tmp/schema_1_syncope21.html 
-
-./bin/shutdown.sh && cd - 
-              
+cd syncope-$VERSION                            
 svn checkout https://svn.apache.org/repos/asf/syncope/site/ site
 
 cd $SYNCOPE_SITE_DIR
@@ -339,46 +299,48 @@ mvn -P site -Dsite.deploymentBaseUrl=file:///<absolute path to/site>/$VERSION
 
 cd <absolute path to/site>/$VERSION
 
-# if releasing from 2_0_X
-mkdir -p rest/2.0
-mv /tmp/index.html rest/2.0
-mv /tmp/schema_1_syncope2.html rest/2.0
-mv /tmp/syncope.wadl rest/2.0
-cp $SYNCOPE_SITE_DIR/target/generated-docs/getting-started.* docs/2.0/
-cp $SYNCOPE_SITE_DIR/target/generated-docs/reference-guide.* docs/2.0/
-cp -r $SYNCOPE_SITE_DIR/target/generated-docs/images docs/2.0/
-cd docs
-ln -s 2.1/reference-guide.html .
-ln -s 2.1/getting-started.html .
-ln -s 2.1/images/ .
-cd ../..
-svn add $VERSION
-svn copy apidocs/2.1 $VERSION/apidocs/
-svn copy rest/2.1 $VERSION/rest/
-svn copy docs/2.1/ $VERSION/docs/
-
-# else if releasing from 2_1_X
+# if releasing from 2_1_X
 mkdir -p rest/2.1
-mv /tmp/index.html rest/2.1
-mv /tmp/schema_1_syncope21.html rest/2.1
-mv /tmp/syncope.wadl rest/2.1
+mv /tmp/openapi.json rest/2.1/
+cp -r $SYNCOPE_RELEASE_DIR/ext/swagger-ui/target/swagger-ui/META-INF/resources/webjars/swagger-ui/*/* rest/2.1/
+sed 's/..\/rest\/openapi.json/openapi.json/' $SYNCOPE_RELEASE_DIR/ext/swagger-ui/target/classes/META-INF/resources/swagger/index.html > rest/2.1/index.html
+mkdir -p docs/2.1
 cp $SYNCOPE_SITE_DIR/target/generated-docs/getting-started.* docs/2.1/
 cp $SYNCOPE_SITE_DIR/target/generated-docs/reference-guide.* docs/2.1/
 cp -r $SYNCOPE_SITE_DIR/target/generated-docs/images docs/2.1/
 cd docs
-ln -s 2.1/reference-guide.html .
-ln -s 2.1/getting-started.html .
-ln -s 2.1/images/ .
+ln -s 3.0/reference-guide.html .
+ln -s 3.0/getting-started.html .
+ln -s 3.0/images/ .
+cd ../..
+svn add $VERSION
+svn copy apidocs/3.0 $VERSION/apidocs/
+svn copy rest/3.0 $VERSION/rest/
+svn copy docs/3.0 $VERSION/docs/
+
+# else if releasing from master
+mkdir -p rest/3.0
+mv /tmp/openapi.json rest/3.0/              
+cp -r $SYNCOPE_RELEASE_DIR/core/starter/target/swagger-ui/META-INF/resources/webjars/swagger-ui/*/* rest/3.0/
+sed 's/..\/rest\/openapi.json/openapi.json/' $SYNCOPE_RELEASE_DIR/core/starter/target/classes/META-INF/resources/index.html > rest/3.0/index.html
+mkdir -p docs/3.0
+cp $SYNCOPE_SITE_DIR/target/generated-docs/getting-started.* docs/3.0/
+cp $SYNCOPE_SITE_DIR/target/generated-docs/reference-guide.* docs/3.0/
+cp -r $SYNCOPE_SITE_DIR/target/generated-docs/images docs/3.0/
+cd docs
+ln -s 3.0/reference-guide.html .
+ln -s 3.0/getting-started.html .
+ln -s 3.0/images/ .
 cd ../..
 svn add $VERSION
-svn copy apidocs/2.0 $VERSION/apidocs/
-svn copy rest/2.0 $VERSION/rest/
-svn copy docs/2.0/ $VERSION/docs/
+svn copy apidocs/2.1 $VERSION/apidocs/
+svn copy rest/2.1 $VERSION/rest/
+svn copy docs/2.1 $VERSION/docs/
 
 svn commit -m "Staging site for release"]]></source>
           </li>
           <li>
-            From <tt>$SYNCOPE_RELEASE_DIR</tt> execute (this step will create a maven staging repository):
+            From <code>$SYNCOPE_RELEASE_DIR</code> execute (this step will create a maven staging repository):
             <source>mvn -P apache-release release:perform -Darguments="-P all,docker -DbuildNumber=syncope-$VERSION" [-Duser.name=&lt;your_apache_uid&gt;]</source>
         
             <p>
@@ -401,14 +363,14 @@ svn commit -m "Staging site for release"]]></source>
                     <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
                   </li>
                   <li>Navigate through the artifact tree and make sure that all binary, 
-                    <tt>javadoc</tt>,
-                    <tt>sources</tt>, and
-                    <tt>tests</tt> jars, as well as
-                    <tt>poms</tt>s, ... have
-                    <tt>.asc</tt> (GPG signature) and
+                    <code>javadoc</code>,
+                    <code>sources</code>, and 
+                    <code>tests</code> jars, as well as 
+                    <code>poms</code>s, ... have 
+                    <code>.asc</code> (GPG signature) and 
                     files
                     <br/>
-                    The <tt>syncope-$VERSION-source-release.zip</tt>
+                    The <code>syncope-$VERSION-source-release.zip</code> 
                     should likewise have signature and checksum files.
                   </li>
                 </ol>
@@ -425,7 +387,7 @@ svn commit -m "Staging site for release"]]></source>
                     <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
                   </li>
                   <li>Right click on the open 
-                    <tt>org.apache.syncope-XXX</tt> staging repo
+                    <code>org.apache.syncope-XXX</code> staging repo
                     and select 
                     <strong>Close</strong>.
                   </li>
@@ -433,26 +395,6 @@ svn commit -m "Staging site for release"]]></source>
               </li>
             </ol>
           </li>
-          <li>
-            Set the updated version for next development iteration (as provided above to <tt>release:prepare</tt>) in
-            <ol>
-              <li>
-                <tt>ide/eclipse/bundles/org.apache.syncope.ide.eclipse.plugin/META-INF/MANIFEST.MF</tt>
-              </li>
-              <li>
-                <tt>ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/META-INF/MANIFEST.MF</tt>
-              </li>
-              <li>
-                <tt>ide/eclipse/releng/org.apache.syncope.ide.eclipse.site/category.xml</tt>
-              </li>
-              <li>
-                <tt>ide/eclipse/bundles/org.apache.syncope.ide.eclipse.tests/pom.xml</tt>
-              </li>
-            </ol>
-            then commit and push:
-            <source><![CDATA[git commit -a -m "Updating Eclipse files for next development iteration"
-git push]]></source>            
-          </li>
         </ol>
       </subsection>
       
@@ -460,7 +402,7 @@ git push]]></source>
         <ol>
           <li>
             Create a 
-            <tt>VOTE</tt> email thread on
+            <code>VOTE</code> email thread on 
             <a href="mailto:dev@syncope.apache.org">syncope-dev</a> to record votes as replies, e.g.:
             <pre><![CDATA[
 To: dev@syncope.apache.org
@@ -481,7 +423,7 @@ Maven staging repo:
 https://repository.apache.org/content/repositories/orgapachesyncope-ZZZZ/
 
 Staging site:
-https://syncope.apache.org/$VERSION/
+http://syncope.apache.org/$VERSION/
 
 PGP release keys (signed using ABCDEFG):
 https://downloads.apache.org/syncope/KEYS
@@ -494,7 +436,7 @@ Vote will be open for 72 hours.
           </li>
           <li>
             Perform a review of the release and cast your vote; more details on
-            <a href="http://www.apache.org/dev/release.html">Apache releases</a>.
+            <a href="https://www.apache.org/dev/release.html">Apache releases</a>.
           </li>
           <li>A -1 vote does not necessarily mean that the vote must be redone,
             however it is usually a good idea to rollback the release if a -1 vote is
@@ -547,7 +489,7 @@ Best regards.
                 <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
               </li>
               <li>Right click on the closed 
-                <tt>org.apache.syncope-XXX</tt> staging repo and select
+                <code>org.apache.syncope-XXX</code> staging repo and select 
                 <strong>Release</strong>.
               </li>
             </ol>
@@ -604,7 +546,7 @@ svn commit -m "Promoting the staging site"]]></source>
       <ol>
         <li>
           <p>Reply to the initial vote email prepending 
-            <tt>[CANCELED]</tt> to the original subject.
+            <code>[CANCELED]</code> to the original subject.
           </p>
         </li>
         <li>
@@ -624,7 +566,7 @@ svn commit -m "Promoting the staging site"]]></source>
         </li>
         <li>
           <p>Delete the GIT tag created by the 
-            <tt>release:perform</tt> step:
+            <code>release:perform</code> step:
           </p>
           <source>git tag -d $VERSION &amp;&amp; git push origin</source>
         </li>
@@ -646,7 +588,7 @@ svn commit -m "Promoting the staging site"]]></source>
               <strong>Staging tab --&gt; Name column --&gt; org.apache.syncope</strong>
             </li>
             <li>Right click on the closed 
-              <tt>org.apache.syncope-XXX</tt> staging repo and select
+              <code>org.apache.syncope-XXX</code> staging repo and select 
               <strong>Drop</strong>.
             </li>
           </ol>
diff --git a/src/site/xdoc/security.xml b/src/site/xdoc/security.xml
index 4167a21..ecc9c77 100644
--- a/src/site/xdoc/security.xml
+++ b/src/site/xdoc/security.xml
@@ -30,11 +30,180 @@ under the License.
 
     <section name="Security Advisories">
       <p>This page lists all security vulnerabilities fixed in released versions of Apache Syncope.</p>
-      <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the <a href="building.html">building instructions</a> or <a href="docs/getting-started.html#create-project">re-generate your Maven project</a> from published archetype.</p>
+      <p>Please note that binary patches are never provided. If you need to apply a source code patch, use the
+        <a href="building.html">building instructions</a> or 
+        <a href="docs/getting-started.html#create-project">re-generate your Maven project</a> from published archetype.</p>
 
-      <p>If you want to report a vulnerability, please follow <a href="http://www.apache.org/security/">the procedure</a>.</p>
+      <p>If you want to report a vulnerability, please follow <a href="https://www.apache.org/security/">the procedure</a>.</p>
 
-      <subsection name="CVE-2018-17186: XXE on BPMN definitions">	
+      <subsection name="CVE-2020-11977: Remote Code Execution via Flowable workflow definition">
+        <p>When the Flowable extension is enabled, an administrator with workflow entitlements can use Shell Service Tasks to perform malicious operations, including but not limited
+           to file read, file write, and code execution.</p>
+
+        <p>
+          <b>Severity</b>
+        </p>
+        <p>Low</p>
+
+        <p>
+          <b>Affects</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.1.X releases prior to 2.1.7</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Solution</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.1.X users should upgrade to 2.1.7</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Fixed in</b>
+        </p>
+        <p>
+          <ul>
+            <li>Release 2.1.7</li>
+          </ul>
+        </p>
+
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-11977">full CVE advisory</a>.</p>
+      </subsection>
+
+      <subsection name="CVE-2020-1961: Server-Side Template Injection on mail templates">
+        <p>Vulnerability to Server-Side Template Injection on Mail templates enabling attackers to inject arbitrary JEXL
+           expressions, leading to Remote Code Execution (RCE) was discovered.</p>
+
+        <p>
+          <b>Severity</b>
+        </p>
+        <p>Important</p>
+
+        <p>
+          <b>Affects</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.0.X releases prior to 2.0.15</li>
+            <li>2.1.X releases prior to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Solution</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.0.X users should upgrade to 2.0.15</li>
+            <li>2.1.X users should upgrade to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Fixed in</b>
+        </p>
+        <p>
+          <ul>
+            <li>Release 2.0.15</li>
+            <li>Release 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1961">full CVE advisory</a>.</p>
+      </subsection>
+
+      <subsection name="CVE-2020-1959: Multiple Remote Code Execution Vulnerabilities">	
+        <p>A Server-Side Template Injection was identified in Syncope enabling attackers to inject arbitrary Java EL
+           expressions, leading to an unauthenticated Remote Code Execution (RCE) vulnerability.
+           Apache Syncope uses Java Bean Validation (JSR 380) custom constraint validators. When building custom
+           constraint violation error messages, they support different types of interpolation, including Java EL
+           expressions.
+           Therefore, if an attacker can inject arbitrary data in the error message template being passed, they will be
+           able to run arbitrary Java code.</p>
+
+        <p>
+          <b>Severity</b>
+        </p>
+        <p>Important</p>
+
+        <p>
+          <b>Affects</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.1.X releases prior to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Solution</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.1.X users should upgrade to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Fixed in</b>
+        </p>
+        <p>
+          <ul>
+            <li>Release 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-1959">full CVE advisory</a>.</p>
+      </subsection>
+
+      <subsection name="CVE-2019-17557: Enduser UI XSS">
+        <p>It was found that the EndUser UI login page reflects the successMessage parameters.
+           By this mean, a user accessing the Enduser UI could execute javascript code from URL query string.</p>
+
+        <p>
+          <b>Severity</b>
+        </p>
+        <p>Medium</p>
+
+        <p>
+          <b>Affects</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.0.X releases prior to 2.0.15</li>
+            <li>2.1.X releases prior to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Solution</b>
+        </p>
+        <p>
+          <ul>
+            <li>2.0.X users should upgrade to 2.0.15</li>
+            <li>2.1.X users should upgrade to 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>
+          <b>Fixed in</b>
+        </p>
+        <p>
+          <ul>
+            <li>Release 2.0.15</li>
+            <li>Release 2.1.6</li>
+          </ul>
+        </p>
+
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-17557">full CVE advisory</a>.</p>
+      </subsection>
+
+      <subsection name="CVE-2018-17186: XXE on BPMN definitions">
         <p>An administrator with workflow definition entitlements can use DTD to perform malicious operations, including
           but not limited to file read, file write, and code execution.</p>
 
@@ -61,7 +230,7 @@ under the License.
           <ul>
             <li>2.0.X users should upgrade to 2.0.11</li>
             <li>2.1.X users should upgrade to 2.1.2</li>
-          </ul>          
+          </ul>
         </p>
 
         <p>
@@ -79,10 +248,10 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17186">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17186">full CVE advisory</a>.</p>
       </subsection>
 
-      <subsection name="CVE-2018-17184: Stored XSS">	
+      <subsection name="CVE-2018-17184: Stored XSS">
         <p>A malicious user with enough administration entitlements can inject html-like elements containing JavaScript
           statements into Connector names, Report names, AnyTypeClass keys and Policy descriptions.<br/>
           When another user with enough administration entitlements edits one of the Entities above via Admin Console,
@@ -110,7 +279,7 @@ under the License.
           <ul>
             <li>2.0.X users should upgrade to 2.0.11</li>
             <li>2.1.X users should upgrade to 2.1.2</li>
-          </ul>          
+          </ul>
         </p>
         
         <p>
@@ -123,12 +292,12 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17184">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-17184">full CVE advisory</a>.</p>
       </subsection>
 
-      <subsection name="CVE-2018-1322: Information disclosure via FIQL and ORDER BY sorting">	
+      <subsection name="CVE-2018-1322: Information disclosure via FIQL and ORDER BY sorting">
         <p>An administrator with user search entitlements can recover sensitive security values using the
-          <tt>fiql</tt> and <tt>orderby</tt> parameters.</p>
+          <code>fiql</code> and <code>orderby</code> parameters.</p>
 
         <p>
           <b>Severity</b>
@@ -153,7 +322,7 @@ under the License.
           <ul>
             <li>Syncope 1.2.x users should upgrade to 1.2.11</li>
             <li>Syncope 2.0.x users should upgrade to 2.0.8</li>
-          </ul>          
+          </ul>
         </p>
         
         <p>
@@ -171,10 +340,10 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1322">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1322">full CVE advisory</a>.</p>
       </subsection>
 
-      <subsection name="CVE-2018-1321: Remote code execution by administrators with report and template entitlements">	
+      <subsection name="CVE-2018-1321: Remote code execution by administrators with report and template entitlements">
         <p>An administrator with report and template entitlements can use XSL Transformations (XSLT) to perform
           malicious operations, including but not limited to file read, file write, and code execution.</p>
 
@@ -201,7 +370,7 @@ under the License.
           <ul>
             <li>Syncope 1.2.x users should upgrade to 1.2.11</li>
             <li>Syncope 2.0.x users should upgrade to 2.0.8</li>
-          </ul>          
+          </ul>
         </p>
         
         <p>
@@ -219,10 +388,10 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1321">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-1321">full CVE advisory</a>.</p>
       </subsection>
 
-      <subsection name="CVE-2014-3503: Insecure Random implementations used to generate passwords">	
+      <subsection name="CVE-2014-3503: Insecure Random implementations used to generate passwords">
         <p>A password is generated for a user in Apache Syncope under certain  circumstances, when no existing password 
           is found. However, the password generation code is relying on insecure Random implementations, which means 
           that an attacker could attempt to guess a generated password.</p>
@@ -246,7 +415,7 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3503">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3503">full CVE advisory</a>.</p>
       </subsection>
 
       <subsection name="CVE-2014-0111: Remote code execution by an authenticated administrator">	
@@ -274,7 +443,7 @@ under the License.
           </ul>
         </p>
 
-        <p>Read the <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0111">full CVE advisory</a>.</p>
+        <p>Read the <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-0111">full CVE advisory</a>.</p>
       </subsection>
     </section>
 
diff --git a/standalone/NOTICE b/standalone/NOTICE
index cad6c8e..87adf84 100644
--- a/standalone/NOTICE
+++ b/standalone/NOTICE
@@ -1,5 +1,5 @@
 Apache Syncope
-Copyright 2012-2021 The Apache Software Foundation
+Copyright 2012-2022 The Apache Software Foundation
 
 This product includes software developed by:
 The Apache Software Foundation (http://www.apache.org/).