From 7b2683999ebcea11c9b6c03d540952a5d383449f Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Tue, 23 Sep 2025 23:12:18 +0200
Subject: [PATCH 1/2] Cleanup some usage of deprecated code

Production code:

* Remove no longer needed excludeArtifactIds from spring-boot-maven-plugin
* Replace Spring Security AntPathRequestMatcher with PathPatternRequestMatcher
* Replace deprecate usage of Jackson JsonNode#fields with JsonNode#properties
* Replace deprecated usage of Jackson ISO8601DateFormat with our own RequestUtil for parsing dates
* Replace deprecated usage of Jackson ISO8601Utils with Instant parsing
* Dates are now returned over REST as ISO 8601 with milliseconds and in the UTC timezone

Test code:
* Replace deprecated usage of ExtensionContext.Store.CloseableResource with AutoCloseable
* Replace deprecate usage of Jackson JsonNode#fields with JsonNode#properties
* Replace deprecated usage of ActiveMQ SimpleString#toSimpleString to SimpleString#of
* Replace deprecated method implementation of JUnit Jupiter ArgumentsProvider
* Replace deprecated usage of Jackson ISO8601DateFormat with instant parsing
---
 distro/src/readme.html                        | 13 ++++++
 modules/flowable-app-rest/pom.xml             |  5 --
 .../rest/conf/SecurityConfiguration.java      |  9 ++--
 .../test/CmmnEngineConfiguratorExtension.java |  4 +-
 .../impl/delete/BatchDeleteCaseConfig.java    |  8 ++--
 .../test/ResourceFlowableCmmnExtension.java   |  2 +-
 .../RepetitionVariableAggregationTest.java    |  9 ++--
 .../rest/service/BaseSpringRestTestCase.java  | 46 +++++++------------
 ...ricCaseInstanceCollectionResourceTest.java |  4 +-
 ...istoricMilestoneInstanceResourcesTest.java |  2 +-
 ...HistoricPlanItemInstanceResourcesTest.java | 22 ++++-----
 ...ricTaskInstanceCollectionResourceTest.java | 14 +++---
 ...HistoricTaskInstanceQueryResourceTest.java | 16 +++----
 .../api/management/JobResourceTest.java       |  8 ++--
 .../CaseInstanceCollectionResourceTest.java   |  2 +-
 .../CaseInstanceQueryResourceTest.java        |  3 +-
 .../api/runtime/CaseInstanceResourceTest.java |  2 +-
 ...stanceVariablesCollectionResourceTest.java |  4 +-
 .../EventSubscriptionResourceTest.java        |  3 +-
 .../runtime/TaskCollectionResourceTest.java   | 10 ++--
 .../service/api/runtime/TaskResourceTest.java | 10 ++--
 .../TaskVariablesCollectionResourceTest.java  |  2 +-
 .../rest/util/DateToStringSerializer.java     |  8 +---
 .../variable/DateRestVariableConverter.java   | 15 +++---
 .../test/PluggableFlowableDmnExtension.java   |  4 +-
 .../impl/delete/BatchDeleteProcessConfig.java |  8 ++--
 .../MultiInstanceVariableAggregationTest.java |  8 ++--
 .../jms/EventRegistryJmsConfiguration.java    |  2 +-
 .../ExternalWorkerAcquireJobResourceTest.java |  4 +-
 .../FlowableHttpClientArgumentProvider.java   |  3 +-
 .../history/async/AsyncHistoryDateUtil.java   | 15 ++----
 .../rest/service/BaseSpringRestTestCase.java  | 26 ++++-------
 ...HistoricTaskInstanceQueryResourceTest.java | 18 ++++----
 .../HistoricTaskInstanceResourceTest.java     |  9 ++--
 ...HistoricTaskLogCollectionResourceTest.java |  4 +-
 .../api/management/JobResourceTest.java       | 12 ++---
 .../PropertiesCollectionResourceTest.java     | 11 ++---
 .../ModelCollectionResourceTest.java          |  5 +-
 .../api/repository/ModelResourceTest.java     | 17 ++++---
 ...ProcessInstanceCollectionResourceTest.java |  2 +-
 ...stanceVariablesCollectionResourceTest.java |  4 +-
 .../api/runtime/SignalsResourceTest.java      |  3 +-
 .../runtime/TaskCollectionResourceTest.java   |  2 +-
 .../api/runtime/TaskEventResourceTest.java    |  3 +-
 .../service/api/runtime/TaskResourceTest.java | 11 ++---
 .../TaskVariablesCollectionResourceTest.java  |  2 +-
 46 files changed, 173 insertions(+), 221 deletions(-)

diff --git a/distro/src/readme.html b/distro/src/readme.html
index 4fe5562a069..3738f6284ee 100644
--- a/distro/src/readme.html
+++ b/distro/src/readme.html
@@ -28,6 +28,19 @@ <h1>Links</h1>
 
 <h1>Flowable Release Notes</h1>
 
+<h3>Release Notes - Flowable - 8.0.0</h3>
+
+<ul>
+    <li>
+        Date variables will now include the milliseconds when they are returned over REST.
+        E.g., up to now a date variable with the value of <code>2020-05-04T09:25:45.583Z</code> would have been returned as <code>2020-05-04T09:25:45Z</code>.
+        However, now it would be returned as <code>2020-05-04T09:25:45.583Z</code> which is still ISO 8601 compliant.
+    </li>
+    <li>
+        Date properties e.g., Process Instance start time will be returned as an ISO 8601 in the UTC timezone.
+        E.g., if the start time was returned as <code>2025-09-24T09:58:12.609+02:00</code> now it is returned as <code>2025-09-24T07:58:12.609Z</code>.
+    </li>
+</ul>
 <h3>Release Notes - Flowable - 7.2.0</h3>
 
 <ul>
diff --git a/modules/flowable-app-rest/pom.xml b/modules/flowable-app-rest/pom.xml
index 04fa9700861..af3bdf58b2f 100644
--- a/modules/flowable-app-rest/pom.xml
+++ b/modules/flowable-app-rest/pom.xml
@@ -57,11 +57,6 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>${spring.boot.version}</version>
-                <configuration>
-                    <excludeArtifactIds>
-                        spring-boot-configuration-processor
-                    </excludeArtifactIds>
-                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/modules/flowable-app-rest/src/main/java/org/flowable/rest/conf/SecurityConfiguration.java b/modules/flowable-app-rest/src/main/java/org/flowable/rest/conf/SecurityConfiguration.java
index c005f01b614..13a8b78b34e 100644
--- a/modules/flowable-app-rest/src/main/java/org/flowable/rest/conf/SecurityConfiguration.java
+++ b/modules/flowable-app-rest/src/main/java/org/flowable/rest/conf/SecurityConfiguration.java
@@ -12,8 +12,6 @@
  */
 package org.flowable.rest.conf;
 
-import static org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher;
-
 import org.apache.commons.lang3.StringUtils;
 import org.flowable.rest.app.properties.RestAppProperties;
 import org.flowable.rest.security.BasicAuthenticationProvider;
@@ -30,6 +28,7 @@
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 
 @Configuration(proxyBeanMethods = false)
 @EnableWebSecurity
