Merge branch 'master' into 4031-separate-history-cleanup-page

content/installation/full/was/manual-liberty.md

@@ -484,7 +484,7 @@ following empty XML sub-element:
 ```
 
 In the code snippet above, the `camunda-bpm-platform` segment of the `properties` element is defined by the `name`
-attribute of the [Camunda Platform EAR application](#camunda-platform-ear), while the `camunda-ibm-websphere-rar` is
+attribute of the [Camunda 7 EAR application](#camunda-platform-ear), while the `camunda-ibm-websphere-rar` is
 the name of the EAR JCA Resource Adapter camunda-ibm-websphere-rar module, and shouldn't be changed.
 
 # Optional components

content/installation/full/wls/manual.md

@@ -34,7 +34,7 @@ Before you can install the Camunda components, you need to perform a number of r
 
 ## Resource Configuration
 
-The Camunda Platform requires a set of resources that need to be configured at the application server level:
+Camunda 7 requires a set of resources that need to be configured at the application server level:
 
 * One or multiple datasources to be used by the engine.
 * A work manager for the job executor.
@@ -118,7 +118,7 @@ camunda-ee-oracle-wls-$PLATFORM_VERSION.zip
       |-- camunda-oracle-weblogic-ear-$PLATFORM_VERSION.ear
 ```
 
-The `camunda-oracle-weblogic-ear` is a Java EE application providing the Camunda services. It contains an embedded JCA Resource Adapter, the camunda-oracle-weblogic-rar, which provides the jobexecutor service to the Camunda Platform.
+The `camunda-oracle-weblogic-ear` is a Java EE application providing the Camunda services. It contains an embedded JCA Resource Adapter, the camunda-oracle-weblogic-rar, which provides the jobexecutor service to Camunda 7.
 It must be installed to your Oracle WebLogic Application Server.
 
 

content/introduction/supported-environments.md

@@ -34,7 +34,7 @@ Run Camunda in every Java-runnable environment. Camunda is supported with our QA
 
 * Apache Tomcat 9.0
 * JBoss EAP 7.4