@@ -61,11 +60,13 @@ public SecurityFilterChain restApiSecurity(HttpSecurity http, AuthenticationProv
         // Swagger docs
         if (isSwaggerDocsEnabled()) {
             httpSecurity
-                .authorizeHttpRequests(authorizeRequests -> authorizeRequests.requestMatchers(antMatcher("/docs/**")).permitAll());
+                    .authorizeHttpRequests(
+                            authorizeRequests -> authorizeRequests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/docs/**")).permitAll());
 
         } else {
             httpSecurity
-                .authorizeHttpRequests(authorizeRequests -> authorizeRequests.requestMatchers(antMatcher("/docs/**")).denyAll());
+                    .authorizeHttpRequests(
+                            authorizeRequests -> authorizeRequests.requestMatchers(PathPatternRequestMatcher.withDefaults().matcher("/docs/**")).denyAll());
             
         }
 
diff --git a/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/CmmnEngineConfiguratorExtension.java b/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/CmmnEngineConfiguratorExtension.java
index 38a78204a17..2c1ae1a5c44 100644
--- a/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/CmmnEngineConfiguratorExtension.java
+++ b/modules/flowable-cmmn-engine-configurator/src/test/java/org/flowable/cmmn/test/CmmnEngineConfiguratorExtension.java
@@ -152,7 +152,7 @@ protected ExtensionContext.Store getStore(ExtensionContext context) {
         return context.getRoot().getStore(NAMESPACE);
     }
 
-    protected static class CloseableEngine implements ExtensionContext.Store.CloseableResource {
+    protected static class CloseableEngine implements AutoCloseable {
 
         protected final ProcessEngine processEngine;
 
@@ -161,7 +161,7 @@ public CloseableEngine(ProcessEngine processEngine) {
         }
 
         @Override
-        public void close() throws Throwable {
+        public void close() {
             if (processEngine != null) {
                 CmmnEngine cmmnEngine = CmmnEngines.getCmmnEngine(processEngine.getName());
                 if (cmmnEngine != null) {
diff --git a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java
index 3b93570bb92..5e7fb68530a 100644
--- a/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java
+++ b/modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/delete/BatchDeleteCaseConfig.java
@@ -142,11 +142,9 @@ protected static HistoricCaseInstanceQuery createQuery(JsonNode queryNode, CmmnE
     }
 
     protected static void populateQuery(JsonNode queryNode, HistoricCaseInstanceQuery query, CmmnEngineConfiguration engineConfiguration) {
-        Iterator<Map.Entry<String, JsonNode>> fieldIterator = queryNode.fields();
-        while (fieldIterator.hasNext()) {
-            Map.Entry<String, JsonNode> field = fieldIterator.next();
-            String property = field.getKey();
-            JsonNode value = field.getValue();
+        for (Map.Entry<String, JsonNode> propertyEntry : queryNode.properties()) {
+            String property = propertyEntry.getKey();
+            JsonNode value = propertyEntry.getValue();
             switch (property) {
                 case "caseDefinitionId":
                     query.caseDefinitionId(value.textValue());
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/ResourceFlowableCmmnExtension.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/ResourceFlowableCmmnExtension.java
index 53c6d4ee267..9d2a31a60c6 100644
--- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/ResourceFlowableCmmnExtension.java
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/ResourceFlowableCmmnExtension.java
@@ -117,7 +117,7 @@ protected ExtensionContext.Store getStore(ExtensionContext context) {
         return context.getStore(NAMESPACE);
     }
 
-    protected static class CloseableEngine implements ExtensionContext.Store.CloseableResource {
+    protected static class CloseableEngine implements AutoCloseable {
 
         protected final CmmnEngine cmmnEngine;
 
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/itemcontrol/RepetitionVariableAggregationTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/itemcontrol/RepetitionVariableAggregationTest.java
index b1e01cb5566..39edcb3db4b 100644
--- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/itemcontrol/RepetitionVariableAggregationTest.java
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/itemcontrol/RepetitionVariableAggregationTest.java
@@ -22,7 +22,6 @@
 import java.time.Month;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -1423,10 +1422,10 @@ public Object aggregateSingleVariable(DelegatePlanItemInstance planItemInstance,
                             arrayNode.add(sourceNode.deepCopy());
                         } else if (node.isObject()) {
                             ObjectNode objectNode = (ObjectNode) node;
-                            Iterator<Map.Entry<String, JsonNode>> fieldsIterator = sourceNode.fields();
-                            while (fieldsIterator.hasNext()) {
-                                Map.Entry<String, JsonNode> field = fieldsIterator.next();
-                                objectNode.set(field.getKey(), field.getValue());
+                            for (Map.Entry<String, JsonNode> property : sourceNode.properties()) {
+                                String propertyName = property.getKey();
+                                JsonNode value = property.getValue();
+                                objectNode.set(propertyName, value);
                             }
                         }
                     }
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
index fa0b3b8ff97..dd3044f93dc 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/BaseSpringRestTestCase.java
@@ -19,14 +19,15 @@
 import java.io.UncheckedIOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.TimeZone;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -59,9 +60,6 @@
 import org.flowable.idm.api.Group;
 import org.flowable.idm.api.IdmIdentityService;
 import org.flowable.idm.api.User;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -118,9 +116,8 @@ public abstract class BaseSpringRestTestCase {
     @Autowired
     protected TestServer server;
 
-    protected DateFormat longDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-    protected DateFormat formatWithoutSeconds = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'");
-    protected DateFormat formatWithMS = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+    protected DateTimeFormatter formatWithoutSeconds = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm'Z'").withZone(ZoneOffset.UTC);
+    protected DateTimeFormatter formatWithoutMilliseconds = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'").withZone(ZoneOffset.UTC);
 
     @BeforeEach
     void init(@CmmnDeploymentId String deploymentId) {
@@ -336,38 +333,27 @@ protected void assertErrorResult(String url, ObjectNode body, int statusCode) th
      * Extract a date from the given string. Assertion fails when invalid date has been provided.
      */
     protected Date getDateFromISOString(String isoString) {
-        DateTimeFormatter dateFormat = ISODateTimeFormat.dateTime();
         try {
-            return dateFormat.parseDateTime(isoString).toDate();
-        } catch (IllegalArgumentException iae) {
-            fail("Illegal date provided: " + isoString);
+            return Date.from(Instant.parse(isoString));
+        } catch (DateTimeParseException iae) {
+            fail("Illegal date provided: " + isoString, iae);
             return null;
         }
     }
 
     protected String getISODateString(Date time) {
-        TimeZone tz = TimeZone.getTimeZone("UTC");
-        longDateFormat.setTimeZone(tz);
-        return longDateFormat.format(time);
+        if (time == null) {
+            return null;
+        }
+        return time.toInstant().toString();
     }
 
     protected String getIsoDateStringWithoutSeconds(Date time) {
-        TimeZone tz = TimeZone.getTimeZone("UTC");
-        formatWithoutSeconds.setTimeZone(tz);
-        return formatWithoutSeconds.format(time);
-    }
-
-    protected String getIsoDateStringWithMS(Date time) {
-        TimeZone tz = TimeZone.getTimeZone("UTC");
-        formatWithMS.setTimeZone(tz);
-        return formatWithMS.format(time);
+        return formatWithoutSeconds.format(time.toInstant());
     }
 
-    protected String getISODateStringWithTZ(Date date) {
-        if (date == null) {
-            return null;
-        }
-        return ISODateTimeFormat.dateTime().print(new DateTime(date));
+    protected String getIsoDateStringWithoutMS(Date time) {
+        return formatWithoutMilliseconds.format(time.toInstant());
     }
 
     protected String buildUrl(String[] fragments, Object... arguments) {
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricCaseInstanceCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricCaseInstanceCollectionResourceTest.java
index 315eeb8519a..33c33a196e6 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricCaseInstanceCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricCaseInstanceCollectionResourceTest.java
@@ -148,12 +148,12 @@ public void testQueryCaseInstances() throws Exception {
         
         assertResultsPresentInDataResponse(url + "?startedBefore=" + getISODateString(futureCal.getTime()), caseInstance.getId(), caseInstance2.getId());
         assertResultsPresentInDataResponse(url + "?startedBefore=" + getIsoDateStringWithoutSeconds(futureCal.getTime()), caseInstance.getId(), caseInstance2.getId());
-        assertResultsPresentInDataResponse(url + "?startedBefore=" + getIsoDateStringWithMS(futureCal.getTime()), caseInstance.getId(), caseInstance2.getId());
+        assertResultsPresentInDataResponse(url + "?startedBefore=" + getISODateString(futureCal.getTime()), caseInstance.getId(), caseInstance2.getId());
         assertResultsPresentInDataResponse(url + "?startedBefore=" + getISODateString(historicCal.getTime()));
         
         assertResultsPresentInDataResponse(url + "?startedAfter=" + getISODateString(historicCal.getTime()), caseInstance.getId(), caseInstance2.getId());
         assertResultsPresentInDataResponse(url + "?startedAfter=" + getIsoDateStringWithoutSeconds(historicCal.getTime()), caseInstance.getId(), caseInstance2.getId());
-        assertResultsPresentInDataResponse(url + "?startedAfter=" + getIsoDateStringWithMS(historicCal.getTime()), caseInstance.getId(), caseInstance2.getId());
+        assertResultsPresentInDataResponse(url + "?startedAfter=" + getIsoDateStringWithoutMS(historicCal.getTime()), caseInstance.getId(), caseInstance2.getId());
 
         assertResultsPresentInDataResponse(url + "?startedAfter=" + getISODateString(futureCal.getTime()));
         
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricMilestoneInstanceResourcesTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricMilestoneInstanceResourcesTest.java
index e4e5611b724..e0be10e4b92 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricMilestoneInstanceResourcesTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricMilestoneInstanceResourcesTest.java
@@ -303,7 +303,7 @@ private void assertHistoricMilestoneValues(HistoricMilestoneInstance expected, J
         assertThat(actual.get("id").textValue()).isEqualTo(expected.getId());
         assertThat(actual.get("name").textValue()).isEqualTo(expected.getName());
         assertThat(actual.get("elementId").textValue()).isEqualTo(expected.getElementId());
-        assertThat(actual.get("timestamp").asText()).isEqualTo(getISODateStringWithTZ(expected.getTimeStamp()));
+        assertThat(actual.get("timestamp").asText()).isEqualTo(getISODateString(expected.getTimeStamp()));
         assertThat(actual.get("caseInstanceId").textValue()).isEqualTo(expected.getCaseInstanceId());
         assertThat(actual.get("caseDefinitionId").textValue()).isEqualTo(expected.getCaseDefinitionId());
 
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricPlanItemInstanceResourcesTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricPlanItemInstanceResourcesTest.java
index 03dc828ee95..95b6e11f2b4 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricPlanItemInstanceResourcesTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricPlanItemInstanceResourcesTest.java
@@ -751,17 +751,17 @@ private void assertHistoricPlanItemValues(HistoricPlanItemInstance expected, Jso
                         + "  referenceId: '" + expected.getReferenceId() + "',"
                         + "  referenceType: '" + expected.getReferenceType() + "',"
                         + "  tenantId: '" + expected.getTenantId() + "',"
-                        + "  createTime: '" + getISODateStringWithTZ(expected.getCreateTime()) + "',"
-                        + "  lastAvailableTime: '" + getISODateStringWithTZ(expected.getLastAvailableTime()) + "',"
-                        + "  lastEnabledTime: '" + getISODateStringWithTZ(expected.getLastEnabledTime()) + "',"
-                        + "  lastDisabledTime: '" + getISODateStringWithTZ(expected.getLastDisabledTime()) + "',"
-                        + "  lastStartedTime: '" + getISODateStringWithTZ(expected.getLastStartedTime()) + "',"
-                        + "  lastSuspendedTime: '" + getISODateStringWithTZ(expected.getLastSuspendedTime()) + "',"
-                        + "  completedTime: '" + getISODateStringWithTZ(expected.getCompletedTime()) + "',"
-                        + "  occurredTime: '" + getISODateStringWithTZ(expected.getOccurredTime()) + "',"
-                        + "  terminatedTime: '" + getISODateStringWithTZ(expected.getTerminatedTime()) + "',"
-                        + "  exitTime: '" + getISODateStringWithTZ(expected.getExitTime()) + "',"
-                        + "  endedTime: '" + getISODateStringWithTZ(expected.getEndedTime()) + "'"
+                        + "  createTime: '" + getISODateString(expected.getCreateTime()) + "',"
+                        + "  lastAvailableTime: '" + getISODateString(expected.getLastAvailableTime()) + "',"
+                        + "  lastEnabledTime: '" + getISODateString(expected.getLastEnabledTime()) + "',"
+                        + "  lastDisabledTime: '" + getISODateString(expected.getLastDisabledTime()) + "',"
+                        + "  lastStartedTime: '" + getISODateString(expected.getLastStartedTime()) + "',"
+                        + "  lastSuspendedTime: '" + getISODateString(expected.getLastSuspendedTime()) + "',"
+                        + "  completedTime: '" + getISODateString(expected.getCompletedTime()) + "',"
+                        + "  occurredTime: '" + getISODateString(expected.getOccurredTime()) + "',"
+                        + "  terminatedTime: '" + getISODateString(expected.getTerminatedTime()) + "',"
+                        + "  exitTime: '" + getISODateString(expected.getExitTime()) + "',"
+                        + "  endedTime: '" + getISODateString(expected.getEndedTime()) + "'"
                         + "}");
 
         assertThatCode(() -> {
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceCollectionResourceTest.java
index 1a5bb9c5ca7..d115066c86f 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceCollectionResourceTest.java
@@ -139,25 +139,25 @@ public void testQueryTaskInstances() throws Exception {
 
             assertResultsPresentInDataResponse(url + "?dueDateAfter=" + getISODateString(new GregorianCalendar(2010, 0, 1).getTime()) , 1, task.getId());
             assertResultsPresentInDataResponse(url + "?dueDateAfter=" + getIsoDateStringWithoutSeconds(new GregorianCalendar(2010, 0, 1).getTime()) , 1, task.getId());
-            assertResultsPresentInDataResponse(url + "?dueDateAfter=" + getIsoDateStringWithMS(new GregorianCalendar(2010, 0, 1).getTime()) , 1, task.getId());
+            assertResultsPresentInDataResponse(url + "?dueDateAfter=" + getIsoDateStringWithoutMS(new GregorianCalendar(2010, 0, 1).getTime()) , 1, task.getId());
 
-            assertResultsPresentInDataResponse(url + "?dueDateAfter=" + longDateFormat.format(new GregorianCalendar(2013, 4, 1).getTime()), 0);
+            assertResultsPresentInDataResponse(url + "?dueDateAfter=" + getISODateString(new GregorianCalendar(2013, 4, 1).getTime()), 0);
 
             assertResultsPresentInDataResponse(url + "?dueDateBefore=" + getISODateString(new GregorianCalendar(2010, 0, 1).getTime()), 0);
             assertResultsPresentInDataResponse(url + "?dueDateBefore=" + getIsoDateStringWithoutSeconds(new GregorianCalendar(2010, 0, 1).getTime()), 0);
-            assertResultsPresentInDataResponse(url + "?dueDateBefore=" + getIsoDateStringWithMS(new GregorianCalendar(2010, 0, 1).getTime()), 0);
+            assertResultsPresentInDataResponse(url + "?dueDateBefore=" + getIsoDateStringWithoutMS(new GregorianCalendar(2010, 0, 1).getTime()), 0);
 
-            assertResultsPresentInDataResponse(url + "?dueDateBefore=" + longDateFormat.format(new GregorianCalendar(2013, 4, 1).getTime()), 1, task.getId());
+            assertResultsPresentInDataResponse(url + "?dueDateBefore=" + getISODateString(new GregorianCalendar(2013, 4, 1).getTime()), 1, task.getId());
 
             created.set(Calendar.YEAR, 2002);
-            assertResultsPresentInDataResponse(url + "?taskCreatedBefore=" +getISODateString(created.getTime()), 1, task1.getId());
+            assertResultsPresentInDataResponse(url + "?taskCreatedBefore=" + getISODateString(created.getTime()), 1, task1.getId());
             assertResultsPresentInDataResponse(url + "?taskCreatedBefore=" +getIsoDateStringWithoutSeconds(created.getTime()), 1, task1.getId());
-            assertResultsPresentInDataResponse(url + "?taskCreatedBefore=" +getIsoDateStringWithMS(created.getTime()), 1, task1.getId());
+            assertResultsPresentInDataResponse(url + "?taskCreatedBefore=" +getIsoDateStringWithoutMS(created.getTime()), 1, task1.getId());
 
             created.set(Calendar.YEAR, 2000);
             assertResultsPresentInDataResponse(url + "?taskCreatedAfter=" + getISODateString(created.getTime()), 3, task1.getId(), task2.getId());
             assertResultsPresentInDataResponse(url + "?taskCreatedAfter=" + getIsoDateStringWithoutSeconds(created.getTime()), 3, task1.getId(), task2.getId());
-            assertResultsPresentInDataResponse(url + "?taskCreatedAfter=" + getIsoDateStringWithMS(created.getTime()), 3, task1.getId(), task2.getId());
+            assertResultsPresentInDataResponse(url + "?taskCreatedAfter=" + getIsoDateStringWithoutMS(created.getTime()), 3, task1.getId(), task2.getId());
 
             // Without tenant id
             assertResultsPresentInDataResponse(url + "?withoutTenantId=true", 2, task.getId(), task1.getId());
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
index 156857f388d..06a33171dcc 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
@@ -219,35 +219,35 @@ public void testQueryTaskInstances() throws Exception {
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateAfter", longDateFormat.format(new GregorianCalendar(2015, 0, 1).getTime()));
+        requestNode.put("dueDateAfter", getISODateString(new GregorianCalendar(2015, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateAfter", longDateFormat.format(new GregorianCalendar(2018, 4, 1).getTime()));
+        requestNode.put("dueDateAfter", getISODateString(new GregorianCalendar(2018, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateBefore", longDateFormat.format(new GregorianCalendar(2015, 0, 1).getTime()));
+        requestNode.put("dueDateBefore", getISODateString(new GregorianCalendar(2015, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateBefore", longDateFormat.format(new GregorianCalendar(2018, 4, 1).getTime()));
+        requestNode.put("dueDateBefore", getISODateString(new GregorianCalendar(2018, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", longDateFormat.format(new GregorianCalendar(2015, 0, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2015, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, finishedTaskCase1.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", longDateFormat.format(new GregorianCalendar(2018, 4, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2018, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedBefore", longDateFormat.format(new GregorianCalendar(2015, 0, 1).getTime()));
+        requestNode.put("taskCompletedBefore", getISODateString(new GregorianCalendar(2015, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", longDateFormat.format(new GregorianCalendar(2015, 3, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2015, 3, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, finishedTaskCase1.getId());
 
         requestNode = objectMapper.createObjectNode();
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/management/JobResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/management/JobResourceTest.java
index cc575051cd7..b3df82363e6 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/management/JobResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/management/JobResourceTest.java
@@ -75,7 +75,7 @@ public void testGetTimerJob() throws Exception {
                         + "elementName: 'Timer listener',"
                         + "handlerType: 'cmmn-trigger-timer',"
                         + "retries: " + timerJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(timerJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(timerJob.getDuedate()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
@@ -116,7 +116,7 @@ public void testGetDeadLetterJob() throws Exception {
                         + "elementName: 'Timer listener',"
                         + "handlerType: 'cmmn-trigger-timer',"
                         + "retries: " + deadLetterJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(deadLetterJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(deadLetterJob.getDuedate()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
@@ -175,9 +175,9 @@ public Void execute(CommandContext commandContext) {
                         + "elementName: 'Timer listener',"
                         + "handlerType: 'cmmn-trigger-timer',"
                         + "retries: " + lockedJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(lockedJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(lockedJob.getDuedate()) + "',"
                         + "lockOwner: 'test',"
-                        + "lockExpirationTime: " + new TextNode(getISODateStringWithTZ(lockedJob.getLockExpirationTime())) + ","
+                        + "lockExpirationTime: '" + getISODateString(lockedJob.getLockExpirationTime()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceCollectionResourceTest.java
index 5a245329bfc..4d9ab91c32e 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceCollectionResourceTest.java
@@ -614,7 +614,7 @@ public void testStartCaseWithVariables() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", Boolean.TRUE),
-                        entry("dateVariable", longDateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceQueryResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceQueryResourceTest.java
index b0f06677dfe..9a10572f69b 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceQueryResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceQueryResourceTest.java
@@ -35,7 +35,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -283,7 +282,7 @@ public void testQueryCaseInstancesPagingAndSorting() throws Exception {
                         + "    id: '" + caseInstance1.getId() + "',"
                         + "    caseDefinitionName: 'One Human Task Case',"
                         + "    caseDefinitionDescription: 'A human task case',"
-                        + "    startTime: " + new TextNode(getISODateStringWithTZ(caseInstance1.getStartTime())) + ","
+                        + "    startTime: '" + getISODateString(caseInstance1.getStartTime()) + "',"
                         + "    startUserId: 'queryCaseUser'"
                         + "  }"
                         + "]");
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceResourceTest.java
index e5a1ab36d2f..22494efaf92 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceResourceTest.java
@@ -90,7 +90,7 @@ public void testGetCaseInstance() throws Exception {
                         + " callbackId: 'testCallbackId',"
                         + " callbackType: 'testCallbackType',"
                         + " tenantId: '',"
-                        + " startTime: " + new TextNode(getISODateStringWithTZ(caseInstance.getStartTime())) + ","
+                        + " startTime: '" + getISODateString(caseInstance.getStartTime()) + "',"
                         + " startUserId: 'getCaseUser',"
                         + " url: '" + url + "',"
                         + " caseDefinitionUrl: '" + SERVER_URL_PREFIX + CmmnRestUrls
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceVariablesCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceVariablesCollectionResourceTest.java
index 3af6faf1152..e5ede1e1568 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceVariablesCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/CaseInstanceVariablesCollectionResourceTest.java
@@ -385,7 +385,7 @@ public void testCreateMultipleCaseVariables() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", Boolean.TRUE),
-                        entry("dateVariable", longDateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
@@ -569,7 +569,7 @@ public void testCreateMultipleCaseVariablesAsync() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", Boolean.TRUE),
-                        entry("dateVariable", longDateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/EventSubscriptionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/EventSubscriptionResourceTest.java
index 7a2bebf0964..779411d732e 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/EventSubscriptionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/EventSubscriptionResourceTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -113,7 +112,7 @@ public void testGetEventSubscription() throws Exception {
                         + "eventName: '" + eventSubscription.getEventName() + "',"
                         + "caseInstanceId: '" + eventSubscription.getScopeId() + "',"
                         + "caseDefinitionId: '" + eventSubscription.getScopeDefinitionId() + "',"
-                        + "created: " + new TextNode(getISODateStringWithTZ(eventSubscription.getCreated())) + ","
+                        + "created: '" + getISODateString(eventSubscription.getCreated()) + "',"
                         + "tenantId: 'acme'"
                         + "}");
     }
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskCollectionResourceTest.java
index 891bb3f8da8..09919bf43b8 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskCollectionResourceTest.java
@@ -93,7 +93,7 @@ public void testCreateTask() throws Exception {
             assertThat(task.getOwner()).isEqualTo("owner");
             assertThat(task.getPriority()).isEqualTo(20);
             assertThat(task.getDelegationState()).isEqualTo(DelegationState.RESOLVED);
-            assertThat(task.getDueDate()).isEqualTo(longDateFormat.parse(dueDateString));
+            assertThat(task.getDueDate()).isEqualTo(getDateFromISOString(dueDateString));
             assertThat(task.getParentTaskId()).isEqualTo(parentTask.getId());
             assertThat(task.getFormKey()).isEqualTo("testKey");
             assertThat(task.getTenantId()).isEqualTo("test");
@@ -332,7 +332,7 @@ public void testGetTasks() throws Exception {
             url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdAfter=" + getISODateString(
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, caseTask.getId());
-            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdAfter=" + getIsoDateStringWithMS(
+            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdAfter=" + getIsoDateStringWithoutMS(
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, caseTask.getId());
             url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdAfter=" + getIsoDateStringWithoutSeconds(
@@ -346,7 +346,7 @@ public void testGetTasks() throws Exception {
             url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdBefore=" + getIsoDateStringWithoutSeconds(
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, adhocTask.getId());
-            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdBefore=" + getIsoDateStringWithMS(
+            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?createdBefore=" + getIsoDateStringWithoutMS(
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, adhocTask.getId());
 
@@ -368,7 +368,7 @@ public void testGetTasks() throws Exception {
             url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?dueDate=" + getIsoDateStringWithoutSeconds(
                     adhocTaskCreate.getTime());
             assertResultsPresentInDataResponse(url);
-            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?dueDate=" + getIsoDateStringWithMS(adhocTaskCreate.getTime());
+            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?dueDate=" + getIsoDateStringWithoutMS(adhocTaskCreate.getTime());
             assertResultsPresentInDataResponse(url, adhocTask.getId());
 
             // Due after filtering
@@ -378,7 +378,7 @@ public void testGetTasks() throws Exception {
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, caseTask.getId());
             assertResultsPresentInDataResponse(url, caseTask.getId());
-            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?dueAfter=" + getIsoDateStringWithMS(
+            url = CmmnRestUrls.createRelativeResourceUrl(CmmnRestUrls.URL_TASK_COLLECTION) + "?dueAfter=" + getIsoDateStringWithoutMS(
                     inBetweenTaskCreation.getTime());
             assertResultsPresentInDataResponse(url, caseTask.getId());
 
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskResourceTest.java
index 25b4e7f1122..69746224537 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskResourceTest.java
@@ -119,8 +119,8 @@ public void testGetCaseTask() throws Exception {
                         + " parentTaskId: null,"
                         + " delegationState: null,"
                         + " tenantId: \"\","
-                        + " dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                        + " createTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime())) + ","
+                        + " dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                        + " createTime: '" + getISODateString(task.getCreateTime()) + "',"
                         + " caseInstanceUrl: '" + buildUrl(CmmnRestUrls.URL_CASE_INSTANCE, task.getScopeId()) + "',"
                         + " caseDefinitionUrl: '" + buildUrl(CmmnRestUrls.URL_CASE_DEFINITION, task.getScopeDefinitionId()) + "',"
                         + " url: '" + url + "'"
@@ -166,8 +166,8 @@ public void testGetProcessAdhoc() throws Exception {
                             + " owner: '" + task.getOwner() + "',"
                             + " description: '" + task.getDescription() + "',"
                             + " name: '" + task.getName() + "',"
-                            + " dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                            + " createTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime())) + ","
+                            + " dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                            + " createTime: '" + getISODateString(task.getCreateTime()) + "',"
                             + " priority: " + task.getPriority() + ","
                             + " delegationState: 'resolved',"
                             + " caseInstanceId: null,"
@@ -272,7 +272,7 @@ public void testUpdateTask() throws Exception {
             assertThat(task.getOwner()).isEqualTo("owner");
             assertThat(task.getPriority()).isEqualTo(20);
             assertThat(task.getDelegationState()).isEqualTo(DelegationState.RESOLVED);
-            assertThat(task.getDueDate()).isEqualTo(longDateFormat.parse(dueDateString));
+            assertThat(task.getDueDate()).isEqualTo(getDateFromISOString(dueDateString));
             assertThat(task.getParentTaskId()).isEqualTo(parentTask.getId());
 
         } finally {
diff --git a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
index 5fbf7a7de76..d3ea838be2b 100644
--- a/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
+++ b/modules/flowable-cmmn-rest/src/test/java/org/flowable/cmmn/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
@@ -586,7 +586,7 @@ public void testCreateMultipleTaskVariables() throws Exception {
                             entry("longVariable", 4567890L),
                             entry("doubleVariable", 123.456),
                             entry("booleanVariable", Boolean.TRUE),
-                            entry("dateVariable", longDateFormat.parse(isoString))
+                            entry("dateVariable", getDateFromISOString(isoString))
                     );
 
         } finally {
diff --git a/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/util/DateToStringSerializer.java b/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/util/DateToStringSerializer.java
index e56b2c824cf..c01aacd9fa3 100644
--- a/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/util/DateToStringSerializer.java
+++ b/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/util/DateToStringSerializer.java
@@ -15,10 +15,6 @@
 import java.io.IOException;
 import java.util.Date;
 
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
@@ -26,13 +22,11 @@
 
 public class DateToStringSerializer extends JsonSerializer<Date> {
 
-    protected DateTimeFormatter isoFormatter = ISODateTimeFormat.dateTime().withZoneUTC();
-
     @Override
     public void serialize(Date tmpDate, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
 
         if (tmpDate != null) {
-            jsonGenerator.writeString(new DateTime(tmpDate).toString(isoFormatter));
+            jsonGenerator.writeString(tmpDate.toInstant().toString());
         } else {
             jsonGenerator.writeNull();
         }
diff --git a/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/variable/DateRestVariableConverter.java b/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/variable/DateRestVariableConverter.java
index 684b3ebd8e2..03fce7c7bc3 100644
--- a/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/variable/DateRestVariableConverter.java
+++ b/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/variable/DateRestVariableConverter.java
@@ -13,20 +13,17 @@
 
 package org.flowable.common.rest.variable;
 
-import java.text.ParseException;
+import java.time.format.DateTimeParseException;
 import java.util.Date;
 
 import org.flowable.common.engine.api.FlowableIllegalArgumentException;
-
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
+import org.flowable.common.rest.api.RequestUtil;
 
 /**
  * @author Frederik Heremans
  */
 public class DateRestVariableConverter implements RestVariableConverter {
 
-    protected ISO8601DateFormat isoFormatter = new ISO8601DateFormat();
-
     @Override
     public String getRestTypeName() {
         return "date";
@@ -44,8 +41,8 @@ public Object getVariableValue(EngineRestVariable result) {
                 throw new FlowableIllegalArgumentException("Converter can only convert string to date");
             }
             try {
-                return isoFormatter.parse((String) result.getValue());
-            } catch (ParseException e) {
+                return RequestUtil.parseLongDate((String) result.getValue());
+            } catch (DateTimeParseException e) {
                 throw new FlowableIllegalArgumentException("The given variable value is not a date: '" + result.getValue() + "'", e);
             }
         }
@@ -55,10 +52,10 @@ public Object getVariableValue(EngineRestVariable result) {
     @Override
     public void convertVariableValue(Object variableValue, EngineRestVariable result) {
         if (variableValue != null) {
-            if (!(variableValue instanceof Date)) {
+            if (!(variableValue instanceof Date dateValue)) {
                 throw new FlowableIllegalArgumentException("Converter can only convert booleans");
             }
-            result.setValue(isoFormatter.format(variableValue));
+            result.setValue(dateValue.toInstant().toString());
         } else {
             result.setValue(null);
         }
diff --git a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/test/PluggableFlowableDmnExtension.java b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/test/PluggableFlowableDmnExtension.java
index 7551397b076..9fe0ef05c3e 100644
--- a/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/test/PluggableFlowableDmnExtension.java
+++ b/modules/flowable-dmn-engine/src/main/java/org/flowable/dmn/engine/impl/test/PluggableFlowableDmnExtension.java
@@ -53,7 +53,7 @@ protected ExtensionContext.Store getStore(ExtensionContext context) {
         return context.getRoot().getStore(NAMESPACE);
     }
 
-    protected static class CloseableEngine implements ExtensionContext.Store.CloseableResource {
+    protected static class CloseableEngine implements AutoCloseable {
 
         protected final DmnEngine dmnEngine;
 
@@ -62,7 +62,7 @@ protected CloseableEngine(DmnEngine dmnEngine) {
         }
 
         @Override
-        public void close() throws Throwable {
+        public void close() {
             if (dmnEngine != null) {
                 dmnEngine.close();
             }
diff --git a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/BatchDeleteProcessConfig.java b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/BatchDeleteProcessConfig.java
index b14b62432d4..a5d0d9f8871 100644
--- a/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/BatchDeleteProcessConfig.java
+++ b/modules/flowable-engine/src/main/java/org/flowable/engine/impl/delete/BatchDeleteProcessConfig.java
@@ -142,11 +142,9 @@ protected static HistoricProcessInstanceQuery createQuery(JsonNode queryNode, Pr
     }
 
     protected static void populateQuery(JsonNode queryNode, HistoricProcessInstanceQuery query, ProcessEngineConfigurationImpl engineConfiguration) {
-        Iterator<Map.Entry<String, JsonNode>> fieldIterator = queryNode.fields();
-        while (fieldIterator.hasNext()) {
-            Map.Entry<String, JsonNode> field = fieldIterator.next();
-            String property = field.getKey();
-            JsonNode value = field.getValue();
+        for (Map.Entry<String, JsonNode> propertyEntry : queryNode.properties()) {
+            String property = propertyEntry.getKey();
+            JsonNode value = propertyEntry.getValue();
             switch (property) {
                 case "processInstanceId":
                     query.processInstanceId(value.textValue());
diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
index 19e1143f797..e3c9b837d1c 100644
--- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
+++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceVariableAggregationTest.java
@@ -1928,10 +1928,10 @@ public Object aggregateSingleVariable(DelegateExecution execution, VariableAggre
                             arrayNode.add(sourceNode.deepCopy());
                         } else if (node.isObject()) {
                             ObjectNode objectNode = (ObjectNode) node;
-                            Iterator<Map.Entry<String, JsonNode>> fieldsIterator = sourceNode.fields();
-                            while (fieldsIterator.hasNext()) {
-                                Map.Entry<String, JsonNode> field = fieldsIterator.next();
-                                objectNode.set(field.getKey(), field.getValue());
+                            for (Map.Entry<String, JsonNode> propertyEntry : sourceNode.properties()) {
+                                String propertyName = propertyEntry.getKey();
+                                JsonNode value = propertyEntry.getValue();
+                                objectNode.set(propertyName, value);
                             }
                         }
                     }
diff --git a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/jms/EventRegistryJmsConfiguration.java b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/jms/EventRegistryJmsConfiguration.java
index 1a72a6e2b16..f56139e8723 100644
--- a/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/jms/EventRegistryJmsConfiguration.java
+++ b/modules/flowable-event-registry-spring/src/test/java/org/flowable/eventregistry/spring/test/jms/EventRegistryJmsConfiguration.java
@@ -94,7 +94,7 @@ public EmbeddedActiveMQ embeddedActiveMQ() {
         configuration.getAcceptorConfigurations().add(transportConfiguration);
         configuration.setClusterPassword("flowable");
         AddressSettings deadLetterSetting = new AddressSettings();
-        deadLetterSetting.setDeadLetterAddress(SimpleString.toSimpleString("ActiveMQ.DLQ"));
+        deadLetterSetting.setDeadLetterAddress(SimpleString.of("ActiveMQ.DLQ"));
         deadLetterSetting.setAutoCreateDeadLetterResources(true);
         deadLetterSetting.setMaxDeliveryAttempts(3);
         configuration.addAddressSetting("#", deadLetterSetting);
diff --git a/modules/flowable-external-job-rest/src/test/java/org/flowable/external/job/rest/service/api/acquire/ExternalWorkerAcquireJobResourceTest.java b/modules/flowable-external-job-rest/src/test/java/org/flowable/external/job/rest/service/api/acquire/ExternalWorkerAcquireJobResourceTest.java
index 2f2d92d59fc..d4be68b38da 100644
--- a/modules/flowable-external-job-rest/src/test/java/org/flowable/external/job/rest/service/api/acquire/ExternalWorkerAcquireJobResourceTest.java
+++ b/modules/flowable-external-job-rest/src/test/java/org/flowable/external/job/rest/service/api/acquire/ExternalWorkerAcquireJobResourceTest.java
@@ -191,7 +191,7 @@ void acquireJobsReturnsProcessVariables() {
                         + "      { name: 'shortVar', type: 'short', value: 10 },"
                         + "      { name: 'doubleVar', type: 'double', value: 30.3 },"
                         + "      { name: 'booleanVar', type: 'boolean', value: true },"
-                        + "      { name: 'dateVar', type: 'date', value: '2020-05-04T10:25:45Z' },"
+                        + "      { name: 'dateVar', type: 'date', value: '2020-05-04T10:25:45.583Z' },"
                         + "      { name: 'instantVar', type: 'instant', value: '2020-05-04T09:25:45.583Z' },"
                         + "      { name: 'localDateVar', type: 'localDate', value: '2020-04-20' },"
                         + "      { name: 'localDateTimeVar', type: 'localDateTime', value: '2020-04-20T12:53:10' },"
@@ -255,7 +255,7 @@ void acquireJobsReturnsCaseVariables() {
                         + "      { name: 'shortVar', type: 'short', value: 10 },"
                         + "      { name: 'doubleVar', type: 'double', value: 30.3 },"
                         + "      { name: 'booleanVar', type: 'boolean', value: true },"
-                        + "      { name: 'dateVar', type: 'date', value: '2020-05-04T10:25:45Z' },"
+                        + "      { name: 'dateVar', type: 'date', value: '2020-05-04T10:25:45.583Z' },"
                         + "      { name: 'instantVar', type: 'instant', value: '2020-05-04T09:25:45.583Z' },"
                         + "      { name: 'localDateVar', type: 'localDate', value: '2020-04-20' },"
                         + "      { name: 'localDateTimeVar', type: 'localDateTime', value: '2020-04-20T12:53:10' },"
diff --git a/modules/flowable-http/src/test/java/org/flowable/http/FlowableHttpClientArgumentProvider.java b/modules/flowable-http/src/test/java/org/flowable/http/FlowableHttpClientArgumentProvider.java
index ef6d7177220..7da9e5c89f5 100644
--- a/modules/flowable-http/src/test/java/org/flowable/http/FlowableHttpClientArgumentProvider.java
+++ b/modules/flowable-http/src/test/java/org/flowable/http/FlowableHttpClientArgumentProvider.java
@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
+import org.junit.jupiter.params.support.ParameterDeclarations;
 
 /**
  * @author Filip Hrisafov
@@ -29,7 +30,7 @@
 public class FlowableHttpClientArgumentProvider implements ArgumentsProvider {
 
     @Override
-    public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
+    public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters, ExtensionContext context) {
         HttpClientConfig config = createClientConfig();
         return Stream.of(
                 Arguments.of(new SpringWebClientFlowableHttpClient(config)),
diff --git a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/history/async/AsyncHistoryDateUtil.java b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/history/async/AsyncHistoryDateUtil.java
index cd3533f088f..3439ad8a623 100644
--- a/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/history/async/AsyncHistoryDateUtil.java
+++ b/modules/flowable-job-service/src/main/java/org/flowable/job/service/impl/history/async/AsyncHistoryDateUtil.java
@@ -12,20 +12,15 @@
  */
 package org.flowable.job.service.impl.history.async;
 
-import java.text.ParseException;
-import java.text.ParsePosition;
+import java.time.Instant;
+import java.time.format.DateTimeParseException;
 import java.util.Date;
-import java.util.TimeZone;
-
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
 
 public class AsyncHistoryDateUtil {
 
-    protected static TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
-
     public static String formatDate(Date date) {
         if (date != null) {
-            return ISO8601Utils.format(date, true, utcTimeZone);
+            return date.toInstant().toString();
         }
         return null;
     }
@@ -33,8 +28,8 @@ public static String formatDate(Date date) {
     public static Date parseDate(String s) {
         if (s != null) {
             try {
-                return ISO8601Utils.parse(s, new ParsePosition(0));
-            } catch (ParseException e) {
+                return Date.from(Instant.parse(s));
+            } catch (DateTimeParseException e) {
                 return null;
             }
         }
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
index 3f0ce8e2523..2711e142821 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/BaseSpringRestTestCase.java
@@ -19,6 +19,10 @@
 import java.io.UncheckedIOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -64,9 +68,6 @@
 import org.flowable.rest.conf.ApplicationConfiguration;
 import org.flowable.rest.util.TestServer;
 import org.flowable.spring.impl.test.InternalFlowableSpringExtension;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -79,7 +80,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
 
 @SpringJUnitWebConfig(ApplicationConfiguration.class)
 @ExtendWith(InternalFlowableSpringExtension.class)
@@ -126,8 +126,6 @@ public class BaseSpringRestTestCase {
     protected CloseableHttpClient client;
     protected LinkedList<CloseableHttpResponse> httpResponses = new LinkedList<>();
 
-    protected ISO8601DateFormat dateFormat = new ISO8601DateFormat();
-
     @Autowired
     protected TestServer server;
 
@@ -464,24 +462,16 @@ protected void assertErrorResult(String url, ObjectNode body, int statusCode) th
      * Extract a date from the given string. Assertion fails when invalid date has been provided.
      */
     protected Date getDateFromISOString(String isoString) {
-        DateTimeFormatter dateFormat = ISODateTimeFormat.dateTime();
         try {
-            return dateFormat.parseDateTime(isoString).toDate();
-        } catch (IllegalArgumentException iae) {
-            fail("Illegal date provided: " + isoString);
+            return Date.from(Instant.parse(isoString));
+        } catch (DateTimeParseException e) {
+            fail("Illegal date provided: " + isoString, e);
             return null;
         }
     }
 
     protected String getISODateString(Date time) {
-        return dateFormat.format(time);
-    }
-
-    protected String getISODateStringWithTZ(Date date) {
-        if (date == null) {
-            return null;
-        }
-        return ISODateTimeFormat.dateTime().print(new DateTime(date));
+        return time.toInstant().toString();
     }
 
     protected String buildUrl(String[] fragments, Object... arguments) {
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
index d202e8329cb..f7cce60bf65 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResourceTest.java
@@ -48,8 +48,6 @@
  */
 public class HistoricTaskInstanceQueryResourceTest extends BaseSpringRestTestCase {
 
-    protected ISO8601DateFormat dateFormat = new ISO8601DateFormat();
-
     /**
      * Test querying historic task instance. POST query/historic-task-instances
      */
@@ -197,35 +195,35 @@ public void testQueryTaskInstances() throws Exception {
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateAfter", dateFormat.format(new GregorianCalendar(2010, 0, 1).getTime()));
+        requestNode.put("dueDateAfter", getISODateString(new GregorianCalendar(2010, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateAfter", dateFormat.format(new GregorianCalendar(2013, 4, 1).getTime()));
+        requestNode.put("dueDateAfter", getISODateString(new GregorianCalendar(2013, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateBefore", dateFormat.format(new GregorianCalendar(2010, 0, 1).getTime()));
+        requestNode.put("dueDateBefore", getISODateString(new GregorianCalendar(2010, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("dueDateBefore", dateFormat.format(new GregorianCalendar(2013, 4, 1).getTime()));
+        requestNode.put("dueDateBefore", getISODateString(new GregorianCalendar(2013, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, task.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", dateFormat.format(new GregorianCalendar(2010, 0, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2010, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, finishedTaskProcess1.getId());
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", dateFormat.format(new GregorianCalendar(2013, 4, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2013, 4, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedBefore", dateFormat.format(new GregorianCalendar(2010, 0, 1).getTime()));
+        requestNode.put("taskCompletedBefore", getISODateString(new GregorianCalendar(2010, 0, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 0);
 
         requestNode = objectMapper.createObjectNode();
-        requestNode.put("taskCompletedAfter", dateFormat.format(new GregorianCalendar(2010, 3, 1).getTime()));
+        requestNode.put("taskCompletedAfter", getISODateString(new GregorianCalendar(2010, 3, 1).getTime()));
         assertResultsPresentInPostDataResponse(url, requestNode, 1, finishedTaskProcess1.getId());
 
         requestNode = objectMapper.createObjectNode();
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResourceTest.java
index c3078fcd245..9c21489befe 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResourceTest.java
@@ -47,7 +47,6 @@
 import org.mockito.junit.jupiter.MockitoSettings;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -107,8 +106,8 @@ public void testGetProcessTask() throws Exception {
                             + " executionId: '" + task.getExecutionId() + "',"
                             + " description: '" + task.getDescription() + "',"
                             + " name: '" + task.getName() + "',"
-                            + " dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                            + " startTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime())) + ","
+                            + " dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                            + " startTime: '" + getISODateString(task.getCreateTime()) + "',"
                             + " priority: " + task.getPriority() + ","
                             + " endTime: null,"
                             + " parentTaskId: null,"
@@ -160,8 +159,8 @@ public void testGetProcessAdhoc() throws Exception {
                                 + " owner: '" + task.getOwner() + "',"
                                 + " description: '" + task.getDescription() + "',"
                                 + " name: '" + task.getName() + "',"
-                                + " dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                                + " startTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime())) + ","
+                                + " dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                                + " startTime: '" + getISODateString(task.getCreateTime()) + "',"
                                 + " priority: " + task.getPriority() + ","
                                 + " parentTaskId: '" + task.getParentTaskId() + "',"
                                 + " executionId: null,"
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResourceTest.java
index 6ae4ea60eeb..025843e94be 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResourceTest.java
@@ -109,14 +109,14 @@ public void itCanQueryUsingFromToDates() throws IOException {
         processEngineConfiguration.getClock().reset();
 
         JsonNode listAfter = queryTaskLogEntries(
-                "?taskId=" + encode(task1.getId()) + "&sort=logNumber&order=asc&from=" + dateFormat.format(startTime.getTime()));
+                "?taskId=" + encode(task1.getId()) + "&sort=logNumber&order=asc&from=" + getISODateString(startTime.getTime()));
         expectSequence(listAfter,
                 asList(task1.getId()),
                 asList("USER_TASK_OWNER_CHANGED"));
 
         startTime.add(Calendar.DAY_OF_YEAR, -1);
         JsonNode listBefore = queryTaskLogEntries(
-                "?taskId=" + encode(task1.getId()) + "&sort=logNumber&order=asc&to=" + dateFormat.format(startTime.getTime()));
+                "?taskId=" + encode(task1.getId()) + "&sort=logNumber&order=asc&to=" + getISODateString(startTime.getTime()));
         expectSequence(listBefore,
                 asList(task1.getId(), task1.getId()),
                 asList("USER_TASK_CREATED", "USER_TASK_DUEDATE_CHANGED"));
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/JobResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/JobResourceTest.java
index bde066917b7..effeaae9bf9 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/JobResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/JobResourceTest.java
@@ -27,7 +27,6 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
-import org.flowable.cmmn.api.runtime.CaseInstance;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.engine.impl.cmd.ChangeDeploymentTenantIdCmd;
@@ -42,7 +41,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -85,7 +83,7 @@ public void testGetTimerJob() throws Exception {
                         + "elementName: 'Escalation',"
                         + "handlerType: 'trigger-timer',"
                         + "retries: " + timerJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(timerJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(timerJob.getDuedate()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
@@ -141,7 +139,7 @@ public void testGetSuspendedJob() throws Exception {
                         + "elementName: 'Escalation',"
                         + "handlerType: 'trigger-timer',"
                         + "retries: " + suspendedJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(suspendedJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(suspendedJob.getDuedate()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
@@ -197,7 +195,7 @@ public void testGetDeadLetterJob() throws Exception {
                         + "elementName: 'Escalation',"
                         + "handlerType: 'trigger-timer',"
                         + "retries: " + deadLetterJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(deadLetterJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(deadLetterJob.getDuedate()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
@@ -271,9 +269,9 @@ public Void execute(CommandContext commandContext) {
                         + "elementName: 'Escalation',"
                         + "handlerType: 'trigger-timer',"
                         + "retries: " + lockedJob.getRetries() + ","
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(lockedJob.getDuedate())) + ","
+                        + "dueDate: '" + getISODateString(lockedJob.getDuedate()) + "',"
                         + "lockOwner: 'test',"
-                        + "lockExpirationTime: " + new TextNode(getISODateStringWithTZ(lockedJob.getLockExpirationTime())) + ","
+                        + "lockExpirationTime: '" + getISODateString(lockedJob.getLockExpirationTime()) + "',"
                         + "tenantId: ''"
                         + "}");
         assertThat(responseNode.path("url").asText(null))
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/PropertiesCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/PropertiesCollectionResourceTest.java
index f7b900c3d0d..9f334a57114 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/PropertiesCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/management/PropertiesCollectionResourceTest.java
@@ -14,7 +14,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.http.HttpStatus;
@@ -47,13 +46,11 @@ public void testGetProperties() throws Exception {
         closeResponse(response);
         assertThat(responseNode).hasSize(properties.size());
 
-        Iterator<Map.Entry<String, JsonNode>> nodes = responseNode.fields();
-        Map.Entry<String, JsonNode> node = null;
-        while (nodes.hasNext()) {
-            node = nodes.next();
-            String propValue = properties.get(node.getKey());
+        for (Map.Entry<String, JsonNode> propertyEntry : responseNode.properties()) {
+
+            String propValue = properties.get(propertyEntry.getKey());
             assertThat(propValue).isNotNull();
-            assertThat(node.getValue().textValue()).isEqualTo(propValue);
+            assertThat(propertyEntry.getValue().textValue()).isEqualTo(propValue);
         }
     }
 }
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelCollectionResourceTest.java
index e27278b04c8..420f676c519 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelCollectionResourceTest.java
@@ -30,7 +30,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -201,8 +200,8 @@ public void testCreateModel() throws Exception {
                             + "tenantId: 'myTenant',"
                             + "url: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL, responseNode.get("id").textValue()) + "',"
                             + "deploymentUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_DEPLOYMENT, deploymentId) + "',"
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(createTime.getTime())) + ","
-                            + "lastUpdateTime: " + new TextNode(getISODateStringWithTZ(createTime.getTime()))
+                            + "createTime: '" + getISODateString(createTime.getTime()) + "',"
+                            + "lastUpdateTime: '" + getISODateString(createTime.getTime()) + "'"
                             + "}");
 
             model = repositoryService.createModelQuery().modelId(responseNode.get("id").textValue()).singleResult();
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelResourceTest.java
index aa9d2d89bd1..0c6e19ce0ef 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/repository/ModelResourceTest.java
@@ -32,7 +32,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -85,8 +84,8 @@ public void testGetModel() throws Exception {
                             + "sourceUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL_SOURCE, model.getId()) + "',"
                             + "sourceExtraUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL_SOURCE_EXTRA, model.getId())
                             + "',"
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(now.getTime())) + ","
-                            + "lastUpdateTime: " + new TextNode(getISODateStringWithTZ(now.getTime()))
+                            + "createTime: '" + getISODateString(now.getTime()) + "',"
+                            + "lastUpdateTime: '" + getISODateString(now.getTime()) + "'"
                             + "}");
 
         } finally {
@@ -197,8 +196,8 @@ public void testUpdateModel() throws Exception {
                             + "tenantId: 'myTenant',"
                             + "url: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL, model.getId()) + "',"
                             + "deploymentUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_DEPLOYMENT, deploymentId) + "',"
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(createTime.getTime())) + ","
-                            + "lastUpdateTime: " + new TextNode(getISODateStringWithTZ(updateTime.getTime()))
+                            + "createTime: '" + getISODateString(createTime.getTime()) + "',"
+                            + "lastUpdateTime: '" + getISODateString(updateTime.getTime()) + "'"
                             + "}");
 
         } finally {
@@ -260,8 +259,8 @@ public void testUpdateModelOverrideWithNull() throws Exception {
                             + "id: '" + model.getId() + "',"
                             + "tenantId: null,"
                             + "url: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL, model.getId()) + "',"
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(createTime.getTime())) + ","
-                            + "lastUpdateTime: " + new TextNode(getISODateStringWithTZ(updateTime.getTime()))
+                            + "createTime: '" + getISODateString(createTime.getTime()) + "',"
+                            + "lastUpdateTime: '" + getISODateString(updateTime.getTime()) + "'"
                             + "}");
 
             model = repositoryService.getModel(model.getId());
@@ -321,8 +320,8 @@ public void testUpdateModelNoFields() throws Exception {
                             + "id: '" + model.getId() + "',"
                             + "url: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_MODEL, model.getId()) + "',"
                             + "deploymentUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_DEPLOYMENT, deploymentId) + "',"
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(now.getTime())) + ","
-                            + "lastUpdateTime: " + new TextNode(getISODateStringWithTZ(now.getTime()))
+                            + "createTime: '" + getISODateString(now.getTime()) + "',"
+                            + "lastUpdateTime: '" + getISODateString(now.getTime()) + "'"
                             + "}");
 
         } finally {
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java
index 0243bfd8a51..c046166b07c 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java
@@ -608,7 +608,7 @@ public void testStartProcessWithVariables() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", Boolean.TRUE),
-                        entry("dateVariable", dateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java
index 967899470c9..c51aff0f16b 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/ProcessInstanceVariablesCollectionResourceTest.java
@@ -376,7 +376,7 @@ public void testCreateMultipleProcessVariables() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", true),
-                        entry("dateVariable", dateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
@@ -560,7 +560,7 @@ public void testCreateMultipleProcessVariablesAsync() throws Exception {
                         entry("longVariable", 4567890L),
                         entry("doubleVariable", 123.456),
                         entry("booleanVariable", true),
-                        entry("dateVariable", dateFormat.parse(isoString))
+                        entry("dateVariable", getDateFromISOString(isoString))
                 );
     }
 
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/SignalsResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/SignalsResourceTest.java
index 6d5a47e8c68..00034b8a821 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/SignalsResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/SignalsResourceTest.java
@@ -35,7 +35,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -228,7 +227,7 @@ public void testGetEventSubscription() throws Exception {
                         + "eventName: '" + eventSubscription.getEventName() + "',"
                         + "activityId: '" + eventSubscription.getActivityId() + "',"
                         + "processDefinitionId: '" + eventSubscription.getProcessDefinitionId() + "',"
-                        + "created: " + new TextNode(getISODateStringWithTZ(eventSubscription.getCreated())) + ","
+                        + "created: '" + getISODateString(eventSubscription.getCreated()) + "',"
                         + "tenantId: 'acme'"
                         + "}");
     }
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskCollectionResourceTest.java
index 6f5eff17f30..f781d450e76 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskCollectionResourceTest.java
@@ -94,7 +94,7 @@ public void testCreateTask() throws Exception {
             assertThat(task.getOwner()).isEqualTo("owner");
             assertThat(task.getPriority()).isEqualTo(20);
             assertThat(task.getDelegationState()).isEqualTo(DelegationState.RESOLVED);
-            assertThat(task.getDueDate()).isEqualTo(dateFormat.parse(dueDateString));
+            assertThat(task.getDueDate()).isEqualTo(getDateFromISOString(dueDateString));
             assertThat(task.getParentTaskId()).isEqualTo(parentTask.getId());
             assertThat(task.getFormKey()).isEqualTo("testKey");
             assertThat(task.getTenantId()).isEqualTo("test");
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskEventResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskEventResourceTest.java
index ba553fcac35..699c0d04f4c 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskEventResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskEventResourceTest.java
@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -98,7 +97,7 @@ public void testGetEvent() throws Exception {
                             + "userId: " + event.getUserId() + ","
                             + "url: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_TASK_EVENT, task.getId(), event.getId()) + "',"
                             + "taskUrl: '" + SERVER_URL_PREFIX + RestUrls.createRelativeResourceUrl(RestUrls.URL_TASK, task.getId()) + "',"
-                            + "time: " + new TextNode(getISODateStringWithTZ(now.getTime()))
+                            + "time: '" + getISODateString(now.getTime()) + "'"
                             + "}");
 
         } finally {
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskResourceTest.java
index f549651ddf8..73c551cb592 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskResourceTest.java
@@ -58,7 +58,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
 
 import net.javacrumbs.jsonunit.core.Option;
 
@@ -129,8 +128,8 @@ public void testGetProcessTask() throws Exception {
                         + "processInstanceUrl: '" + buildUrl(RestUrls.URL_PROCESS_INSTANCE, task.getProcessInstanceId()) + "',"
                         + "processDefinitionUrl: '" + buildUrl(RestUrls.URL_PROCESS_DEFINITION, task.getProcessDefinitionId()) + "',"
                         + "url: '" + url + "',"
-                        + "dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                        + "createTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime()))
+                        + "dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                        + "createTime: '" + getISODateString(task.getCreateTime()) + "'"
                         + "}");
 
         // Set tenant on deployment
@@ -189,8 +188,8 @@ public void testGetProcessAdhoc() throws Exception {
                             + "processDefinitionId: null,"
                             + "url: '" + url + "',"
                             + "parentTaskUrl: '" + buildUrl(RestUrls.URL_TASK, parentTask.getId()) + "',"
-                            + "dueDate: " + new TextNode(getISODateStringWithTZ(task.getDueDate())) + ","
-                            + "createTime: " + new TextNode(getISODateStringWithTZ(task.getCreateTime()))
+                            + "dueDate: '" + getISODateString(task.getDueDate()) + "',"
+                            + "createTime: '" + getISODateString(task.getCreateTime()) + "'"
                             + "}");
 
         } finally {
@@ -289,7 +288,7 @@ public void testUpdateTask() throws Exception {
             assertThat(task.getOwner()).isEqualTo("owner");
             assertThat(task.getPriority()).isEqualTo(20);
             assertThat(task.getDelegationState()).isEqualTo(DelegationState.RESOLVED);
-            assertThat(task.getDueDate()).isEqualTo(dateFormat.parse(dueDateString));
+            assertThat(task.getDueDate()).isEqualTo(getDateFromISOString(dueDateString));
             assertThat(task.getParentTaskId()).isEqualTo(parentTask.getId());
 
         } finally {
diff --git a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
index c43cf226fc5..a9ecb154b74 100644
--- a/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
+++ b/modules/flowable-rest/src/test/java/org/flowable/rest/service/api/runtime/TaskVariablesCollectionResourceTest.java
@@ -592,7 +592,7 @@ public void testCreateMultipleTaskVariables() throws Exception {
                             entry("longVariable", 4567890L),
                             entry("doubleVariable", 123.456),
                             entry("booleanVariable", Boolean.TRUE),
-                            entry("dateVariable", dateFormat.parse(isoString))
+                            entry("dateVariable", getDateFromISOString(isoString))
                     );
         } finally {
             // Clean adhoc-tasks even if test fails

From 8674924a17bfa37fedeceb476ce554dc57cbaa78 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Wed, 24 Sep 2025 00:00:42 +0200
Subject: [PATCH 2/2] Remove deprecated Swagger Api#description

---
 .../app/rest/service/api/management/AppEngineResource.java      | 2 +-
 .../service/api/repository/AppDefinitionCollectionResource.java | 2 +-
 .../app/rest/service/api/repository/AppDefinitionResource.java  | 2 +-
 .../api/repository/AppDefinitionResourceDataResource.java       | 2 +-
 .../service/api/repository/AppDeploymentCollectionResource.java | 2 +-
 .../app/rest/service/api/repository/AppDeploymentResource.java  | 2 +-
 .../api/repository/AppDeploymentResourceCollectionResource.java | 2 +-
 .../api/repository/AppDeploymentResourceDataResource.java       | 2 +-
 .../service/api/repository/AppDeploymentResourceResource.java   | 2 +-
 .../app/rest/service/api/repository/AppModelResource.java       | 2 +-
 .../history/caze/HistoricCaseInstanceCollectionResource.java    | 2 +-
 .../HistoricCaseInstanceIdentityLinkCollectionResource.java     | 2 +-
 .../api/history/caze/HistoricCaseInstanceQueryResource.java     | 2 +-
 .../service/api/history/caze/HistoricCaseInstanceResource.java  | 2 +-
 .../history/caze/HistoricCaseInstanceVariableDataResource.java  | 2 +-
 .../milestone/HistoricMilestoneInstanceCollectionResource.java  | 2 +-
 .../milestone/HistoricMilestoneInstanceQueryResource.java       | 2 +-
 .../history/milestone/HistoricMilestoneInstanceResource.java    | 2 +-
 .../planitem/HistoricPlanItemInstanceCollectionResource.java    | 2 +-
 .../history/planitem/HistoricPlanItemInstanceQueryResource.java | 2 +-
 .../api/history/planitem/HistoricPlanItemInstanceResource.java  | 2 +-
 .../history/task/HistoricTaskInstanceCollectionResource.java    | 2 +-
 .../HistoricTaskInstanceIdentityLinkCollectionResource.java     | 2 +-
 .../api/history/task/HistoricTaskInstanceQueryResource.java     | 2 +-
 .../service/api/history/task/HistoricTaskInstanceResource.java  | 2 +-
 .../history/task/HistoricTaskInstanceVariableDataResource.java  | 2 +-
 .../variable/HistoricVariableInstanceCollectionResource.java    | 2 +-
 .../history/variable/HistoricVariableInstanceDataResource.java  | 2 +-
 .../history/variable/HistoricVariableInstanceQueryResource.java | 2 +-
 .../cmmn/rest/service/api/management/CmmnEngineResource.java    | 2 +-
 .../service/api/management/DeadLetterJobCollectionResource.java | 2 +-
 .../service/api/management/HistoryJobCollectionResource.java    | 2 +-
 .../cmmn/rest/service/api/management/JobCollectionResource.java | 2 +-
 .../service/api/management/JobExceptionStacktraceResource.java  | 2 +-
 .../flowable/cmmn/rest/service/api/management/JobResource.java  | 2 +-
 .../service/api/management/SuspendedJobCollectionResource.java  | 2 +-
 .../rest/service/api/management/TimerJobCollectionResource.java | 2 +-
 .../api/repository/CaseDefinitionCollectionResource.java        | 2 +-
 .../repository/CaseDefinitionDecisionCollectionResource.java    | 2 +-
 .../CaseDefinitionFormDefinitionCollectionResource.java         | 2 +-
 .../CaseDefinitionIdentityLinkCollectionResource.java           | 2 +-
 .../api/repository/CaseDefinitionIdentityLinkResource.java      | 2 +-
 .../service/api/repository/CaseDefinitionImageResource.java     | 2 +-
 .../service/api/repository/CaseDefinitionModelResource.java     | 2 +-
 .../rest/service/api/repository/CaseDefinitionResource.java     | 2 +-
 .../api/repository/CaseDefinitionResourceDataResource.java      | 2 +-
 .../service/api/repository/DeploymentCollectionResource.java    | 2 +-
 .../cmmn/rest/service/api/repository/DeploymentResource.java    | 2 +-
 .../api/repository/DeploymentResourceCollectionResource.java    | 2 +-
 .../service/api/repository/DeploymentResourceDataResource.java  | 2 +-
 .../rest/service/api/repository/DeploymentResourceResource.java | 2 +-
 .../api/runtime/caze/CaseInstanceCollectionResource.java        | 2 +-
 .../service/api/runtime/caze/CaseInstanceDiagramResource.java   | 2 +-
 .../caze/CaseInstanceIdentityLinkCollectionResource.java        | 2 +-
 .../api/runtime/caze/CaseInstanceIdentityLinkResource.java      | 2 +-
 .../service/api/runtime/caze/CaseInstanceQueryResource.java     | 2 +-
 .../rest/service/api/runtime/caze/CaseInstanceResource.java     | 2 +-
 .../runtime/caze/CaseInstanceVariableCollectionResource.java    | 2 +-
 .../api/runtime/caze/CaseInstanceVariableDataResource.java      | 2 +-
 .../service/api/runtime/caze/CaseInstanceVariableResource.java  | 2 +-
 .../api/runtime/caze/EventSubscriptionCollectionResource.java   | 2 +-
 .../service/api/runtime/caze/EventSubscriptionResource.java     | 2 +-
 .../api/runtime/caze/PlanItemInstanceVariableDataResource.java  | 2 +-
 .../api/runtime/caze/PlanItemInstanceVariableResource.java      | 2 +-
 .../runtime/planitem/PlanItemInstanceCollectionResource.java    | 2 +-
 .../api/runtime/planitem/PlanItemInstanceQueryResource.java     | 2 +-
 .../service/api/runtime/planitem/PlanItemInstanceResource.java  | 2 +-
 .../planitem/PlanItemInstanceVariableCollectionResource.java    | 2 +-
 .../rest/service/api/runtime/task/TaskCollectionResource.java   | 2 +-
 .../api/runtime/task/TaskIdentityLinkCollectionResource.java    | 2 +-
 .../api/runtime/task/TaskIdentityLinkFamilyResource.java        | 2 +-
 .../rest/service/api/runtime/task/TaskIdentityLinkResource.java | 2 +-
 .../cmmn/rest/service/api/runtime/task/TaskQueryResource.java   | 2 +-
 .../cmmn/rest/service/api/runtime/task/TaskResource.java        | 2 +-
 .../service/api/runtime/task/TaskSubTaskCollectionResource.java | 2 +-
 .../api/runtime/task/TaskVariableCollectionResource.java        | 2 +-
 .../rest/service/api/runtime/task/TaskVariableDataResource.java | 2 +-
 .../rest/service/api/runtime/task/TaskVariableResource.java     | 2 +-
 .../runtime/variable/VariableInstanceCollectionResource.java    | 2 +-
 .../api/runtime/variable/VariableInstanceDataResource.java      | 2 +-
 .../api/runtime/variable/VariableInstanceQueryResource.java     | 2 +-
 .../dmn/rest/service/api/decision/DmnRuleServiceResource.java   | 2 +-
 .../service/api/history/HistoricDecisionExecutionResource.java  | 2 +-
 .../history/HistoricDecisionExecutionResourceDataResource.java  | 2 +-
 .../api/history/HistoryDecisionExecutionCollectionResource.java | 2 +-
 .../dmn/rest/service/api/management/DmnEngineResource.java      | 2 +-
 .../rest/service/api/repository/DecisionCollectionResource.java | 2 +-
 .../dmn/rest/service/api/repository/DecisionImageResource.java  | 2 +-
 .../dmn/rest/service/api/repository/DecisionModelResource.java  | 2 +-
 .../dmn/rest/service/api/repository/DecisionResource.java       | 2 +-
 .../service/api/repository/DecisionResourceDataResource.java    | 2 +-
 .../service/api/repository/DecisionTableCollectionResource.java | 2 +-
 .../rest/service/api/repository/DecisionTableModelResource.java | 2 +-
 .../dmn/rest/service/api/repository/DecisionTableResource.java  | 2 +-
 .../api/repository/DecisionTableResourceDataResource.java       | 2 +-
 .../service/api/repository/DmnDeploymentCollectionResource.java | 2 +-
 .../dmn/rest/service/api/repository/DmnDeploymentResource.java  | 2 +-
 .../api/repository/DmnDeploymentResourceDataResource.java       | 2 +-
 .../service/api/management/EventRegistryEngineResource.java     | 2 +-
 .../api/repository/ChannelDefinitionCollectionResource.java     | 2 +-
 .../service/api/repository/ChannelDefinitionModelResource.java  | 2 +-
 .../rest/service/api/repository/ChannelDefinitionResource.java  | 2 +-
 .../api/repository/ChannelDefinitionResourceDataResource.java   | 2 +-
 .../service/api/repository/DeploymentCollectionResource.java    | 2 +-
 .../rest/service/api/repository/DeploymentResource.java         | 2 +-
 .../api/repository/DeploymentResourceCollectionResource.java    | 2 +-
 .../service/api/repository/DeploymentResourceDataResource.java  | 2 +-
 .../rest/service/api/repository/DeploymentResourceResource.java | 2 +-
 .../api/repository/EventDefinitionCollectionResource.java       | 2 +-
 .../service/api/repository/EventDefinitionModelResource.java    | 2 +-
 .../rest/service/api/repository/EventDefinitionResource.java    | 2 +-
 .../api/repository/EventDefinitionResourceDataResource.java     | 2 +-
 .../service/api/runtime/EventInstanceCollectionResource.java    | 2 +-
 .../idm/rest/service/api/group/GroupCollectionResource.java     | 2 +-
 .../service/api/group/GroupMembershipCollectionResource.java    | 2 +-
 .../idm/rest/service/api/group/GroupMembershipResource.java     | 2 +-
 .../org/flowable/idm/rest/service/api/group/GroupResource.java  | 2 +-
 .../idm/rest/service/api/management/IdmEngineResource.java      | 2 +-
 .../rest/service/api/privilege/PrivilegeCollectionResource.java | 2 +-
 .../idm/rest/service/api/privilege/PrivilegeResource.java       | 2 +-
 .../idm/rest/service/api/user/UserCollectionResource.java       | 2 +-
 .../org/flowable/idm/rest/service/api/user/UserResource.java    | 2 +-
 .../org/flowable/rest/service/api/form/FormDataResource.java    | 2 +-
 .../api/history/HistoricActivityInstanceCollectionResource.java | 2 +-
 .../api/history/HistoricActivityInstanceQueryResource.java      | 2 +-
 .../service/api/history/HistoricDetailCollectionResource.java   | 2 +-
 .../rest/service/api/history/HistoricDetailDataResource.java    | 2 +-
 .../rest/service/api/history/HistoricDetailQueryResource.java   | 2 +-
 .../api/history/HistoricProcessInstanceCollectionResource.java  | 2 +-
 .../HistoricProcessInstanceCommentCollectionResource.java       | 2 +-
 .../api/history/HistoricProcessInstanceCommentResource.java     | 2 +-
 .../HistoricProcessInstanceIdentityLinkCollectionResource.java  | 2 +-
 .../api/history/HistoricProcessInstanceQueryResource.java       | 2 +-
 .../service/api/history/HistoricProcessInstanceResource.java    | 2 +-
 .../history/HistoricProcessInstanceVariableDataResource.java    | 2 +-
 .../api/history/HistoricTaskInstanceCollectionResource.java     | 2 +-
 .../HistoricTaskInstanceIdentityLinkCollectionResource.java     | 2 +-
 .../service/api/history/HistoricTaskInstanceQueryResource.java  | 2 +-
 .../rest/service/api/history/HistoricTaskInstanceResource.java  | 2 +-
 .../api/history/HistoricTaskInstanceVariableDataResource.java   | 2 +-
 .../service/api/history/HistoricTaskLogCollectionResource.java  | 2 +-
 .../api/history/HistoricVariableInstanceCollectionResource.java | 2 +-
 .../api/history/HistoricVariableInstanceDataResource.java       | 2 +-
 .../api/history/HistoricVariableInstanceQueryResource.java      | 2 +-
 .../rest/service/api/identity/GroupCollectionResource.java      | 2 +-
 .../service/api/identity/GroupMembershipCollectionResource.java | 2 +-
 .../rest/service/api/identity/GroupMembershipResource.java      | 2 +-
 .../org/flowable/rest/service/api/identity/GroupResource.java   | 2 +-
 .../rest/service/api/identity/UserCollectionResource.java       | 2 +-
 .../rest/service/api/identity/UserInfoCollectionResource.java   | 2 +-
 .../flowable/rest/service/api/identity/UserInfoResource.java    | 2 +-
 .../flowable/rest/service/api/identity/UserPictureResource.java | 2 +-
 .../org/flowable/rest/service/api/identity/UserResource.java    | 2 +-
 .../rest/service/api/management/BatchCollectionResource.java    | 2 +-
 .../service/api/management/BatchPartCollectionResource.java     | 2 +-
 .../flowable/rest/service/api/management/BatchPartResource.java | 2 +-
 .../org/flowable/rest/service/api/management/BatchResource.java | 2 +-
 .../service/api/management/DeadLetterJobCollectionResource.java | 2 +-
 .../rest/service/api/management/EnginePropertiesResource.java   | 2 +-
 .../service/api/management/HistoryJobCollectionResource.java    | 2 +-
 .../rest/service/api/management/JobCollectionResource.java      | 2 +-
 .../service/api/management/JobExceptionStacktraceResource.java  | 2 +-
 .../org/flowable/rest/service/api/management/JobResource.java   | 2 +-
 .../rest/service/api/management/ProcessEngineResource.java      | 2 +-
 .../service/api/management/PropertiesCollectionResource.java    | 2 +-
 .../service/api/management/SuspendedJobCollectionResource.java  | 2 +-
 .../rest/service/api/management/TableCollectionResource.java    | 2 +-
 .../rest/service/api/management/TableColumnsResource.java       | 2 +-
 .../flowable/rest/service/api/management/TableDataResource.java | 2 +-
 .../org/flowable/rest/service/api/management/TableResource.java | 2 +-
 .../rest/service/api/management/TimerJobCollectionResource.java | 2 +-
 .../service/api/repository/DeploymentCollectionResource.java    | 2 +-
 .../rest/service/api/repository/DeploymentResource.java         | 2 +-
 .../api/repository/DeploymentResourceCollectionResource.java    | 2 +-
 .../service/api/repository/DeploymentResourceDataResource.java  | 2 +-
 .../rest/service/api/repository/DeploymentResourceResource.java | 2 +-
 .../rest/service/api/repository/ModelCollectionResource.java    | 2 +-
 .../org/flowable/rest/service/api/repository/ModelResource.java | 2 +-
 .../rest/service/api/repository/ModelSourceExtraResource.java   | 2 +-
 .../rest/service/api/repository/ModelSourceResource.java        | 2 +-
 .../api/repository/ProcessDefinitionCollectionResource.java     | 2 +-
 .../repository/ProcessDefinitionDecisionCollectionResource.java | 2 +-
 .../ProcessDefinitionFormDefinitionCollectionResource.java      | 2 +-
 .../ProcessDefinitionIdentityLinkCollectionResource.java        | 2 +-
 .../api/repository/ProcessDefinitionIdentityLinkResource.java   | 2 +-
 .../service/api/repository/ProcessDefinitionImageResource.java  | 2 +-
 .../service/api/repository/ProcessDefinitionModelResource.java  | 2 +-
 .../rest/service/api/repository/ProcessDefinitionResource.java  | 2 +-
 .../api/repository/ProcessDefinitionResourceDataResource.java   | 2 +-
 .../org/flowable/rest/service/api/runtime/SignalResource.java   | 2 +-
 .../service/api/runtime/VariableInstanceCollectionResource.java | 2 +-
 .../rest/service/api/runtime/VariableInstanceDataResource.java  | 2 +-
 .../rest/service/api/runtime/VariableInstanceQueryResource.java | 2 +-
 .../api/runtime/process/ActivityInstanceCollectionResource.java | 2 +-
 .../api/runtime/process/ActivityInstanceQueryResource.java      | 2 +-
 .../runtime/process/EventSubscriptionCollectionResource.java    | 2 +-
 .../service/api/runtime/process/EventSubscriptionResource.java  | 2 +-
 .../process/ExecutionActiveActivitiesCollectionResource.java    | 2 +-
 .../api/runtime/process/ExecutionCollectionResource.java        | 2 +-
 .../service/api/runtime/process/ExecutionQueryResource.java     | 2 +-
 .../rest/service/api/runtime/process/ExecutionResource.java     | 2 +-
 .../runtime/process/ExecutionVariableCollectionResource.java    | 2 +-
 .../api/runtime/process/ExecutionVariableDataResource.java      | 2 +-
 .../service/api/runtime/process/ExecutionVariableResource.java  | 2 +-
 .../api/runtime/process/ProcessInstanceCollectionResource.java  | 2 +-
 .../api/runtime/process/ProcessInstanceDiagramResource.java     | 2 +-
 .../process/ProcessInstanceIdentityLinkCollectionResource.java  | 2 +-
 .../runtime/process/ProcessInstanceIdentityLinkResource.java    | 2 +-
 .../api/runtime/process/ProcessInstanceQueryResource.java       | 2 +-
 .../service/api/runtime/process/ProcessInstanceResource.java    | 2 +-
 .../process/ProcessInstanceVariableCollectionResource.java      | 2 +-
 .../runtime/process/ProcessInstanceVariableDataResource.java    | 2 +-
 .../api/runtime/process/ProcessInstanceVariableResource.java    | 2 +-
 .../api/runtime/task/TaskAttachmentCollectionResource.java      | 2 +-
 .../service/api/runtime/task/TaskAttachmentContentResource.java | 2 +-
 .../rest/service/api/runtime/task/TaskAttachmentResource.java   | 2 +-
 .../rest/service/api/runtime/task/TaskCollectionResource.java   | 2 +-
 .../service/api/runtime/task/TaskCommentCollectionResource.java | 2 +-
 .../rest/service/api/runtime/task/TaskCommentResource.java      | 2 +-
 .../service/api/runtime/task/TaskEventCollectionResource.java   | 2 +-
 .../rest/service/api/runtime/task/TaskEventResource.java        | 2 +-
 .../api/runtime/task/TaskIdentityLinkCollectionResource.java    | 2 +-
 .../api/runtime/task/TaskIdentityLinkFamilyResource.java        | 2 +-
 .../rest/service/api/runtime/task/TaskIdentityLinkResource.java | 2 +-
 .../rest/service/api/runtime/task/TaskQueryResource.java        | 2 +-
 .../flowable/rest/service/api/runtime/task/TaskResource.java    | 2 +-
 .../service/api/runtime/task/TaskSubTaskCollectionResource.java | 2 +-
 .../api/runtime/task/TaskVariableCollectionResource.java        | 2 +-
 .../rest/service/api/runtime/task/TaskVariableDataResource.java | 2 +-
 .../rest/service/api/runtime/task/TaskVariableResource.java     | 2 +-
 230 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/management/AppEngineResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/management/AppEngineResource.java
index 893520d905a..402f8bac99c 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/management/AppEngineResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/management/AppEngineResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Engine" }, description = "Manage App Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppEngineResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionCollectionResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionCollectionResource.java
index 3f23184ba1e..808f30de407 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionCollectionResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionCollectionResource.java
@@ -42,7 +42,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Definitions" }, description = "Manage App Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDefinitionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResource.java
index 18fcce5e99e..26d7b20e4eb 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Definitions" }, description = "Manage App Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDefinitionResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java
index 3d691035424..d431af12dac 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDefinitionResourceDataResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Definitions" }, description = "Manage App Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDefinitionResourceDataResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java
index 153c4cb55cc..f163eb0aca5 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentCollectionResource.java
@@ -59,7 +59,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Deployments" }, description = "Manage App Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Deployments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDeploymentCollectionResource {
 
     private static Map<String, QueryProperty> allowedSortProperties = new HashMap<>();
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResource.java
index 2b48420a845..187e27769f0 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Deployments" }, description = "Manage App Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Deployments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceCollectionResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceCollectionResource.java
index bedbfb9b66a..031ec6c7867 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceCollectionResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Deployments" }, description = "Manage App Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Deployments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDeploymentResourceCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java
index 6dc2ebc31ee..0f3a769a025 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceDataResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Deployments" }, description = "Manage App Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Deployments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDeploymentResourceDataResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceResource.java
index 40105f7c142..ae5ebdfc1b5 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppDeploymentResourceResource.java
@@ -40,7 +40,7 @@
  * @author Tim Stephenson
  */
 @RestController
-@Api(tags = { "App Deployments" }, description = "Manage App Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Deployments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppDeploymentResourceResource {
 
     @Autowired
diff --git a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppModelResource.java b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppModelResource.java
index 41f7e91a264..1852f9474f5 100644
--- a/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppModelResource.java
+++ b/modules/flowable-app-engine-rest/src/main/java/org/flowable/app/rest/service/api/repository/AppModelResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "App Definitions" }, description = "Manage App Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "App Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class AppModelResource {
     
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java
index dc687994c43..1541aa5b4c6 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Case" }, description = "Manage History Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Case" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricCaseInstanceCollectionResource extends HistoricCaseInstanceBaseResource {
 
     @ApiOperation(value = "List of historic case instances", tags = { "History Case" }, nickname = "listHistoricCaseInstances")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceIdentityLinkCollectionResource.java
index 7f58b98c849..0b4ae659f1f 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceIdentityLinkCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Case" }, description = "Manage History Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Case" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricCaseInstanceIdentityLinkCollectionResource extends HistoricCaseInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryResource.java
index d42d2ed1e83..cfa15aff607 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Case" }, description = "Manage History Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Case" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricCaseInstanceQueryResource extends HistoricCaseInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic case instances", tags = {"History Case", "Query" }, nickname = "queryHistoricCaseInstance",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceResource.java
index 48bb9f238a8..c9721499bd1 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceResource.java
@@ -51,7 +51,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "History Case" }, description = "Manage History Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Case" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricCaseInstanceResource extends HistoricCaseInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceVariableDataResource.java
index fa6ef4c5790..ad3f25b4133 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceVariableDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/caze/HistoricCaseInstanceVariableDataResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricCaseInstanceVariableDataResource extends HistoricCaseInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceCollectionResource.java
index a7da1427470..5d964b07bde 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceCollectionResource.java
@@ -38,7 +38,7 @@
  * @author DennisFederico
  */
 @RestController
-@Api(tags = {"History Milestone"}, description = "Manage History Milestone Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History Milestone"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricMilestoneInstanceCollectionResource extends HistoricMilestoneInstanceBaseResource {
 
     private static Map<String, BiConsumer<HistoricMilestoneInstanceQueryRequest, String>> mapping = new HashMap<>();
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceQueryResource.java
index a8de3493679..4d958036259 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceQueryResource.java
@@ -35,7 +35,7 @@
  * @author Dennis Federico
  */
 @RestController
-@Api(tags = {"History Milestone"}, description = "Manage History Milestone Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History Milestone"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricMilestoneInstanceQueryResource extends HistoricMilestoneInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic milestone instances", tags = {"History Milestone", "Query"}, nickname = "queryHistoricMilestoneInstance",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceResource.java
index 176f3d2d67b..7e931d90cf6 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/milestone/HistoricMilestoneInstanceResource.java
@@ -31,7 +31,7 @@
  * @author Dennis Federico
  */
 @RestController
-@Api(tags = {"History Milestone"}, description = "Manage History Milestone Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History Milestone"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricMilestoneInstanceResource extends HistoricMilestoneInstanceBaseResource {
 
     @ApiOperation(value = "Get a historic milestone instance by id", tags = {"History Milestone"}, nickname = "getHistoricMilestoneInstanceById")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceCollectionResource.java
index 9efdccb6ae9..7802300e9c1 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceCollectionResource.java
@@ -38,7 +38,7 @@
  * @author DennisFederico
  */
 @RestController
-@Api(tags = {"History PlanItem"}, description = "Manage History Plan Item Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History PlanItem"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricPlanItemInstanceCollectionResource extends HistoricPlanItemInstanceBaseResource {
 
     private static Map<String, BiConsumer<HistoricPlanItemInstanceQueryRequest, String>> mapping = new HashMap<>();
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceQueryResource.java
index f2aa8891547..691de31ceb8 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceQueryResource.java
@@ -35,7 +35,7 @@
  * @author Dennis Federico
  */
 @RestController
-@Api(tags = {"History PlanItem"}, description = "Manage History Plan Item Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History PlanItem"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricPlanItemInstanceQueryResource extends HistoricPlanItemInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic plan item instances", tags = {"History PlanItem", "Query"}, nickname = "queryHistoricPlanItemInstance",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceResource.java
index f3c54ea9139..be6bd6687d2 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/planitem/HistoricPlanItemInstanceResource.java
@@ -31,7 +31,7 @@
  * @author Dennis Federico
  */
 @RestController
-@Api(tags = {"History PlanItem"}, description = "Manage History Plan Item Instances", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"History PlanItem"}, authorizations = {@Authorization(value = "basicAuth")})
 public class HistoricPlanItemInstanceResource extends HistoricPlanItemInstanceBaseResource {
 
     @ApiOperation(value = "Get a historic plan item instance", tags = {"History PlanItem"}, nickname = "getHistoricPlanItemInstance")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceCollectionResource.java
index 996b688c636..66bf68f2ef1 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceCollectionResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceCollectionResource extends HistoricTaskInstanceBaseResource {
 
     @ApiOperation(value = "List historic task instances", tags = { "History Task" }, nickname = "listHistoricTaskInstances")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceIdentityLinkCollectionResource.java
index d9e3359412a..46d87e19d6c 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceIdentityLinkCollectionResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceIdentityLinkCollectionResource extends HistoricTaskInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceQueryResource.java
index 238edc9478d..8b730689a15 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceQueryResource extends HistoricTaskInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic task instances", tags = {"History Task", "Query" },
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java
index 354d97e3d34..48cc4cbf482 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceResource.java
@@ -42,7 +42,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceResource extends HistoricTaskInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceVariableDataResource.java
index ccda8fe5497..de5f7c5688b 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceVariableDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/task/HistoricTaskInstanceVariableDataResource.java
@@ -47,7 +47,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceVariableDataResource extends HistoricTaskInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceCollectionResource.java
index 21644c7e340..3316e5dec66 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceCollectionResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceCollectionResource extends HistoricVariableInstanceBaseResource {
 
     @ApiOperation(value = "List of historic variable instances", tags = { "History" }, nickname = "listHistoricVariableInstances")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceDataResource.java
index 7408a2a2c1a..9456c239ac3 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceDataResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceDataResource extends HistoricVariableInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceQueryResource.java
index 3164e729902..ecb97e63636 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/history/variable/HistoricVariableInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceQueryResource extends HistoricVariableInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic variable instances", tags = { "History", "Query" },
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/CmmnEngineResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/CmmnEngineResource.java
index 2390b8ff694..c35f9f85905 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/CmmnEngineResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/CmmnEngineResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Cmmn Engine" }, description = "Manage Cmmn Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Cmmn Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CmmnEngineResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/DeadLetterJobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/DeadLetterJobCollectionResource.java
index 76e0f9e3ff7..d7faaf76ef3 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/DeadLetterJobCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/DeadLetterJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeadLetterJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/HistoryJobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/HistoryJobCollectionResource.java
index 0d1c922d8bc..23b96fff397 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/HistoryJobCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/HistoryJobCollectionResource.java
@@ -40,7 +40,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage history Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoryJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java
index 38e2f06f130..89a533e50e5 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobCollectionResource.java
@@ -54,7 +54,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobCollectionResource {
 
     private static final String MOVE_ACTION = "move";
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobExceptionStacktraceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobExceptionStacktraceResource.java
index 355d58cda93..3cdd969ffb4 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobExceptionStacktraceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobExceptionStacktraceResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobExceptionStacktraceResource extends JobBaseResource {
 
     @ApiOperation(value = "Get the exception stacktrace for a job", tags = { "Jobs" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobResource.java
index b32943e3dcc..1ea864a65e8 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/JobResource.java
@@ -42,7 +42,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobResource extends JobBaseResource {
 
     private static final String EXECUTE_ACTION = "execute";
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/SuspendedJobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/SuspendedJobCollectionResource.java
index 333c1b9a1b9..c5fbc7124a2 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/SuspendedJobCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/SuspendedJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class SuspendedJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/TimerJobCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/TimerJobCollectionResource.java
index 6354fcc35f3..a7689be544b 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/TimerJobCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/management/TimerJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TimerJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionCollectionResource.java
index 27bea14ac8a..da841d1ce64 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionDecisionCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionDecisionCollectionResource.java
index 4ffed90ee71..75daf66a460 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionDecisionCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionDecisionCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionDecisionCollectionResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "List decisions for a case definition", nickname = "listCaseDefinitionDecisions", tags = { "Case Definitions" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionFormDefinitionCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionFormDefinitionCollectionResource.java
index 39d0490c5d3..a32900fa491 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionFormDefinitionCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionFormDefinitionCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionFormDefinitionCollectionResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "List form definitions for a case definition", nickname = "listCaseDefinitionFormDefinitions", tags = { "Case Definitions" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkCollectionResource.java
index 70635ed9716..a0fde3ecf0d 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkCollectionResource.java
@@ -38,7 +38,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionIdentityLinkCollectionResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "List candidate starters for a case definition", nickname = "listCaseDefinitionIdentityLinks", tags = { "Case Definitions" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkResource.java
index ecac502f789..c1b28805f01 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionIdentityLinkResource.java
@@ -40,7 +40,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionIdentityLinkResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "Get a candidate starter from a case definition", tags = { "Case Definitions" }, nickname = "getIdentityLink")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionImageResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionImageResource.java
index 058ab149a74..19cc9f8ce47 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionImageResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionImageResource.java
@@ -39,7 +39,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionImageResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "Get a case definition image", tags = { "Case Definitions" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionModelResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionModelResource.java
index cc931478b68..11b7de241ec 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionModelResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionModelResource.java
@@ -30,7 +30,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionModelResource extends BaseCaseDefinitionResource {
 
     @ApiOperation(value = "Get a case definition CMMN model", tags = { "Case Definitions" }, nickname = "getCmmnModelResource")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResource.java
index 6b98fad170d..b0f3a9bd197 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResource.java
@@ -53,7 +53,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionResource extends BaseCaseDefinitionResource {
     
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResourceDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResourceDataResource.java
index 2403dc98cb6..949e12a5df8 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResourceDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/CaseDefinitionResourceDataResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Definitions" }, description = "Manage Case Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseDefinitionResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a case definition resource content", tags = { "Case Definitions" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java
index 54bbb80fefc..3111d413d24 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentCollectionResource.java
@@ -60,7 +60,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "CmmnDeployment" }, description = "Manage CmmnDeployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "CmmnDeployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentCollectionResource {
 
     protected static final String DEPRECATED_API_DEPLOYMENT_SEGMENT = "deployment";
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java
index 09b24ad9ad2..d86497de104 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResource.java
@@ -35,7 +35,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "CMMN Deployment" }, description = "Manage CMMN Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "CMMN Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceCollectionResource.java
index f9806845625..3d2d4b41ab0 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceCollectionResource.java
@@ -35,7 +35,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Cmmn Deployment" }, description = "Manage Cmmn Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Cmmn Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceCollectionResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java
index a934de66610..4ba9d55c69e 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceDataResource.java
@@ -31,7 +31,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a deployment resource content", tags = {
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceResource.java
index a1a93e07327..def592e3052 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/repository/DeploymentResourceResource.java
@@ -38,7 +38,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Cmmn Deployment" }, description = "Manage Cmmn Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Cmmn Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java
index 6b60050fb22..8ca6912b85b 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceCollectionResource.java
@@ -52,7 +52,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instances" }, description = "Manage Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceCollectionResource extends BaseCaseInstanceResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceDiagramResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceDiagramResource.java
index dc8afbe6824..5750ce9b98b 100755
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceDiagramResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceDiagramResource.java
@@ -42,7 +42,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Case Instances" }, description = "Manage Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceDiagramResource extends BaseCaseInstanceResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java
index d726399c621..cc05c814a83 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instance Identity Links" }, description = "Manage Case Instances Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instance Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceIdentityLinkCollectionResource extends BaseCaseInstanceResource {
 
     @ApiOperation(value = "Get involved people for case instance", tags = {"Case Instance Identity Links" }, nickname = "listCaseInstanceIdentityLinks",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkResource.java
index b645b20b806..a9b70af62cf 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceIdentityLinkResource.java
@@ -38,7 +38,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instance Identity Links" }, description = "Manage Case Instances Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instance Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceIdentityLinkResource extends BaseCaseInstanceResource {
 
 
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryResource.java
index 23ab464b99e..adcc93bb175 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instances" }, description = "Manage Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceQueryResource extends BaseCaseInstanceResource {
 
     @ApiOperation(value = "Query case instances", tags = {"Case Instances", "Query" },
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceResource.java
index f7f4411bacb..a48f39d2935 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceResource.java
@@ -50,7 +50,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Case Instances" }, description = "Manage Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceResource extends BaseCaseInstanceResource {
     
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableCollectionResource.java
index 39cbf9f74ea..ad1d98eef5c 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableCollectionResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instance Variables" }, description = "Manage Case Instances Variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceVariableCollectionResource extends BaseVariableResource {
 
     @ApiOperation(value = "List variables for a case instance", nickname="listCaseInstanceVariables", tags = {"Case Instance Variables" },
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableDataResource.java
index 1b26dc299a9..b94f6f4b874 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableDataResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instance Variables" }, description = "Manage Case Instances Variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceVariableDataResource extends BaseVariableResource {
 
     @ApiOperation(value = "Get the binary data for a variable", tags = { "Case Instance Variables" }, nickname = "getCaseInstanceVariableData")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableResource.java
index 3e7eba836a2..bc819a2ca1c 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/CaseInstanceVariableResource.java
@@ -48,7 +48,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Case Instance Variables" }, description = "Manage Case Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Case Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class CaseInstanceVariableResource extends BaseVariableResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionCollectionResource.java
index 40a8f688077..b386e0349ac 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionCollectionResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event subscriptions" }, description = "Query event subscriptions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event subscriptions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventSubscriptionCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionResource.java
index 66b47754720..7ffbcbe9a8c 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/EventSubscriptionResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event subscriptions" }, description = "Manage event subscriptions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event subscriptions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventSubscriptionResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableDataResource.java
index b3da4f01ec7..aad4bf50bb7 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableDataResource.java
@@ -33,7 +33,7 @@
  * @author Christopher Welsch
  */
 @RestController
-@Api(tags = { "Plan Item Instance Variables" }, description = "Manage Plan Item Instances Variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceVariableDataResource extends BaseVariableResource {
 
     @ApiOperation(value = "Get the binary data for a variable", tags = { "Plan Item Instance Variables" }, nickname = "getPlanItemInstanceVariableData")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableResource.java
index 97e63230073..aad02338d6c 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/caze/PlanItemInstanceVariableResource.java
@@ -47,7 +47,7 @@
  * @author Christopher Welsch
  */
 @RestController
-@Api(tags = { "Plan Item Instance" }, description = "Manage Plan Item Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instance" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceVariableResource extends BaseVariableResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceCollectionResource.java
index 6096063050f..a7c6b984fef 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceCollectionResource.java
@@ -35,7 +35,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Plan Item Instances" }, description = "Manage Plan Item Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceCollectionResource extends PlanItemInstanceBaseResource {
 
     // FIXME naming issue ?
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceQueryResource.java
index f3ab52f25a9..ac42da73459 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Plan Item Instances" }, description = "Manage Plan Item Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceQueryResource extends PlanItemInstanceBaseResource {
 
     @ApiOperation(value = "Query plan item instances", tags = {"Plan Item Instances", "Query" }, nickname = "queryPlanItemInstances",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceResource.java
index df2bdfe5fa4..a25074d666d 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Plan Item Instances" }, description = "Manage Plan Item Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceResource extends PlanItemInstanceBaseResource {
 
     @ApiOperation(value = "Get an plan item instance", tags = { "Plan Item Instances" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceVariableCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceVariableCollectionResource.java
index d7f31a9d089..2d0a431a758 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceVariableCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/planitem/PlanItemInstanceVariableCollectionResource.java
@@ -36,7 +36,7 @@
  * @author Christopher Welsch
  */
 @RestController
-@Api(tags = { "Plan Item Instance" }, description = "Manage Plan Item Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Plan Item Instance" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PlanItemInstanceVariableCollectionResource extends BaseVariableResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskCollectionResource.java
index 2976431a1f6..5dbbb1d4269 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskCollectionResource.java
@@ -50,7 +50,7 @@
  * @author Christopher Welsch
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List of tasks", nickname="listTasks", tags = { "Tasks" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
index 38cde41822a..855870e78a1 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List identity links for a task", tags = { "Task Identity Links" }, nickname = "listTasksInstanceIdentityLinks")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
index 3035b53c657..f185ddcc47d 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
@@ -36,7 +36,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkFamilyResource extends TaskBaseResource {
 
     @ApiOperation(value = "List identity links for a task for either groups or users", tags = { "Task Identity Links" },  nickname = "listIdentityLinksForFamily",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkResource.java
index 4017e37466c..e59fd037129 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskIdentityLinkResource.java
@@ -39,7 +39,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkResource extends TaskBaseResource {
 
     @ApiOperation(value = "Get a single identity link on a task", tags = { "Task Identity Links" }, nickname = "getTaskInstanceIdentityLinks")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskQueryResource.java
index 942b49ba920..b15d096a912 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskQueryResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskQueryResource extends TaskBaseResource {
 
     @ApiOperation(value = "Query for tasks", nickname="queryTasks", tags = {"Tasks", "Query"},
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskResource.java
index a2cef2c8eb2..01a5378456d 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskResource extends TaskBaseResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
index b0410f74d0f..c277e3b0cb2 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskSubTaskCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List of sub tasks for a task", nickname="listTaskSubtasks", tags = { "Tasks" })
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableCollectionResource.java
index 2ce36d5c281..1306a171e13 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableCollectionResource.java
@@ -53,7 +53,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableCollectionResource extends TaskVariableBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java
index 36072add130..c1ad91fcec4 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableDataResource.java
@@ -42,7 +42,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableDataResource extends TaskVariableBaseResource {
 
     @ApiOperation(value = "Get the binary data for a variable", tags = {"Task Variables" }, nickname = "getTaskVariableData",
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableResource.java
index 854a736cf4b..2577eda184b 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/task/TaskVariableResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableResource extends TaskVariableBaseResource {
 
     @Autowired
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceCollectionResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceCollectionResource.java
index b0f2a836a82..14791e32f0e 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceCollectionResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceCollectionResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceCollectionResource extends VariableInstanceBaseResource {
 
     @ApiOperation(value = "List of variable instances", tags = { "History" }, nickname = "listVariableInstances")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceDataResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceDataResource.java
index 854a48bda31..d50886ba1f8 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceDataResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceDataResource.java
@@ -39,7 +39,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceDataResource extends VariableInstanceBaseResource {
 
     @GetMapping(value = "/cmmn-runtime/variable-instances/{varInstanceId}/data")
diff --git a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceQueryResource.java b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceQueryResource.java
index 42fd4154b72..30a63984cc8 100644
--- a/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceQueryResource.java
+++ b/modules/flowable-cmmn-rest/src/main/java/org/flowable/cmmn/rest/service/api/runtime/variable/VariableInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceQueryResource extends VariableInstanceBaseResource {
 
     @ApiOperation(value = "Query for variable instances", tags = { "Runtime", "Query" },
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/decision/DmnRuleServiceResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/decision/DmnRuleServiceResource.java
index d443aa2afe7..6026b5f3b85 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/decision/DmnRuleServiceResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/decision/DmnRuleServiceResource.java
@@ -44,7 +44,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "DMN Rule Service" }, description = "Execute DMN Decision", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "DMN Rule Service" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DmnRuleServiceResource {
 
     @Autowired
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResource.java
index 5d48d5ff7ba..fadc8a4ed5b 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResource.java
@@ -28,7 +28,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Historic Decision Executions" }, description = "Historic Decision Execution", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Historic Decision Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricDecisionExecutionResource extends BaseHistoricDecisionExecutionResource {
 
     @ApiOperation(value = "Get a historic decision execution", tags = { "Historic Decision Executions" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResourceDataResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResourceDataResource.java
index f34240263bb..efcf013b42c 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResourceDataResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoricDecisionExecutionResourceDataResource.java
@@ -30,7 +30,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Historic Decision Executions" }, description = "Manage Historic Decision Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Historic Decision Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricDecisionExecutionResourceDataResource extends BaseHistoricDecisionExecutionResource {
 
     @ApiOperation(value = "Get a historic decision execution audit content", tags = { "Historic Decision Executions" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoryDecisionExecutionCollectionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoryDecisionExecutionCollectionResource.java
index ca23bddbd89..7fdf481e626 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoryDecisionExecutionCollectionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/history/HistoryDecisionExecutionCollectionResource.java
@@ -42,7 +42,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Historic Decision Executions" }, description = "Query Historic Decision Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Historic Decision Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoryDecisionExecutionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/management/DmnEngineResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/management/DmnEngineResource.java
index 952c95091a2..3db6318d76b 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/management/DmnEngineResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/management/DmnEngineResource.java
@@ -32,7 +32,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Engine" }, description = "Manage DMN Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DmnEngineResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionCollectionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionCollectionResource.java
index 2ef9caa1370..a0a4a1058d3 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionCollectionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionCollectionResource.java
@@ -42,7 +42,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Decisions" }, description = "Manage Decisions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decisions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionImageResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionImageResource.java
index cc6966cd858..baa22e64123 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionImageResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionImageResource.java
@@ -39,7 +39,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Decision" }, description = "Manage Decisions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionImageResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision requirements diagram image", tags = { "Decisions" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionModelResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionModelResource.java
index 5bfb15221cb..590fcae7cd2 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionModelResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionModelResource.java
@@ -29,7 +29,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Decision" }, description = "Manage Decisions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionModelResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision DMN (definition) model", tags = { "Decisions" }, nickname = "getDecisionModel")
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResource.java
index 63913d4e7ba..30c57105e0b 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResource.java
@@ -28,7 +28,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Decisions" }, description = "Manage Decisions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decisions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision", tags = { "Decisions" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResourceDataResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResourceDataResource.java
index 2e4b6716ffc..e4a8f74c5c4 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResourceDataResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionResourceDataResource.java
@@ -31,7 +31,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Decisions" }, description = "Manage Decisions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decisions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionResourceDataResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision resource content", tags = { "Decisions" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableCollectionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableCollectionResource.java
index 213fb0eab4f..5f1afcb83c9 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableCollectionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableCollectionResource.java
@@ -45,7 +45,7 @@
  */
 @Deprecated
 @RestController
-@Api(tags = { "Decision Tables" }, description = "Manage Decision Tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision Tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionTableCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableModelResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableModelResource.java
index 890ce1949be..ec7a5a86a0a 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableModelResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableModelResource.java
@@ -32,7 +32,7 @@
  */
 @Deprecated
 @RestController
-@Api(tags = { "Decision Tables" }, description = "Manage Decision Tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision Tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionTableModelResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision table DMN (definition) model", tags = { "Decision Tables" }, nickname = "getDecisionTableModel")
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResource.java
index 86dcb84d58d..7b34e528d24 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResource.java
@@ -31,7 +31,7 @@
  */
 @Deprecated
 @RestController
-@Api(tags = { "Decision Tables" }, description = "Manage Decision Tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision Tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionTableResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision table", tags = { "Decision Tables" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResourceDataResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResourceDataResource.java
index 292023cee96..fadf2e4512c 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResourceDataResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DecisionTableResourceDataResource.java
@@ -34,7 +34,7 @@
  */
 @Deprecated
 @RestController
-@Api(tags = { "Decision Tables" }, description = "Manage Decision Tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Decision Tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DecisionTableResourceDataResource extends BaseDecisionResource {
 
     @ApiOperation(value = "Get a decision table resource content", tags = { "Decision Tables" })
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentCollectionResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentCollectionResource.java
index cc6a7ccc419..3c6ad218d78 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentCollectionResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentCollectionResource.java
@@ -56,7 +56,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Decision Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DmnDeploymentCollectionResource {
 
     private static Map<String, QueryProperty> allowedSortProperties = new HashMap<>();
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResource.java
index 549cd486365..7821aa13ec1 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResource.java
@@ -36,7 +36,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Decision Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DmnDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResourceDataResource.java b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResourceDataResource.java
index 48adb4ed247..631a262fde7 100644
--- a/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResourceDataResource.java
+++ b/modules/flowable-dmn-rest/src/main/java/org/flowable/dmn/rest/service/api/repository/DmnDeploymentResourceDataResource.java
@@ -30,7 +30,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Decision Deployments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DmnDeploymentResourceDataResource extends BaseDmnDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a decision deployment resource content", tags = {"Deployment" }, nickname = "getDecisionTableDeploymentResource",
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/management/EventRegistryEngineResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/management/EventRegistryEngineResource.java
index a8fbeec1833..bcdb532b369 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/management/EventRegistryEngineResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/management/EventRegistryEngineResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Registry Engine" }, description = "Manage Event Registry Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Registry Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventRegistryEngineResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionCollectionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionCollectionResource.java
index 71570d56f0e..fa6b9bcf140 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionCollectionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionCollectionResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Channel Definitions" }, description = "Manage Channel Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Channel Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ChannelDefinitionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionModelResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionModelResource.java
index 5d0fb7a4689..e42af5abd26 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionModelResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionModelResource.java
@@ -30,7 +30,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Channel Definitions" }, description = "Manage Channel Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Channel Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ChannelDefinitionModelResource extends BaseEventDefinitionResource {
 
     @ApiOperation(value = "Get a channel definition JSON model", tags = { "Channel Definitions" }, nickname = "getChannelModelResource")
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResource.java
index 6f25d82be39..b109cd21ad6 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Channel Definitions" }, description = "Manage Channel Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Channel Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ChannelDefinitionResource extends BaseEventDefinitionResource {
     
     @Autowired
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResourceDataResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResourceDataResource.java
index 0d5092452c8..d7db5949138 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResourceDataResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/ChannelDefinitionResourceDataResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Channel Definitions" }, description = "Manage Channel Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Channel Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ChannelDefinitionResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a channel definition resource content", tags = { "Channel Definitions" })
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java
index 23ed8ab15a7..7633e2d518f 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentCollectionResource.java
@@ -59,7 +59,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Deployment" }, description = "Manage Event Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentCollectionResource {
 
     protected static final String DEPRECATED_API_DEPLOYMENT_SEGMENT = "deployment";
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResource.java
index e428a9464e3..0f367bdd875 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Deployment" }, description = "Manage Event Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceCollectionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceCollectionResource.java
index 413a0d5f035..61bae7dd6f3 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceCollectionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceCollectionResource.java
@@ -35,7 +35,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Registry Deployment" }, description = "Manage Event Registry Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Registry Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceCollectionResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceDataResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceDataResource.java
index eb62973e059..255cdbd6907 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceDataResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceDataResource.java
@@ -31,7 +31,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a deployment resource content", tags = {
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceResource.java
index 0f84fe17081..3bc7f7d25fd 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/DeploymentResourceResource.java
@@ -38,7 +38,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Registry Deployment" }, description = "Manage Event Registry Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Registry Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceResource extends BaseDeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionCollectionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionCollectionResource.java
index dea2c0d4455..1c0c447c362 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionCollectionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Definitions" }, description = "Manage Event Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventDefinitionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionModelResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionModelResource.java
index 6c6e2e24162..324cfd1edf1 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionModelResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionModelResource.java
@@ -30,7 +30,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Definitions" }, description = "Manage Event Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventDefinitionModelResource extends BaseEventDefinitionResource {
 
     @ApiOperation(value = "Get an event definition JSON model", tags = { "Event Definitions" }, nickname = "getEventModelResource")
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResource.java
index 7f3b34d766a..c072b9daeff 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Definitions" }, description = "Manage Event Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventDefinitionResource extends BaseEventDefinitionResource {
     
     @Autowired
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResourceDataResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResourceDataResource.java
index 9ef73a4669e..3ff56c043ea 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResourceDataResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/repository/EventDefinitionResourceDataResource.java
@@ -32,7 +32,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Definitions" }, description = "Manage Event Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventDefinitionResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get an event definition resource content", tags = { "Event Definitions" })
diff --git a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/runtime/EventInstanceCollectionResource.java b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/runtime/EventInstanceCollectionResource.java
index cd0af10e617..d04c2f574c1 100644
--- a/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/runtime/EventInstanceCollectionResource.java
+++ b/modules/flowable-event-registry-rest/src/main/java/org/flowable/eventregistry/rest/service/api/runtime/EventInstanceCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event Instances" }, description = "Manage Event Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventInstanceCollectionResource {
     
     @Autowired
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupCollectionResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupCollectionResource.java
index 343b4531737..89b3f1fc650 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupCollectionResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupCollectionResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupCollectionResource {
 
     protected static HashMap<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipCollectionResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipCollectionResource.java
index 4d54c466253..665eb318049 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipCollectionResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipCollectionResource.java
@@ -35,7 +35,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupMembershipCollectionResource extends BaseGroupResource {
     
     @ApiOperation(value = "Add a member to a group", tags = { "Groups" }, code = 201)
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipResource.java
index a3e75130feb..5ae6af64216 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupMembershipResource.java
@@ -32,7 +32,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupMembershipResource extends BaseGroupResource {
 
     @ApiOperation(value = "Delete a member from a group", tags = { "Groups" }, code = 204)
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupResource.java
index 16ef1fe101b..23768aa4606 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/group/GroupResource.java
@@ -35,7 +35,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupResource extends BaseGroupResource {
 
     @ApiOperation(value = "Get a single group", tags = { "Groups" })
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/management/IdmEngineResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/management/IdmEngineResource.java
index 6a542574eb9..62a23ee7a3d 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/management/IdmEngineResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/management/IdmEngineResource.java
@@ -32,7 +32,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Engine" }, description = "Manage IDM Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class IdmEngineResource {
     
     @Autowired(required=false)
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeCollectionResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeCollectionResource.java
index e8cb742b10f..1f51c5509fc 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeCollectionResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeCollectionResource.java
@@ -50,7 +50,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Privileges" }, description = "Manage Privileges", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Privileges" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PrivilegeCollectionResource {
     
     @Autowired
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeResource.java
index b42ff831f2f..c244058675e 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/privilege/PrivilegeResource.java
@@ -38,7 +38,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Privileges" }, description = "Manage Privileges", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Privileges" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PrivilegeResource {
     
     @Autowired
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserCollectionResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserCollectionResource.java
index 649ab87289a..fc59805f218 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserCollectionResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserCollectionResource.java
@@ -52,7 +52,7 @@
  * @author Filip Hrisafov
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserCollectionResource {
 
     protected static HashMap<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserResource.java b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserResource.java
index d0ea09e8b62..d1b73db8e20 100644
--- a/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserResource.java
+++ b/modules/flowable-idm-rest/src/main/java/org/flowable/idm/rest/service/api/user/UserResource.java
@@ -40,7 +40,7 @@
  * @author Filip Hrisafov
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserResource {
     
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/form/FormDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/form/FormDataResource.java
index a0eaabad60e..f4cd357c809 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/form/FormDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/form/FormDataResource.java
@@ -45,7 +45,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Forms" }, description = "Manage Forms", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Forms" }, authorizations = { @Authorization(value = "basicAuth") })
 public class FormDataResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceCollectionResource.java
index b315275f037..0d7cc7ccf7a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceCollectionResource.java
@@ -35,7 +35,7 @@
 /**
  * @author Tijs Rademakers
  */
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 @RestController
 public class HistoricActivityInstanceCollectionResource extends HistoricActivityInstanceBaseResource {
 
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceQueryResource.java
index a5ea7a51d4d..38adcd26b9c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricActivityInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricActivityInstanceQueryResource extends HistoricActivityInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic activity instances", tags = {"History", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailCollectionResource.java
index 4b226151814..1bf964b05fc 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailCollectionResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricDetailCollectionResource extends HistoricDetailBaseResource {
 
     // FIXME rename as List Historic Details ? It returns a Data Response.
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailDataResource.java
index 784097cb98b..2bb756a21ac 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailDataResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricDetailDataResource extends HistoricDetailBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailQueryResource.java
index 8e74e109d87..e5481ad065d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricDetailQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricDetailQueryResource extends HistoricDetailBaseResource {
 
     @ApiOperation(value = "Query for historic details", tags = {"History", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCollectionResource.java
index 5838a6cf97a..fdc72e0f21c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceCollectionResource extends HistoricProcessInstanceBaseResource {
 
     @ApiOperation(value = "List of historic process instances", tags = { "History Process" }, nickname = "listHistoricProcessInstances")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentCollectionResource.java
index 7f43102a267..de929eff281 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentCollectionResource.java
@@ -38,7 +38,7 @@
 import io.swagger.annotations.Authorization;
 
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceCommentCollectionResource extends HistoricProcessInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentResource.java
index deef9db97f4..45c3fffaf2d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceCommentResource.java
@@ -39,7 +39,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceCommentResource extends HistoricProcessInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceIdentityLinkCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceIdentityLinkCollectionResource.java
index 54dcca75483..9fd4650a6d4 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceIdentityLinkCollectionResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceIdentityLinkCollectionResource extends HistoricProcessInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceQueryResource.java
index 6852d56230e..f1aed0dd45d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceQueryResource extends HistoricProcessInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic process instances", tags = {"History Process", "Query" }, nickname = "queryHistoricProcessInstance",
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceResource.java
index 0c58f4f8b95..3e369c55779 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceResource extends HistoricProcessInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceVariableDataResource.java
index 7135319d4e4..51c9a138d28 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceVariableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricProcessInstanceVariableDataResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Process" }, description = "Manage History Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Process" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricProcessInstanceVariableDataResource extends HistoricProcessInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceCollectionResource.java
index 1f75b7924ff..c07606a322a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceCollectionResource.java
@@ -35,7 +35,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceCollectionResource extends HistoricTaskInstanceBaseResource {
 
     @ApiOperation(value = "List historic task instances", tags = { "History Task" }, nickname = "listHistoricTaskInstances")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceIdentityLinkCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceIdentityLinkCollectionResource.java
index 123d22b83d5..f52b497ceda 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceIdentityLinkCollectionResource.java
@@ -36,7 +36,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceIdentityLinkCollectionResource extends HistoricTaskInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResource.java
index a8ed9518126..36cdd714c1d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceQueryResource extends HistoricTaskInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic task instances", tags = {"History Task", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java
index a1b05dfd032..a416fec9b65 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceResource.java
@@ -42,7 +42,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceResource extends HistoricTaskInstanceBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceVariableDataResource.java
index bfe64bcb417..672174bb05c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceVariableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskInstanceVariableDataResource.java
@@ -48,7 +48,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History Task" }, description = "Manage History Task Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History Task" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskInstanceVariableDataResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResource.java
index 748ee001701..f39305dc887 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricTaskLogCollectionResource.java
@@ -34,7 +34,7 @@
  * @author Luis Belloch
  */
 @RestController
-@Api(tags = { "Historic Task Log Entries" }, description = "Manage Historic Task Log Entries", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Historic Task Log Entries" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricTaskLogCollectionResource extends HistoricTaskLogEntryBaseResource {
 
     @ApiOperation(value = "List historic task log entries", tags = { "History Task" }, nickname = "getHistoricTaskLogEntries")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceCollectionResource.java
index 218d3dec119..88543ce51b3 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceCollectionResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceCollectionResource extends HistoricVariableInstanceBaseResource {
 
     @ApiOperation(value = "List of historic variable instances", tags = { "History" }, nickname = "listHistoricVariableInstances")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceDataResource.java
index 8d019d04fb5..76c1f42d98e 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceDataResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceDataResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceQueryResource.java
index 812c32c428b..ff48029262e 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/history/HistoricVariableInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "History" }, description = "Manage History", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "History" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoricVariableInstanceQueryResource extends HistoricVariableInstanceBaseResource {
 
     @ApiOperation(value = "Query for historic variable instances", tags = { "History", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupCollectionResource.java
index 41861b02bb5..8b0e46c8c20 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupCollectionResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupCollectionResource {
 
     protected static HashMap<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipCollectionResource.java
index e0cb4087b21..3d096e0f174 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipCollectionResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupMembershipCollectionResource extends BaseGroupResource {
 
     @ApiOperation(value = "Add a member to a group", tags = { "Groups" }, code = 201)
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipResource.java
index e1d85394ec8..e1aa2cef4b6 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupMembershipResource.java
@@ -32,7 +32,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupMembershipResource extends BaseGroupResource {
 
     @ApiOperation(value = "Delete a member from a group", tags = { "Groups" }, code = 204)
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupResource.java
index 055b266d322..e424919ff97 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/GroupResource.java
@@ -35,7 +35,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Groups" }, description = "Manage Groups", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Groups" }, authorizations = { @Authorization(value = "basicAuth") })
 public class GroupResource extends BaseGroupResource {
 
     @ApiOperation(value = "Get a single group", tags = { "Groups" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserCollectionResource.java
index d6b9ef74bd4..a6e6c905fbb 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserCollectionResource.java
@@ -51,7 +51,7 @@
  * @author Filip Hrisafov
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserCollectionResource {
 
     protected static HashMap<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoCollectionResource.java
index b2510ccf790..c6f3a21a921 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoCollectionResource.java
@@ -40,7 +40,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserInfoCollectionResource extends BaseUserResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoResource.java
index 4fc1af6c20f..ef9576eff64 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserInfoResource.java
@@ -39,7 +39,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserInfoResource extends BaseUserResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserPictureResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserPictureResource.java
index 54c1ecbbe56..fa0ce24c6a8 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserPictureResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserPictureResource.java
@@ -47,7 +47,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserPictureResource extends BaseUserResource {
 
 
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserResource.java
index bc5825d2cb8..095ff8b1fbb 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/identity/UserResource.java
@@ -35,7 +35,7 @@
  * @author Filip Hrisafov
  */
 @RestController
-@Api(tags = { "Users" }, description = "Manage Users", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Users" }, authorizations = { @Authorization(value = "basicAuth") })
 public class UserResource extends BaseUserResource {
 
     @ApiOperation(value = "Get a single user", tags = { "Users" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchCollectionResource.java
index 779aa0bfee5..d7aa7e078ae 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchCollectionResource.java
@@ -38,7 +38,7 @@
 import io.swagger.annotations.Authorization;
 
 @RestController
-@Api(tags = { "Batches" }, description = "Manage Batches", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Batches" }, authorizations = { @Authorization(value = "basicAuth") })
 public class BatchCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartCollectionResource.java
index eafac5df800..4cf484fd8bc 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartCollectionResource.java
@@ -38,7 +38,7 @@
 import io.swagger.annotations.Authorization;
 
 @RestController
-@Api(tags = { "Batch parts" }, description = "Manage Batch parts", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Batch parts" }, authorizations = { @Authorization(value = "basicAuth") })
 public class BatchPartCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartResource.java
index f779c7589ab..6e76286c920 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchPartResource.java
@@ -32,7 +32,7 @@
 import io.swagger.annotations.Authorization;
 
 @RestController
-@Api(tags = { "Batch parts" }, description = "Manage Batch parts", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Batch parts" }, authorizations = { @Authorization(value = "basicAuth") })
 public class BatchPartResource extends BatchPartBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchResource.java
index 7c41aadce4d..64e0c16b589 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/BatchResource.java
@@ -35,7 +35,7 @@
 import io.swagger.annotations.Authorization;
 
 @RestController
-@Api(tags = { "Batches" }, description = "Manage Batches", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Batches" }, authorizations = { @Authorization(value = "basicAuth") })
 public class BatchResource extends BatchBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/DeadLetterJobCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/DeadLetterJobCollectionResource.java
index d32c3482373..2aafc633b9b 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/DeadLetterJobCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/DeadLetterJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeadLetterJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/EnginePropertiesResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/EnginePropertiesResource.java
index abe5fc7b02b..2836e00fefc 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/EnginePropertiesResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/EnginePropertiesResource.java
@@ -44,7 +44,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Properties" }, description = "Manage engine properties", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Properties" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EnginePropertiesResource {
 
     @Autowired(required=false)
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/HistoryJobCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/HistoryJobCollectionResource.java
index 2b6f61658f9..4e8538c2e77 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/HistoryJobCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/HistoryJobCollectionResource.java
@@ -41,7 +41,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage history Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class HistoryJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobCollectionResource.java
index 6ae4cf41d91..af5a3a79f7b 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobCollectionResource.java
@@ -53,7 +53,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobCollectionResource {
 
     private static final String EXECUTE_ACTION = "execute";
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobExceptionStacktraceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobExceptionStacktraceResource.java
index 0d66c38ccdb..9c45e713bb6 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobExceptionStacktraceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobExceptionStacktraceResource.java
@@ -33,7 +33,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobExceptionStacktraceResource extends JobBaseResource {
 
     @ApiOperation(value = "Get the exception stacktrace for a job", tags = { "Jobs" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobResource.java
index f9f0e5b2a86..03b8abaf728 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/JobResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class JobResource extends JobBaseResource {
 
     private static final String EXECUTE_ACTION = "execute";
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/ProcessEngineResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/ProcessEngineResource.java
index 375589eb7a4..a9569528677 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/ProcessEngineResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/ProcessEngineResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Engine" }, description = "Manage Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessEngineResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/PropertiesCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/PropertiesCollectionResource.java
index 6b7d55b9218..f8605c57814 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/PropertiesCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/PropertiesCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Engine" }, description = "Manage Engine", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Engine" }, authorizations = { @Authorization(value = "basicAuth") })
 public class PropertiesCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/SuspendedJobCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/SuspendedJobCollectionResource.java
index 616428dca79..6773233283c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/SuspendedJobCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/SuspendedJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class SuspendedJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableCollectionResource.java
index 18629c98fdf..26a5b567722 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableCollectionResource.java
@@ -32,7 +32,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Database tables" }, description = "Manage Database tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Database tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TableCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableColumnsResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableColumnsResource.java
index 39ce72cd80e..a99316cafd2 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableColumnsResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableColumnsResource.java
@@ -33,7 +33,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Database tables" }, description = "Manage Database tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Database tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TableColumnsResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableDataResource.java
index 72f1617ca9d..73a63861814 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableDataResource.java
@@ -43,7 +43,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Database tables" }, description = "Manage Database tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Database tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TableDataResource {
 
     protected static final Integer DEFAULT_RESULT_SIZE = 10;
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableResource.java
index 8d52d0a89da..230ddc2c562 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TableResource.java
@@ -36,7 +36,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Database tables" }, description = "Manage Database tables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Database tables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TableResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TimerJobCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TimerJobCollectionResource.java
index ff240f03cf0..8bc427248b9 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TimerJobCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/management/TimerJobCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Joram Barrez
  */
 @RestController
-@Api(tags = { "Jobs" }, description = "Manage Jobs", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Jobs" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TimerJobCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentCollectionResource.java
index f93d68158e8..17d83c853e1 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentCollectionResource.java
@@ -61,7 +61,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentCollectionResource {
 
     protected static final String DEPRECATED_API_DEPLOYMENT_SEGMENT = "deployment";
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResource.java
index 9c3f81a9adb..77f72255f33 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResource.java
@@ -38,7 +38,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceCollectionResource.java
index 6b6f146ac5e..1fce08142af 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceDataResource.java
index bde9771b322..1c34972f694 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceDataResource.java
@@ -31,7 +31,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a deployment resource content", tags = {
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceResource.java
index 7e75639cea2..df33dbd7943 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/DeploymentResourceResource.java
@@ -39,7 +39,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Deployment" }, description = "Manage Deployment", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Deployment" }, authorizations = { @Authorization(value = "basicAuth") })
 public class DeploymentResourceResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelCollectionResource.java
index 02b424f67fa..708dc941cf2 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelCollectionResource.java
@@ -44,7 +44,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Models" }, description = "Manage Models", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Models" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ModelCollectionResource extends BaseModelResource {
 
     private static Map<String, QueryProperty> allowedSortProperties = new HashMap<>();
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelResource.java
index 7cc83ad1969..b1bb882e980 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Models" }, description = "Manage Models", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Models" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ModelResource extends BaseModelResource {
 
     @ApiOperation(value = "Get a model", tags = { "Models" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceExtraResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceExtraResource.java
index 45020336d21..6ad68dfe56a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceExtraResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceExtraResource.java
@@ -42,7 +42,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Models" }, description = "Manage Models", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Models" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ModelSourceExtraResource extends BaseModelSourceResource {
 
     @ApiOperation(value = "Get the extra editor source for a model", tags = { "Models" }, nickname = "getExtraEditorSource",
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceResource.java
index 6cb0e918eab..15e143145bb 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ModelSourceResource.java
@@ -43,7 +43,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Models" }, description = "Manage Models", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Models" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ModelSourceResource extends BaseModelSourceResource {
 
     @ApiOperation(value = "Get the editor source for a model", tags = { "Models" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionCollectionResource.java
index 981a3f97110..c32c6ed90da 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionCollectionResource {
 
     private static final Map<String, QueryProperty> properties = new HashMap<>();
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionDecisionCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionDecisionCollectionResource.java
index 781a1b7300b..7c6a5232012 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionDecisionCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionDecisionCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionDecisionCollectionResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "List decisions for a process-definition", nickname = "listProcessDefinitionDecisions", tags = { "Process Definitions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionFormDefinitionCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionFormDefinitionCollectionResource.java
index 899594ce577..47a1b3fc104 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionFormDefinitionCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionFormDefinitionCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Yvo Swillens
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionFormDefinitionCollectionResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "List form definitions for a process-definition", nickname = "listProcessDefinitionFormDefinitions", tags = { "Process Definitions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkCollectionResource.java
index f42a702e3a1..e1e56972ac5 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkCollectionResource.java
@@ -38,7 +38,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionIdentityLinkCollectionResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "List candidate starters for a process-definition", nickname = "listProcessDefinitionIdentityLinks", tags = { "Process Definitions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkResource.java
index 4b1effbf651..41b5e62fc00 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionIdentityLinkResource.java
@@ -40,7 +40,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionIdentityLinkResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "Get a candidate starter from a process definition", tags = { "Process Definitions" }, nickname = "getIdentityLink")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionImageResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionImageResource.java
index 9cca60b773a..9271a6bb12a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionImageResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionImageResource.java
@@ -39,7 +39,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionImageResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "Get a process definition image", tags = { "Process Definitions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionModelResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionModelResource.java
index e8ddc1074a7..95188d2f3a7 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionModelResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionModelResource.java
@@ -30,7 +30,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionModelResource extends BaseProcessDefinitionResource {
 
     @ApiOperation(value = "Get a process definition BPMN model", tags = { "Process Definitions" }, nickname = "getBpmnModelResource")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResource.java
index 1921971a70d..647c3c34f38 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResource.java
@@ -55,7 +55,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionResource extends BaseProcessDefinitionResource {
     
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResourceDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResourceDataResource.java
index 935677ca23f..fc45f34099a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResourceDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/repository/ProcessDefinitionResourceDataResource.java
@@ -32,7 +32,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Definitions" }, description = "Manage Process Definitions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Definitions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessDefinitionResourceDataResource extends BaseDeploymentResourceDataResource {
 
     @ApiOperation(value = "Get a process definition resource content", tags = { "Process Definitions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java
index e98d0c3c1b4..3b304b33905 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/SignalResource.java
@@ -42,7 +42,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class SignalResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceCollectionResource.java
index 5a377830322..ce35471d1a5 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceCollectionResource.java
@@ -33,7 +33,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceCollectionResource extends VariableInstanceBaseResource {
 
     @ApiOperation(value = "List of variable instances", tags = { "History" }, nickname = "listVariableInstances")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceDataResource.java
index 4aba960adc8..d8a806598c5 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceDataResource.java
@@ -44,7 +44,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceDataResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceQueryResource.java
index e07b7c1ee09..1d5320b1b9b 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/VariableInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Runtime" }, description = "Manage Runtime", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Runtime" }, authorizations = { @Authorization(value = "basicAuth") })
 public class VariableInstanceQueryResource extends VariableInstanceBaseResource {
 
     @ApiOperation(value = "Query for variable instances", tags = { "History", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceCollectionResource.java
index a9fc9b3f122..edf32a85a96 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceCollectionResource.java
@@ -33,7 +33,7 @@
 /**
  * @author Tijs Rademakers
  */
-@Api(tags = { "Activity Instances" }, description = "Manage Activity Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Activity Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 @RestController
 public class ActivityInstanceCollectionResource extends ActivityInstanceBaseResource {
 
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceQueryResource.java
index b9ef4280b4e..3bb56c63d7c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ActivityInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Activity Instances" }, description = "Manage Activity Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Activity Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ActivityInstanceQueryResource extends ActivityInstanceBaseResource {
 
     @ApiOperation(value = "Query for activity instances", tags = {"Runtime", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionCollectionResource.java
index 4d1d491f2aa..4c3eefa629d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionCollectionResource.java
@@ -41,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event subscriptions" }, description = "Query event subscriptions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event subscriptions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventSubscriptionCollectionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionResource.java
index 3466a5af863..a4fbcbc39e6 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/EventSubscriptionResource.java
@@ -34,7 +34,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Event subscriptions" }, description = "Manage event subscriptions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Event subscriptions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class EventSubscriptionResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionActiveActivitiesCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionActiveActivitiesCollectionResource.java
index 434385eb6c6..977fbb81b02 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionActiveActivitiesCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionActiveActivitiesCollectionResource.java
@@ -32,7 +32,7 @@
  */
 
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionActiveActivitiesCollectionResource extends ExecutionBaseResource {
 
     @ApiOperation(value = "List active activities in an execution", nickname="listExecutionActiveActivities", tags = { "Executions" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionCollectionResource.java
index 9f7b146f4ce..014d852181b 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionCollectionResource.java
@@ -41,7 +41,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionCollectionResource extends ExecutionBaseResource {
 
     // FIXME naming issue ?
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionQueryResource.java
index 7ded6399ea0..5f28dbcf028 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionQueryResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionQueryResource extends ExecutionBaseResource {
 
     // FIXME Naming issue ?
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionResource.java
index 08b833b83bc..5a9fcee8100 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionResource.java
@@ -35,7 +35,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionResource extends ExecutionBaseResource {
 
     @ApiOperation(value = "Get an execution", tags = { "Executions" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java
index 60a943c460b..baf675d0599 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableCollectionResource.java
@@ -43,7 +43,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionVariableCollectionResource extends BaseVariableCollectionResource {
 
     public ExecutionVariableCollectionResource() {
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java
index 25566ba65a7..4c1e53c7acf 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableDataResource.java
@@ -41,7 +41,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionVariableDataResource extends BaseExecutionVariableResource {
 
     public ExecutionVariableDataResource() {
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableResource.java
index d9c4d0424ea..14029a25a8c 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ExecutionVariableResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Executions" }, description = "Manage Executions", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Executions" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ExecutionVariableResource extends BaseExecutionVariableResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceCollectionResource.java
index d436fa6c7e1..0f100645627 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceCollectionResource.java
@@ -57,7 +57,7 @@
  * @author Zheng Ji
  */
 @RestController
-@Api(tags = { "Process Instances" }, description = "Manage Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceCollectionResource extends BaseProcessInstanceResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceDiagramResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceDiagramResource.java
index 163747db172..d431118de02 100755
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceDiagramResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceDiagramResource.java
@@ -45,7 +45,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instances" }, description = "Manage Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceDiagramResource extends BaseProcessInstanceResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkCollectionResource.java
index c07b63518ee..a753e714bfa 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instance Identity Links" }, description = "Manage Process Instances Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instance Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceIdentityLinkCollectionResource extends BaseProcessInstanceResource {
 
     @ApiOperation(value = "Get involved people for process instance", tags = {"Process Instance Identity Links" }, nickname = "listProcessInstanceIdentityLinks",
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkResource.java
index aadb998fcf3..08b2b6eb8a5 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceIdentityLinkResource.java
@@ -38,7 +38,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instance Identity Links" }, description = "Manage Process Instances Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instance Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceIdentityLinkResource extends BaseProcessInstanceResource {
 
 
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceQueryResource.java
index 0026ef9e99b..89ef2de3f59 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceQueryResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instances" }, description = "Manage Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceQueryResource extends BaseProcessInstanceResource {
 
     @ApiOperation(value = "Query process instances", tags = {"Process Instances", "Query" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceResource.java
index ed8e921ceef..e69305bee80 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceResource.java
@@ -49,7 +49,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instances" }, description = "Manage Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instances" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceResource extends BaseProcessInstanceResource {
     
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableCollectionResource.java
index 1f5cf5ab4c1..bdf944fa453 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableCollectionResource.java
@@ -45,7 +45,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Process Instance Variables" }, description = "Manage Process Instances Variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceVariableCollectionResource extends BaseVariableCollectionResource {
 
     public ProcessInstanceVariableCollectionResource() {
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableDataResource.java
index b77e2f35646..34dbaf60469 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableDataResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instance Variables" }, description = "Manage Process Instances Variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceVariableDataResource extends BaseExecutionVariableResource {
 
     public ProcessInstanceVariableDataResource() {
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableResource.java
index 67756587064..2cd97175898 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/process/ProcessInstanceVariableResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Process Instance Variables" }, description = "Manage Process Instances", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Process Instance Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class ProcessInstanceVariableResource extends BaseExecutionVariableResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentCollectionResource.java
index ec7a342fcd2..0fdebc1c826 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentCollectionResource.java
@@ -51,7 +51,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Attachments"}, description = "Manage Tasks Attachments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Attachments"}, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskAttachmentCollectionResource extends TaskBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentContentResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentContentResource.java
index aa3f2f0d777..1ee94732feb 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentContentResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentContentResource.java
@@ -41,7 +41,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Attachments" }, description = "Manage Tasks Attachments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Attachments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskAttachmentContentResource extends TaskBaseResource {
 
     @ApiOperation(value = "Get the content for an attachment", tags = { "Task Attachments" },
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentResource.java
index 85629037cb4..2e40b3254fa 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskAttachmentResource.java
@@ -37,7 +37,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Attachments" }, description = "Manage Tasks Attachments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Attachments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskAttachmentResource extends TaskBaseResource {
 
     @ApiOperation(value = "Get an attachment on a task", tags = { "Task Attachments" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCollectionResource.java
index bd759eca17a..d54f1031050 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCollectionResource.java
@@ -51,7 +51,7 @@
  * @author Christopher Welsch
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List of tasks", nickname="listTasks", tags = { "Tasks" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentCollectionResource.java
index d43ce2da1db..0833c89c9e1 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentCollectionResource.java
@@ -40,7 +40,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Comments" }, description = "Manage Tasks Comments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Comments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskCommentCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List comments on a task", tags = { "Task Comments" }, nickname = "listTaskComments")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentResource.java
index a4e28c486b7..9433772f254 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskCommentResource.java
@@ -36,7 +36,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Comments" }, description = "Manage Tasks Comments", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Comments" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskCommentResource extends TaskBaseResource {
 
     @ApiOperation(value = " Get a comment on a task", tags = { "Task Comments" }, nickname = "getTaskComment")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventCollectionResource.java
index 4fb16a7adb3..e97bb6a0d0a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventCollectionResource.java
@@ -32,7 +32,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskEventCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List events for a task", nickname = "listTaskEvents", tags = { "Tasks" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventResource.java
index 5f0b7b9eeac..f98218716bf 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskEventResource.java
@@ -36,7 +36,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskEventResource extends TaskBaseResource {
 
     @ApiOperation(value = "Get an event on a task", tags = { "Tasks" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
index 563e70ea870..29bbbcaf87a 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkCollectionResource.java
@@ -37,7 +37,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks Identity Links", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List identity links for a task", tags = { "Task Identity Links" }, nickname = "listTasksInstanceIdentityLinks")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
index f6586518b28..08934ad639d 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkFamilyResource.java
@@ -36,7 +36,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkFamilyResource extends TaskBaseResource {
 
     @ApiOperation(value = "List identity links for a task for either groups or users", tags = { "Task Identity Links" },  nickname = "listIdentityLinksForFamily",
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkResource.java
index 323b9b12c05..3fbd3fc8015 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskIdentityLinkResource.java
@@ -39,7 +39,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Identity Links" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Identity Links" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskIdentityLinkResource extends TaskBaseResource {
 
     @ApiOperation(value = "Get a single identity link on a task", tags = { "Task Identity Links" }, nickname = "getTaskInstanceIdentityLinks")
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskQueryResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskQueryResource.java
index 1e281cf372a..2ed38648df6 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskQueryResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskQueryResource.java
@@ -34,7 +34,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskQueryResource extends TaskBaseResource {
 
     @ApiOperation(value = "Query for tasks", nickname="queryTasks", tags = {"Tasks", "Query"},
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskResource.java
index f51a55a374a..ca4b65510a9 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = {"Tasks"}, description = "Manage Tasks", authorizations = {@Authorization(value = "basicAuth")})
+@Api(tags = {"Tasks"}, authorizations = {@Authorization(value = "basicAuth")})
 public class TaskResource extends TaskBaseResource {
 
     @Autowired(required = false)
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
index 365cbb8cf40..15f554182d4 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskSubTaskCollectionResource.java
@@ -31,7 +31,7 @@
  * @author Tijs Rademakers
  */
 @RestController
-@Api(tags = { "Tasks" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Tasks" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskSubTaskCollectionResource extends TaskBaseResource {
 
     @ApiOperation(value = "List of sub tasks for a task", nickname="listTaskSubtasks", tags = { "Tasks" })
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java
index e304dafa3ca..9d1a393fe28 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableCollectionResource.java
@@ -53,7 +53,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks variables", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableCollectionResource extends TaskVariableBaseResource {
 
     @Autowired
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableDataResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableDataResource.java
index 0e9f06f823a..45fa8e7dcb8 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableDataResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableDataResource.java
@@ -42,7 +42,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableDataResource extends TaskVariableBaseResource {
 
     @ApiOperation(value = "Get the binary data for a variable", tags = {"Task Variables" }, nickname = "getTaskVariableData",
diff --git a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableResource.java b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableResource.java
index 1169daf4849..c52f4a08855 100644
--- a/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableResource.java
+++ b/modules/flowable-rest/src/main/java/org/flowable/rest/service/api/runtime/task/TaskVariableResource.java
@@ -50,7 +50,7 @@
  * @author Frederik Heremans
  */
 @RestController
-@Api(tags = { "Task Variables" }, description = "Manage Tasks", authorizations = { @Authorization(value = "basicAuth") })
+@Api(tags = { "Task Variables" }, authorizations = { @Authorization(value = "basicAuth") })
 public class TaskVariableResource extends TaskVariableBaseResource {
 
     @Autowired