-* WildFly Application Server 23.0 / 26.0 / 27.0 / 29.0
+* WildFly Application Server 23.0 / 26.0 / 27.0 / 29.0 / 31.0
 * IBM WebSphere Liberty 22 with Java EE 8 features ([Enterprise Edition only](http://camunda.com/enterprise/), 
   see [Installation guide]({{< ref "/installation/full/was/manual-liberty.md" >}}))
 * Oracle WebLogic Server 14c (14R1) ([Enterprise Edition only](http://camunda.com/enterprise/))
@@ -72,13 +72,13 @@ Clustered or replicated databases are supported given the following conditions.
 
 # Java
 
-* Java 11 / 17 (if supported by your application server/container)
+* Java 11 / 17 / 21 (if supported by your application server/container)
 
 
 # Java Runtime
 
-* Oracle JDK 11 / 17
-* OpenJDK 11 / 17, including builds of the following products:
+* Oracle JDK 11 / 17 / 21
+* OpenJDK 11 / 17 / 21, including builds of the following products:
   * Oracle OpenJDK
   * Eclipse Temurin JDK
   * Amazon Corretto

content/update/ce-to-ee.md

@@ -12,7 +12,7 @@ menu:
 
 ---
 
-If you’re hoping to utilize [features of Enterprise Edition](https://camunda.com/enterprise/) (such as see how many process instances have been run, token history, heatmaps, and migrate model versions) you may be interested in migrating from Camunda Platform 7 Community Edition to the Enterprise Edition.
+If you’re hoping to utilize [features of Enterprise Edition](https://camunda.com/platform-7/editions/) (such as see how many process instances have been run, token history, heatmaps, and migrate model versions) you may be interested in migrating from Camunda Platform 7 Community Edition to the Enterprise Edition.
 
 In this guide, we’ll step through migration from Camunda Platform 7 Community Edition to Enterprise Edition.
 

content/user-guide/quarkus-integration/version-compatibility.md

@@ -35,6 +35,10 @@ Only these default combinations are recommended (and supported) by Camunda.
     <td>7.20.x</td>
     <td>3.2.x.Final</td>
   </tr>
+  <tr>
+    <td>7.21.0</td>
+    <td>3.7.x</td>
+  </tr>
 </table>
 
 In case a certain Quarkus version has a bug, you can override the existing Quarkus version by adding the following

content/webapps/admin/auditing.md

@@ -10,7 +10,7 @@ menu:
 
 ---
 {{< enterprise >}}
-  Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+  Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 It is often desired to inspect which user performed which operation for auditing purposes. Admin operations are logged in the [user operation log]({{< ref "/user-guide/process-engine/history/user-operation-log.md" >}}) that is part of the process engine's history. The log allows to understand

content/webapps/admin/configuration.md

@@ -16,7 +16,7 @@ available:
 
 # LDAP
 
-If you connect the Camunda Platform with the LDAP identity service, you have read-only access to the users and groups. Create new users and groups via the LDAP system, but not in the admin application. Find more information about how to configure the process engine in order to use the LDAP identity service [here]({{< ref "/user-guide/process-engine/identity-service.md#the-ldap-identity-service" >}}).
+If you connect Camunda 7 with the LDAP identity service, you have read-only access to the users and groups. Create new users and groups via the LDAP system, but not in the admin application. Find more information about how to configure the process engine in order to use the LDAP identity service [here]({{< ref "/user-guide/process-engine/identity-service.md#the-ldap-identity-service" >}}).
 
 # Logo and header color
 

content/webapps/admin/plugins.md

@@ -12,7 +12,7 @@ menu:
 ---
 
 {{< note title="Plugin Compatibility" class="info" >}}
-  Please note that the code of Admin plugins might need to be migrated when updating Camunda Platform to a higher version (e.g. CSS styles).
+  Please note that the code of Admin plugins might need to be migrated when updating Camunda 7 to a higher version (e.g. CSS styles).
 {{< /note >}}
 
 Admin uses the concept of plugins to add own functionality without having to extend or hack the Admin web application.
@@ -46,7 +46,7 @@ properties: {
 
 {{< img src="../img/admin-start-page-view.png" title="Dashboard" >}}
 
-With Camunda Platform 7.5, the Admin webapp gets a dashboard based on plugins similar to the [Cockpit dashboard ones]({{< ref "/webapps/cockpit/extend/plugins.md" >}}#dashboard).
+With Camunda 7.5, the Admin webapp gets a dashboard based on plugins similar to the [Cockpit dashboard ones]({{< ref "/webapps/cockpit/extend/plugins.md" >}}#dashboard).
 
 This plugin points properties contain the attributes `label` and `pagePath`, which are the heading of the new Section as well as the linked sub-page of the heading. If `pagePath` is `undefined`, the label will not be rendered as a link.
 

content/webapps/admin/system-management.md

@@ -13,7 +13,7 @@ menu:
 
 {{< img src="../img/admin-system-management.png" title="System Management" >}}
 
-The System Settings menu gives you general information about the process engine. It enables users with system permissions to access certain system information, including telemetry, metrics, and license key. Provided that you are using the Enterprise Edition of the Camunda Platform, you can also insert your *License Key*.
+The System Settings menu gives you general information about the process engine. It enables users with system permissions to access certain system information, including telemetry, metrics, and license key. Provided that you are using the Enterprise Edition of Camunda 7, you can also insert your *License Key*.
 
 {{< note title="Accessing the System Settings menu" class="info" >}}
 The System Settings menu is only usable by users which are granted with *All* permission for authorizations.
@@ -34,7 +34,7 @@ The Execution Metrics menu in Admin displays an approximate number of *Flow Node
 # Camunda License Key
 
 {{< enterprise >}}
-  Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not 
+  Please note that this feature is only included in the enterprise edition of Camunda 7, it is not 
   available in the community edition.
 {{< /enterprise >}}
 
@@ -47,14 +47,14 @@ Whenever you see one of the following messages, a valid license key must be ente
 {{< img src="../img/admin-license-prompt.png" title="License Prompt for Admins" >}}
 {{< img src="../img/admin-license-prompt-noAdmin.png" title="License Prompt for Non-Admins" >}}
 
-If you have administrator authorizations, insert your company's license key for the Camunda Platform and view 
+If you have administrator authorizations, insert your company's license key for Camunda 7 and view 
 some License Key details such as the Company Id and the validity of the license key. The Admin system setting menu 
 offers the possibility to enter additional licenses, for instance when your existing license is expiring and you want 
 to enter a new license key.
 
 If you do not have administrator authorizations, please contact your administrator so that they can enter the license.
 
-In case you are running Camunda Platform locally, you can use this URL to enter the license key:
+In case you are running Camunda 7 locally, you can use this URL to enter the license key:
 http://localhost:8080/camunda/app/admin/default/#/system?section=system-settings-license
 
 {{< img src="../img/admin-license-key.png" title="License Key" >}}

content/webapps/cockpit/_index.md

@@ -12,7 +12,7 @@ menu:
 ---
 
 
-Camunda Platform Cockpit is a web application for monitoring and operations. It provides access to deployed BPMN processes and DMN decisions, allows searching though running and ended instances and performing operations on these.
+Camunda 7 Cockpit is a web application for monitoring and operations. It provides access to deployed BPMN processes and DMN decisions, allows searching though running and ended instances and performing operations on these.
 
 {{< img src="img/dashboard.png" title="Cockpit Dashboard" >}}
 

content/webapps/cockpit/auditing.md

@@ -12,10 +12,10 @@ menu:
 
 ---
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
-Since Cockpit is a very powerful tool, it is often desired to inspect which user performed which operation for auditing purposes. Cockpit operations that change state are logged in the Camunda Platform's [user operation log]({{< ref "/user-guide/process-engine/history/user-operation-log.md" >}}) that is part of the process engine history. The log allows to understand
+Since Cockpit is a very powerful tool, it is often desired to inspect which user performed which operation for auditing purposes. Cockpit operations that change state are logged in Camunda 7's [user operation log]({{< ref "/user-guide/process-engine/history/user-operation-log.md" >}}) that is part of the process engine history. The log allows to understand
 
 * which user performed an operation
 * which operation was performed

content/webapps/cockpit/batch/batch-operation.md

@@ -12,7 +12,7 @@ menu:
 ---
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/batch/batch_operation_definition.png" alt="Batch Operation Definition" caption="" >}}

content/webapps/cockpit/bpmn/dashboard.md

@@ -45,7 +45,7 @@ You can also switch to the preview tab which displays the rendered process model
 # Process Instances Search
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-search.png" title="cockpit Search" >}}
@@ -145,7 +145,7 @@ start editing by clicking on the value. You can expand the value in a modal dial
 # Delete process definitions
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-delete-process-definition.png" title="Delete Process Definition" >}}

content/webapps/cockpit/bpmn/failed-jobs.md

@@ -35,7 +35,7 @@ Alternatively, you can change the retries of jobs asynchronously via the [Batch
 # Bulk Retry
 
 {{< enterprise >}}
-  Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+  Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-bulk-retry.png" title="Batch Retry" >}}

content/webapps/cockpit/bpmn/process-definition-view.md

@@ -94,7 +94,7 @@ Add a filter for process instances by filtering for a `numeric` (double, integer
 Add a filter to the [process definition history view][process-definition-history-view]. Select filters for variables, the start date and time, the activity ID or the business key of process instances as in [the runtime view](#runtime-view). In addition, select filters for completed, running or process instances with a certain end date and time.
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 **Filtering for completed and running process instances**
@@ -118,7 +118,7 @@ Add a filter for process instances by end date. Please note that the date must b
 # Delete Multiple Running Process Instances
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-bulk-delete.png" title="Batch Delete Running Process Instances" >}}
@@ -128,15 +128,15 @@ Delete multiple running process instances at once by using this feature. In the
 # Delete A Process Definition Version
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 Delete the current process definition version by using this feature. In the process definition view, hit the {{< glyphicon name="trash" >}} button on the right side. This opens a confirmation screen in which you can select flags to apply to the delete. You can always choose to enable/disable skipping custom listeners. However, if the process definition version has process instances running, enabling the cascading flag becomes mandatory.
 
 # BPMN Documentation
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-documentation.png" title="Set Job Priority" >}}

content/webapps/cockpit/bpmn/process-history-views.md

@@ -14,7 +14,7 @@ menu:
 
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 At the top of the process definition view and the process instance view, you can hit the _History_ button to access the history view.

content/webapps/cockpit/bpmn/process-instance-migration.md

@@ -14,7 +14,7 @@ menu:
 
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/migration/step1_overview.png" title="Process Instance Migration" >}}

content/webapps/cockpit/bpmn/process-instance-modification.md

@@ -14,7 +14,7 @@ menu:
 
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cockpit-modification.png" title="Process Instance Modification" >}}

content/webapps/cockpit/bpmn/process-instance-restart.md

@@ -13,7 +13,7 @@ menu:
 
 ---
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 

content/webapps/cockpit/cleanup.md

@@ -12,7 +12,7 @@ menu:
 
 ---
 {{< enterprise >}}
-  Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+  Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../img/cockpit-cleanup-page.png" title="Cockpit Cleanup View" >}}

content/webapps/cockpit/cmmn/_index.md

@@ -16,5 +16,5 @@ menu:
 Cockpit allows monitoring of CMMN Cases. The dashboard is the entry point to the CMMN monitoring features. Either select a deployed case definition, or search for a case instance. This will either take you to the case definition view or the case instance view, respectively.
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}

content/webapps/cockpit/cmmn/case-definition-view.md

@@ -11,7 +11,7 @@ menu:
 
 ---
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cmmn/case-definition-view.png" title="Case Definition View" >}}

content/webapps/cockpit/cmmn/case-instance-view.md

@@ -11,7 +11,7 @@ menu:
 
 ---
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../../img/cmmn/case-instance-view.png" title="Case Instance View" >}}

content/webapps/cockpit/cmmn/dashboard.md

@@ -12,7 +12,7 @@ menu:
 
 ---
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 The CMMN Cases dashboard of Cockpit is the entry point for case monitoring. It comes with a pre-installed plugin, which lets you see deployed case definitions. Additional [plugins]({{< ref "/webapps/cockpit/extend/plugins.md" >}}) can be added to the cases dashboard.

content/webapps/cockpit/dashboard.md

@@ -25,7 +25,7 @@ Additional [plugins]({{< ref "/webapps/cockpit/extend/plugins.md" >}}) can be ad
 # Metrics
 
 {{< enterprise >}}
-Please note that this feature is only included in the enterprise edition of the Camunda Platform, it is not available in the community edition.
+Please note that this feature is only included in the enterprise edition of Camunda 7, it is not available in the community edition.
 {{< /enterprise >}}
 
 {{< img src="../img/dashboard-metrics.png" title="Cockpit Dashboard Metrics" >}}