From 1a124c0238a64c6de59bec320ba4bd967ef7e7f9 Mon Sep 17 00:00:00 2001
From: Juan Manuel Leflet Estrada <jleflete@redhat.com>
Date: Thu, 30 Nov 2023 17:54:17 +0100
Subject: [PATCH] Update formatting of 6.2.3 rules

Signed-off-by: Juan Manuel Leflet Estrada <jleflete@redhat.com>
---
 .../azure/01-azure-file-system.windup.yaml    |   26 +-
 .../azure/02-azure-password.windup.yaml       |    8 +-
 ...-azure-appservice-certificates.windup.yaml |    4 +-
 ...e-appservice-datasource-driver.windup.yaml |   16 +-
 ...pservice-environment-variables.windup.yaml |   14 +-
 ...06-eap-to-azure-appservice-pom.windup.yaml |   28 +-
 .../07-spring-boot-to-azure-cache.windup.yaml |   39 +-
 ...-spring-boot-to-azure-database.windup.yaml |  110 +-
 ...09-spring-boot-to-azure-eureka.windup.yaml |   53 +-
 .../10-spring-boot-to-azure-feign.windup.yaml |   10 +-
 ...oot-to-azure-identity-provider.windup.yaml |    8 +-
 ...pring-boot-to-azure-jms-broker.windup.yaml |    8 +-
 ...ing-boot-to-azure-schedule-job.windup.yaml |   16 +-
 ...g-boot-to-azure-static-content.windup.yaml |   14 +-
 ...15-spring-boot-to-azure-zipkin.windup.yaml |    6 +-
 default/generated/azure/ruleset.yaml          |    2 +-
 .../camel3/16-component-changes.windup.yaml   |    7 +-
 .../camel3/17-java-dsl-changes.windup.yaml    |    8 +-
 .../18-java-generic-information.windup.yaml   |  223 ++--
 ...-per-application-not-supported.windup.yaml |   18 +-
 .../camel3/20-xml-dsl-changes.windup.yaml     |   56 +-
 .../camel3/21-xml-java-versions.windup.yaml   |   45 +-
 .../22-xml-moved-components.windup.yaml       |   37 +-
 .../23-xml-removed-components.windup.yaml     |   50 +-
 .../24-xml-renamed-components.windup.yaml     |  120 +-
 .../cloud-readiness/02-java-corba.windup.yaml |   26 -
 .../cloud-readiness/03-java-rmi.windup.yaml   |   48 -
 .../cloud-readiness/05-jca.windup.yaml        |   26 -
 .../06-jni-native-code.windup.yaml            |  110 --
 .../07-local-storage.windup.yaml              |  188 ---
 .../cloud-readiness/08-localhost.windup.yaml  |   54 -
 .../cloud-readiness/09-logging.windup.yaml    |   60 -
 .../cloud-readiness/10-mail.windup.yaml       |   40 -
 .../cloud-readiness/11-session.windup.yaml    |   76 --
 .../12-socket-communication.windup.yaml       |   57 -
 ... 155-embedded-cache-libraries.windup.yaml} |   50 +-
 .../cloud-readiness/156-java-rmi.windup.yaml  |   46 +
 ...c.windup.yaml => 157-java-rpc.windup.yaml} |   12 +-
 .../cloud-readiness/158-jca.windup.yaml       |   24 +
 .../159-jni-native-code.windup.yaml           |   54 +
 .../160-local-storage.windup.yaml             |  186 +++
 .../cloud-readiness/161-logging.windup.yaml   |   56 +
 .../cloud-readiness/162-mail.windup.yaml      |   38 +
 .../cloud-readiness/163-session.windup.yaml   |   72 +
 .../164-socket-communication.windup.yaml      |   53 +
 .../generated/cloud-readiness/ruleset.yaml    |    4 +-
 .../droolsjbpm/25-kie-api.windup.yaml         |   68 +-
 default/generated/eap6/26-commonj.windup.yaml |   26 +-
 .../eap6/27-xml-glassfish.windup.yaml         |    4 +-
 .../eap6/28-java-ee-jaxrpc.windup.yaml        |    2 +-
 .../generated/eap6/29-seam-java.windup.yaml   |  240 ++--
 default/generated/eap6/30-seam-ui.windup.yaml |  244 ++--
 .../eap6/31-xml-webservices.windup.yaml       |   17 +-
 .../eap6/32-eap4-xml-config.windup.yaml       |  303 ++---
 .../eap6/33-jboss-eap5-java.windup.yaml       |  146 +-
 .../eap6/34-jboss-eap5-xml.windup.yaml        |   53 +-
 .../generated/eap6/35-resteasy.windup.yaml    |    4 +-
 default/generated/eap6/37-jotm.rhamt.yaml     |   17 +-
 .../eap6/38-jrun-catchall.windup.yaml         |    2 +
 .../generated/eap6/39-xml-jrun.windup.yaml    |    4 +-
 default/generated/eap6/40-jsp.windup.yaml     |    8 +-
 default/generated/eap6/41-log4j.windup.yaml   |   13 +-
 .../generated/eap6/42-xml-orion.windup.yaml   |    6 +-
 .../generated/eap6/43-xml-resin.windup.yaml   |    2 +-
 .../eap6/44-environment-dependent.windup.yaml |   72 +-
 .../eap6/45-generic-catchall.windup.yaml      |   87 +-
 .../eap6/48-weblogic-catchall.windup.yaml     |   46 +-
 .../eap6/49-weblogic-ejb.windup.yaml          |   29 +-
 .../eap6/51-weblogic-jms.windup.yaml          |   73 +-
 .../eap6/52-weblogic-services.windup.yaml     |   26 +-
 .../eap6/53-weblogic-webapp.windup.yaml       |   83 +-
 .../eap6/54-weblogic-webservices.windup.yaml  |   84 +-
 .../55-weblogic-xml-descriptors.windup.yaml   |   72 +-
 .../generated/eap6/56-weblogic.windup.yaml    |  151 +--
 .../eap6/57-websphere-catchall.windup.yaml    |   25 +-
 .../eap6/59-websphere-jms.windup.yaml         |   55 +-
 .../eap6/60-websphere-mq.windup.yaml          |   26 +-
 .../eap6/61-websphere-mqe.windup.yaml         |   40 +-
 .../eap6/62-websphere-other.windup.yaml       |   23 +-
 .../eap6/63-websphere-xml.windup.yaml         |   33 +-
 default/generated/eap6/ruleset.yaml           |    5 +-
 .../eap7/100-websphere-jms.windup.yaml        |   56 +-
 .../eap7/101-websphere-mq.windup.yaml         |   28 +-
 .../eap7/102-websphere-mqe.windup.yaml        |   40 +-
 .../eap7/103-websphere-other.windup.yaml      |   23 +-
 .../eap7/104-websphere-xml.windup.yaml        |   33 +-
 .../64-jboss-eap4and5to6and7-java.windup.yaml |   35 +-
 .../65-jboss-eap4and5to6and7-xml.windup.yaml  |   89 +-
 default/generated/eap7/66-base64.windup.yaml  |   12 +-
 default/generated/eap7/67-jaxrpc.windup.yaml  |    4 +-
 .../eap7/68-jboss-eap5-7-java.windup.yaml     |  154 +--
 .../eap7/69-jboss-eap5-7-xml.windup.yaml      |   33 +-
 .../70-jboss-eap5and6to7-java.windup.yaml     |   39 +-
 .../eap7/71-jboss-eap5and6to7-xml.windup.yaml |  175 +--
 .../generated/eap7/72-resteasy.windup.yaml    |    4 +-
 .../generated/eap7/73-eap6-xml.windup.yaml    |    4 +-
 default/generated/eap7/74-eap6.windup.yaml    |   80 +-
 .../eap7/75-hibernate4-xml.windup.yaml        |   35 +-
 .../generated/eap7/76-hibernate4.windup.yaml  |  226 ++--
 default/generated/eap7/77-hsearch.windup.yaml |  439 +++---
 default/generated/eap7/78-jax-ws.windup.yaml  |   13 +-
 .../generated/eap7/79-resteasy.windup.yaml    |  321 ++---
 .../generated/eap7/80-ws-security.windup.yaml |   30 +-
 .../eap7/81-hibernate50-51.windup.yaml        |   24 +-
 .../eap7/82-hibernate51-53.windup.yaml        |  179 ++-
 .../eap7/83-picketlink25.windup.yaml          |   12 +-
 .../eap7/84-resteasy30-36.windup.yaml         |    4 +-
 .../85-deprecated-singletonpolicy.rhamt.yaml  |    4 +-
 .../86-maven-artemis-jms-client.rhamt.yaml    |    4 +-
 .../eap7/87-maven-javax-to-jakarta.rhamt.yaml |   63 +-
 ...88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml |    4 +-
 ...to-microprofile-rest-client-1.3.rhamt.yaml |    4 +-
 .../eap7/90-singleton-sessionbean.rhamt.yaml  |   18 +-
 .../91-microprofile_removed_from_eap.mta.yaml |   20 +-
 ...2-embedded-framework-libraries.windup.yaml |   10 +-
 .../eap7/94-weblogic-jms.windup.yaml          |   73 +-
 .../eap7/95-weblogic-services.windup.yaml     |   26 +-
 .../eap7/96-weblogic-webapp.windup.yaml       |   82 +-
 .../eap7/97-weblogic-webservices.windup.yaml  |   84 +-
 .../98-weblogic-xml-descriptors.windup.yaml   |   72 +-
 .../generated/eap7/99-weblogic.windup.yaml    |  151 +--
 default/generated/eap7/ruleset.yaml           |    7 +-
 .../generated/eap8/105-eap8-faces.windup.yaml |   76 +-
 .../eap8/106-eap8-resteasy.windup.yaml        |   49 +-
 .../eap8/107-eap8-xml-binding.windup.yaml     |   86 +-
 .../generated/eap8/108-eap8.ejb.windup.yaml   |   24 +-
 .../eap8/109-empty-beans-xml.windup.yaml      |    9 +-
 .../eap8/110-hibernate-6.2.windup.yaml        |   54 +-
 .../eap8/111-hibernate-search-6.1.windup.yaml |   89 +-
 .../eap8/112-hibernate-search.windup.yaml     |  748 ++++-------
 .../generated/eap8/113-hibernate6.windup.yaml |  181 +--
 .../eap8/114-jakarta-cdi.windup.yaml          |   19 +-
 .../generated/eap8/115-jakarta-el.windup.yaml |   10 +-
 .../eap8/116-jakarta-faces.windup.yaml        |    4 +-
 .../eap8/117-jakarta-json-binding.windup.yaml |   11 +-
 .../eap8/118-jakarta-soap.windup.yaml         |    8 +-
 .../eap8/119-jakarta-ws-rs.windup.yaml        |    4 +-
 ...0-javaee-to-jakarta-namespaces.windup.yaml |  239 +---
 ...to-jakarta-bootstrapping-files.windup.yaml |    5 +-
 ...-javax-to-jakarta-dependencies.windup.yaml |   34 +-
 .../123-javax-to-jakarta-package.windup.yaml  |    5 +-
 ...24-javax-to-jakarta-properties.windup.yaml |    5 +-
 .../125-javax-to-jakarta-servlet.windup.yaml  |  212 ++-
 .../eap8/126-jboss-dependencies.windup.yaml   |  272 ++--
 .../eap8/127-keycloak-openid.windup.yaml      |    8 +-
 .../eap8/128-legacy-vault.windup.yaml         |    8 +-
 .../eap8/129-login-modules.windup.yaml        |    4 +-
 .../generated/eap8/130-picketlink.windup.yaml |   18 +-
 default/generated/eap8/ruleset.yaml           |    4 +-
 ...aven_plugin_configuration_changes.mta.yaml |    5 +-
 ...horntail_yaml_configuration_files.mta.yaml |    4 +-
 .../eapxp/133-replace_thorntail_boms.mta.yaml |    8 +-
 .../134-replace_thorntail_fractions.mta.yaml  |  200 +--
 ...35-replace_thorntail_maven_plugin.mta.yaml |    4 +-
 .../141-soa-p-5.windup.yaml                   |  568 ++++----
 .../fuse/138-sonic-catchall.windup.yaml       |    9 +-
 .../generated/fuse/139-sonic-esb.windup.yaml  |  158 +--
 .../fuse/140-xml-sonic-esb.windup.yaml        |    1 +
 .../142-hibernate-catchall.windup.yaml        |    2 +-
 .../hibernate/143-hibernate-xml.windup.yaml   |   27 +-
 .../hibernate/144-hibernate.windup.yaml       |   84 +-
 .../openjdk11/145-java-removals.windup.yaml   |  224 ++--
 .../146-removed-javaee-modules.windup.yaml    |   33 +-
 default/generated/openjdk11/ruleset.yaml      |    4 +-
 .../147-applet-api-deprecation.windup.yaml    |   12 +-
 .../openjdk17/148-lombok.windup.yaml          |   12 +-
 .../openjdk17/149-removed-classes.windup.yaml |   14 +-
 .../150-removed-packages.windup.yaml          |   25 +-
 ...1-security-manager-deprecation.windup.yaml |   78 +-
 default/generated/openjdk17/ruleset.yaml      |    4 +-
 .../openjdk7/152-oracle2openjdk.rhamt.yaml    |   90 +-
 ...-java-unavailable-technologies.windup.yaml |  291 ++--
 ...phere-unavailable-technologies.windup.yaml | 1175 ++++++++---------
 default/generated/openliberty/ruleset.yaml    |    4 +-
 .../generated/os/165-os-specific.windup.yaml  |    8 +-
 ...springboot-actuator-to-quarkus.windup.yaml |   15 +-
 ...ingboot-annotations-to-quarkus.windup.yaml |   18 +-
 ...68-springboot-cache-to-quarkus.windup.yaml |    8 +-
 ...cloud-config-client-to-quarkus.windup.yaml |   11 +-
 ...springboot-data-jpa-to-quarkus.windup.yaml |   12 +-
 ...springboot-devtools-to-quarkus.windup.yaml |    8 +-
 .../172-springboot-di-to-quarkus.windup.yaml  |   19 +-
 ...73-springboot-generic-catchall.windup.yaml |   21 +-
 ...ingboot-integration-to-quarkus.windup.yaml |   16 +-
 .../175-springboot-jmx-to-quarkus.windup.yaml |   20 +-
 ...-springboot-metrics-to-quarkus.windup.yaml |   24 +-
 ...ringboot-parent-pom-to-quarkus.windup.yaml |   10 +-
 ...-springboot-plugins-to-quarkus.windup.yaml |    8 +-
 ...ringboot-properties-to-quarkus.windup.yaml |   66 +-
 ...pringboot-scheduled-to-quarkus.windup.yaml |   12 +-
 ...springboot-security-to-quarkus.windup.yaml |   13 +-
 ...82-springboot-shell-to-quarkus.windup.yaml |   12 +-
 .../183-springboot-web-to-quarkus.windup.yaml |   25 +-
 ...4-springboot-webmvc-to-quarkus.windup.yaml |   16 +-
 default/generated/quarkus/ruleset.yaml        |    3 +-
 ...springboot-associated-artifacts.rhamt.yaml |   92 +-
 .../generated/rhr/186-springboot.rhamt.yaml   |    8 +-
 .../02-web-technology-usage.windup.yaml       |   14 +
 ...st-frameworks-technology-usage.windup.yaml |   37 +
 .../07-security-technology-usage.windup.yaml  |   26 +
 ...observability-technology-usage.windup.yaml |    2 +
 ...-non-xml-rules-technology-usage.rhamt.yaml |   17 +
 .../12-mvc-technology-usage.windup.yaml       |   51 +
 .../14-markup-technology-usage.windup.yaml    |    1 +
 .../16-logging-technology-usage.windup.yaml   |   29 +
 .../18-jta-technology-usage.windup.yaml       |   21 +
 .../188-3rd-party.windup.yaml                 |   38 +-
 .../190-clustering.windup.yaml                |    2 +
 .../192-configuration-management.windup.yaml  |   10 +-
 .../technology-usage/194-connect.windup.yaml  |   30 +-
 .../technology-usage/196-database.windup.yaml |   36 +-
 .../technology-usage/199-ejb.windup.yaml      |    2 +-
 .../20-javase-technology-usage.windup.yaml    |    1 +
 .../201-embedded-framework.windup.yaml        |  124 +-
 .../204-integration.windup.yaml               |   34 +-
 .../technology-usage/207-javase.windup.yaml   |    4 +-
 .../technology-usage/209-jta.windup.yaml      |   40 +-
 .../21-javaee-technology-usage.windup.yaml    |   67 +-
 .../211-logging-usage.windup.yaml             |   54 +-
 .../technology-usage/215-mvc.windup.yaml      |  106 +-
 .../218-observability.windup.yaml             |    4 +-
 .../technology-usage/220-security.windup.yaml |   52 +-
 .../221-spring-catchall.windup.yaml           |    2 +-
 .../223-test-frameworks-usage.windup.yaml     |   74 +-
 ...3-integration-technology-usage.windup.yaml |   15 +
 ...ded-framework-technology-usage.windup.yaml |   77 ++
 .../28-ejb-technology-usage.windup.yaml       |    1 +
 .../31-database-technology-usage.windup.yaml  |   18 +
 .../33-connect-technology-usage.windup.yaml   |   22 +-
 ...on-management-technology-usage.windup.yaml |    3 +
 ...37-clustering-technology-usage.windup.yaml |    2 +
 .../39-3rd-party-technology-usage.windup.yaml |   19 +
 .../generated/technology-usage/ruleset.yaml   |    4 +-
 233 files changed, 5875 insertions(+), 7840 deletions(-)
 delete mode 100644 default/generated/cloud-readiness/02-java-corba.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/03-java-rmi.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/05-jca.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/06-jni-native-code.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/07-local-storage.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/08-localhost.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/09-logging.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/10-mail.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/11-session.windup.yaml
 delete mode 100644 default/generated/cloud-readiness/12-socket-communication.windup.yaml
 rename default/generated/cloud-readiness/{01-embedded-cache-libraries.windup.yaml => 155-embedded-cache-libraries.windup.yaml} (86%)
 create mode 100644 default/generated/cloud-readiness/156-java-rmi.windup.yaml
 rename default/generated/cloud-readiness/{04-java-rpc.windup.yaml => 157-java-rpc.windup.yaml} (51%)
 create mode 100644 default/generated/cloud-readiness/158-jca.windup.yaml
 create mode 100644 default/generated/cloud-readiness/159-jni-native-code.windup.yaml
 create mode 100644 default/generated/cloud-readiness/160-local-storage.windup.yaml
 create mode 100644 default/generated/cloud-readiness/161-logging.windup.yaml
 create mode 100644 default/generated/cloud-readiness/162-mail.windup.yaml
 create mode 100644 default/generated/cloud-readiness/163-session.windup.yaml
 create mode 100644 default/generated/cloud-readiness/164-socket-communication.windup.yaml

diff --git a/default/generated/azure/01-azure-file-system.windup.yaml b/default/generated/azure/01-azure-file-system.windup.yaml
index 2b809a17..e7d5ba1b 100644
--- a/default/generated/azure/01-azure-file-system.windup.yaml
+++ b/default/generated/azure/01-azure-file-system.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    The application uses Java APIs to read/write from the file system
-    The application uses Java APIs to read/write from the file system.. Any usage of the file system on the application will require reconfiguration or, in rare cases, architectural changes.
+  description: The application uses Java APIs to read/write from the file system
   effort: 5
   labels:
   - konveyor.io/source=eap7
@@ -18,9 +16,9 @@
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#determine-whether-and-how-the-file-system-is-used
   - title: Azure Spring Boot Starter for Azure Storage
     url: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-storage
-  message: The application uses Java APIs to read/write from the file system.. Any
-    usage of the file system on the application will require reconfiguration or, in
-    rare cases, architectural changes.
+  message: "\n \n The application uses Java APIs to read/write from the file system.\n
+    \n Any usage of the file system on the application will require reconfiguration
+    or, in rare cases, architectural changes.\n \n "
   ruleID: azure-file-system-01000
   when:
     or:
@@ -34,9 +32,7 @@
         pattern: org.apache.commons.io*
 - category: optional
   customVariables: []
-  description: |-
-    Relative path found
-    Relative path found.. Any usage of the file system on the application will require reconfiguration or, in rare cases, architectural changes.
+  description: Relative path found
   effort: 5
   labels:
   - konveyor.io/source=eap7
@@ -50,8 +46,8 @@
   links:
   - title: Relative path found in the application
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#determine-whether-and-how-the-file-system-is-used
-  message: Relative path found.. Any usage of the file system on the application will
-    require reconfiguration or, in rare cases, architectural changes.
+  message: "\n \n Relative path found.\n \n Any usage of the file system on the application
+    will require reconfiguration or, in rare cases, architectural changes.\n \n "
   ruleID: azure-file-system-02000
   when:
     builtin.filecontent:
@@ -59,9 +55,7 @@
       pattern: \.\/.
 - category: optional
   customVariables: []
-  description: |-
-    Home path found
-    Home path found.. Any usage of the file system on the application will require reconfiguration or, in rare cases, architectural changes.
+  description: Home path found
   effort: 5
   labels:
   - konveyor.io/source=eap7
@@ -75,8 +69,8 @@
   links:
   - title: Home path found in the application
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#determine-whether-and-how-the-file-system-is-used
-  message: Home path found.. Any usage of the file system on the application will
-    require reconfiguration or, in rare cases, architectural changes.
+  message: "\n \n Home path found.\n \n Any usage of the file system on the application
+    will require reconfiguration or, in rare cases, architectural changes.\n \n "
   ruleID: azure-file-system-03000
   when:
     builtin.filecontent:
diff --git a/default/generated/azure/02-azure-password.windup.yaml b/default/generated/azure/02-azure-password.windup.yaml
index 28d35692..dc2cf4d4 100644
--- a/default/generated/azure/02-azure-password.windup.yaml
+++ b/default/generated/azure/02-azure-password.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Password found in configuration file
-    Password found in configuration file.. Consider using Azure Key Vault and/or parameter injection with application settings where possible.
+  description: Password found in configuration file
   effort: 3
   labels:
   - konveyor.io/source=springboot
@@ -25,8 +23,8 @@
     url: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-key-vault
   - title: Azure Spring Boot Starter for Azure Key Vault Secrets
     url: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-keyvault-secrets
-  message: Password found in configuration file.. Consider using Azure Key Vault and/or
-    parameter injection with application settings where possible.
+  message: "\n \n Password found in configuration file.\n\n Consider using Azure Key
+    Vault and/or parameter injection with application settings where possible.\n \n "
   ruleID: azure-password-01000
   when:
     or:
diff --git a/default/generated/azure/03-eap-to-azure-appservice-certificates.windup.yaml b/default/generated/azure/03-eap-to-azure-appservice-certificates.windup.yaml
index 1fad599d..9c5c52d1 100644
--- a/default/generated/azure/03-eap-to-azure-appservice-certificates.windup.yaml
+++ b/default/generated/azure/03-eap-to-azure-appservice-certificates.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Azure - The application loads certificates into a KeyStore
-    Azure - The application loads certificates into a KeyStore
+  description: Azure - The application loads certificates into a KeyStore
   effort: 5
   labels:
   - konveyor.io/source=eap7
diff --git a/default/generated/azure/04-eap-to-azure-appservice-datasource-driver.windup.yaml b/default/generated/azure/04-eap-to-azure-appservice-datasource-driver.windup.yaml
index 5592a316..a0da129c 100644
--- a/default/generated/azure/04-eap-to-azure-appservice-datasource-driver.windup.yaml
+++ b/default/generated/azure/04-eap-to-azure-appservice-datasource-driver.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Datasource driver found in configuration file
-    A datasource driver was found in a configuration file.. There are three core steps when registering a data source with JBoss EAP in Azure App Service: uploading the JDBC driver, adding the JDBC driver as a module, and registering the module.. App Service is a stateless hosting service, so the configuration commands for adding and registering the data source module must be scripted and applied as the container starts.. For more information, see Datasource Management in the JBoss EAP documentation.
+  description: Datasource driver found in configuration file
   effort: 3
   labels:
   - konveyor.io/source=eap7
@@ -19,13 +17,13 @@
     url: https://docs.microsoft.com/en-us/azure/developer/java/migration/migrate-jboss-eap-to-jboss-eap-on-azure-app-service#set-up-data-sources
   - title: Datasource Management
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/configuration_guide/datasource_management
-  message: 'A datasource driver was found in a configuration file.. There are three
-    core steps when registering a data source with JBoss EAP in Azure App Service:
-    uploading the JDBC driver, adding the JDBC driver as a module, and registering
-    the module.. App Service is a stateless hosting service, so the configuration
+  message: "\n \n A datasource driver was found in a configuration file.\n\n There
+    are three core steps when registering a data source with JBoss EAP in Azure App
+    Service: uploading the JDBC driver, adding the JDBC driver as a module, and registering
+    the module.\n\n App Service is a stateless hosting service, so the configuration
     commands for adding and registering the data source module must be scripted and
-    applied as the container starts.. For more information, see Datasource Management
-    in the JBoss EAP documentation.'
+    applied as the container starts.\n \n For more information, see Datasource Management
+    in the JBoss EAP documentation. \n \n "
   ruleID: eap-to-azure-appservice-datasource-driver-01000
   when:
     or:
diff --git a/default/generated/azure/05-eap-to-azure-appservice-environment-variables.windup.yaml b/default/generated/azure/05-eap-to-azure-appservice-environment-variables.windup.yaml
index c3fdf56e..15d4ecbc 100644
--- a/default/generated/azure/05-eap-to-azure-appservice-environment-variables.windup.yaml
+++ b/default/generated/azure/05-eap-to-azure-appservice-environment-variables.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    App Service - The application reads environment variables
-    App Service - The application reads environment variables.. Any environment variables used in the code will need to be defined as App Settings, which are exposed. as environment variables in App Service.. Any System properties that the code depends on will need to be provided either in a custom Startup Script. or by defining an App Setting with the name JAVA_OPTS and include any system properties in it.
+  description: App Service - The application reads environment variables
   effort: 1
   labels:
   - konveyor.io/source=eap7
@@ -15,12 +13,12 @@
     url: https://aka.ms/webapps-java-perf
   - title: Environment variables and app settings in Azure App Service
     url: https://aka.ms/webapps-env-vars
-  message: App Service - The application reads environment variables.. Any environment
-    variables used in the code will need to be defined as App Settings, which are
-    exposed. as environment variables in App Service.. Any System properties that
-    the code depends on will need to be provided either in a custom Startup Script.
+  message: "\n \n App Service - The application reads environment variables.\n\n Any
+    environment variables used in the code will need to be defined as App Settings,
+    which are exposed\n as environment variables in App Service.\n\n Any System properties
+    that the code depends on will need to be provided either in a custom Startup Script\n
     or by defining an App Setting with the name JAVA_OPTS and include any system properties
-    in it.
+    in it.\n \n "
   ruleID: eap-to-azure-appservice-environment-variables-001
   when:
     or:
diff --git a/default/generated/azure/06-eap-to-azure-appservice-pom.windup.yaml b/default/generated/azure/06-eap-to-azure-appservice-pom.windup.yaml
index e4cd1223..ba2b8b36 100644
--- a/default/generated/azure/06-eap-to-azure-appservice-pom.windup.yaml
+++ b/default/generated/azure/06-eap-to-azure-appservice-pom.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Get started with JBoss EAP on App Service
-    Get started with JBoss EAP on App Service with the CLI commands below. Don't have the Azure CLI installed? Go to [https://aka.ms/azure-cli](https://aka.ms/azure-cli). <pre>. # Customize these variables. $resourceGroup=jboss-rg. $location=eastus. $appName=jboss-app. $appServicePlan=jboss-asp. az group create --resource-group $resourceGroup --location $location. az appservice plan create --resource-group $resourceGroup --name $appServicePlan --is-linux --sku P1V3. az webapp create --resource-group $resourceGroup --name $appName --plan $appServicePlan --runtime "JBOSSEAP|7.3-java8". # Build your app with:. mvn package. # Run one of the following commands depending on the artifact type. # To deploy WAR files:. az webapp deploy --resource-group $resourceGroup --plan $appServicePlan --name $appName --type war --src-path app.war. # To deploy EAR files:. az webapp deploy --resource-group $resourceGroup --plan $appServicePlan --name $appName --type ear --src-path app.ear. </pre>
+  description: Get started with JBoss EAP on App Service
   effort: 1
   labels:
   - konveyor.io/source=eap7
@@ -16,19 +14,19 @@
     url: https://aka.ms/webapps-deployment-apis
   - title: Migrate JBoss EAP applications to JBoss EAP on Azure App Service
     url: https://aka.ms/webapps-jboss-migrate-guide
-  message: 'Get started with JBoss EAP on App Service with the CLI commands below.
-    Don''t have the Azure CLI installed? Go to [https://aka.ms/azure-cli](https://aka.ms/azure-cli).
-    <pre>. # Customize these variables. $resourceGroup=jboss-rg. $location=eastus.
-    $appName=jboss-app. $appServicePlan=jboss-asp. az group create --resource-group
-    $resourceGroup --location $location. az appservice plan create --resource-group
-    $resourceGroup --name $appServicePlan --is-linux --sku P1V3. az webapp create
+  message: "\n \n Get started with JBoss EAP on App Service with the CLI commands
+    below. Don't have the Azure CLI installed? Go to [https://aka.ms/azure-cli](https://aka.ms/azure-cli)\n
+    \n <pre>\n # Customize these variables\n $resourceGroup=jboss-rg\n $location=eastus\n
+    $appName=jboss-app\n $appServicePlan=jboss-asp\n\n az group create --resource-group
+    $resourceGroup --location $location\n\n az appservice plan create --resource-group
+    $resourceGroup --name $appServicePlan --is-linux --sku P1V3\n\n az webapp create
     --resource-group $resourceGroup --name $appName --plan $appServicePlan --runtime
-    "JBOSSEAP|7.3-java8". # Build your app with:. mvn package. # Run one of the following
-    commands depending on the artifact type. # To deploy WAR files:. az webapp deploy
-    --resource-group $resourceGroup --plan $appServicePlan --name $appName --type
-    war --src-path app.war. # To deploy EAR files:. az webapp deploy --resource-group
-    $resourceGroup --plan $appServicePlan --name $appName --type ear --src-path app.ear.
-    </pre>'
+    \"JBOSSEAP|7.3-java8\"\n\n # Build your app with:\n mvn package\n\n # Run one
+    of the following commands depending on the artifact type\n\n # To deploy WAR files:\n
+    az webapp deploy --resource-group $resourceGroup --plan $appServicePlan --name
+    $appName --type war --src-path app.war\n\n # To deploy EAR files:\n az webapp
+    deploy --resource-group $resourceGroup --plan $appServicePlan --name $appName
+    --type ear --src-path app.ear\n </pre>\n \n "
   ruleID: eap-to-azure-appservice-pom-001
   when:
     java.dependency:
diff --git a/default/generated/azure/07-spring-boot-to-azure-cache.windup.yaml b/default/generated/azure/07-spring-boot-to-azure-cache.windup.yaml
index 511169fa..e926b98d 100644
--- a/default/generated/azure/07-spring-boot-to-azure-cache.windup.yaml
+++ b/default/generated/azure/07-spring-boot-to-azure-cache.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Redis Cache found in the application
-    The application uses a Redis Cache.. Checkout Azure Cache for Redis for a fully managed cache on Azure.
+  description: Redis Cache found in the application
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -21,8 +19,8 @@
     url: https://spring.io/projects/spring-data-redis/
   - title: Azure Spring Cloud Starter Cache
     url: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-starter-cache
-  message: The application uses a Redis Cache.. Checkout Azure Cache for Redis for
-    a fully managed cache on Azure.
+  message: "\n \n The application uses a Redis Cache.\n\n Checkout Azure Cache for
+    Redis for a fully managed cache on Azure.\n \n "
   ruleID: spring-boot-to-azure-cache-redis-01000
   when:
     or:
@@ -38,34 +36,3 @@
     - java.dependency:
         lowerbound: 0.0.0
         name: org.springframework.integration.spring-integration-redis
-- category: potential
-  customVariables: []
-  description: |-
-    Redis Cache connection string found
-    Redis Cache connection string, username, or password used in this application.. Checkout Azure Cache for Redis for a fully managed cache on Azure.
-  effort: 0
-  labels:
-  - konveyor.io/source=springboot
-  - konveyor.io/target=azure-spring-apps
-  - konveyor.io/target=azure-appservice
-  - konveyor.io/target=azure-aks
-  - konveyor.io/target=azure-container-apps
-  - cache
-  - redis
-  links:
-  - title: Redis Cache found in the application
-    url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-boot-to-azure-spring-apps#identify-external-caches
-  - title: Azure Cache for Redis
-    url: https://azure.microsoft.com/services/cache
-  - title: Spring Data Redis
-    url: https://spring.io/projects/spring-data-redis/
-  - title: Azure Spring Cloud Starter Cache
-    url: https://search.maven.org/artifact/com.azure.spring/azure-spring-cloud-starter-cache
-  message: Redis Cache connection string, username, or password used in this application..
-    Checkout Azure Cache for Redis for a fully managed cache on Azure.
-  ruleID: spring-boot-to-azure-cache-redis-02000
-  when:
-    or:
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: (redis|jedis|lettuce)\.(.*\.)?(url|host|nodes|username|password)
diff --git a/default/generated/azure/08-spring-boot-to-azure-database.windup.yaml b/default/generated/azure/08-spring-boot-to-azure-database.windup.yaml
index 34f39418..b75e38df 100644
--- a/default/generated/azure/08-spring-boot-to-azure-database.windup.yaml
+++ b/default/generated/azure/08-spring-boot-to-azure-database.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    JDBC connection found in configuration file
-    The application uses a JDBC connection string, username or password in the configuration file.. Checkout the different types of databases that are fully managed on Azure.
+  description: JDBC connection found in configuration file
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -23,47 +21,16 @@
     url: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-jdbc-with-azure-postgresql
   - title: Use Spring Data JDBC with Azure SQL Database
     url: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-jdbc-with-azure-sql-server
-  message: The application uses a JDBC connection string, username or password in
-    the configuration file.. Checkout the different types of databases that are fully
-    managed on Azure.
+  message: "\n \n The application uses a JDBC connection string.\n\n Checkout the
+    different types of databases that are fully managed on Azure.\n \n "
   ruleID: spring-boot-to-azure-database-jdbc-01000
   when:
-    or:
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: 'jdbc:'
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.url
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.u-r-l
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.jdbc-url
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.username
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.user
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: datasource.password
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: jdbc.url
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: jdbc.username
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: jdbc.password
+    builtin.filecontent:
+      filePattern: application.*\.(properties|yaml|yml)
+      pattern: 'jdbc:'
 - category: potential
   customVariables: []
-  description: |-
-    MongoDB connection found in configuration file
-    The application uses a MongoDB connection string.. Checkout the different types of databases that are fully managed on Azure.
+  description: MongoDB connection found in configuration file
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -82,63 +49,10 @@
     url: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-mongodb-with-cosmos-db
   - title: Spring Cloud Azure Starter Data Cosmos DB
     url: https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-starter-data-cosmos
-  message: The application uses a MongoDB connection string.. Checkout the different
-    types of databases that are fully managed on Azure.
+  message: "\n \n The application uses a MongoDB connection string.\n\n Checkout the
+    different types of databases that are fully managed on Azure.\n \n "
   ruleID: spring-boot-to-azure-database-mongodb-02000
   when:
-    or:
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: 'mongodb:'
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: mongodb.uri
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: mongodb.username
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: mongodb.password
-- category: potential
-  customVariables: []
-  description: |-
-    R2DBC connection found in configuration file
-    The application uses a R2DBC connection string, username or password in the configuration file.. Checkout the different types of databases that are fully managed on Azure.
-  effort: 0
-  labels:
-  - konveyor.io/source=springboot
-  - konveyor.io/target=azure-spring-apps
-  - konveyor.io/target=azure-appservice
-  - konveyor.io/target=azure-aks
-  - konveyor.io/target=azure-container-apps
-  - database
-  - r2dbc
-  links:
-  - title: R2DBC connection string found in configuration file
-    url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-boot-to-azure-spring-apps#databases
-  - title: Types of Databases on Azure
-    url: https://azure.microsoft.com/product-categories/databases/
-  - title: Use Spring Data R2DBC with Azure Database for MySQL
-    url: https://learn.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-r2dbc-with-azure-mysql
-  - title: Use Spring Data R2DBC with Azure Database for PostgreSQL
-    url: https://learn.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-r2dbc-with-azure-postgresql
-  - title: Use Spring Data R2DBC with Azure SQL Database
-    url: https://learn.microsoft.com/azure/developer/java/spring-framework/configure-spring-data-r2dbc-with-azure-sql-server
-  message: The application uses a R2DBC connection string, username or password in
-    the configuration file.. Checkout the different types of databases that are fully
-    managed on Azure.
-  ruleID: spring-boot-to-azure-database-r2dbc-03000
-  when:
-    or:
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: 'r2dbc:'
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: r2dbc.username
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: r2dbc.password
-    - builtin.filecontent:
-        filePattern: application.*\.(properties|yaml|yml)
-        pattern: r2dbc.url
+    builtin.filecontent:
+      filePattern: application.*\.(properties|yaml|yml)
+      pattern: 'mongodb:'
diff --git a/default/generated/azure/09-spring-boot-to-azure-eureka.windup.yaml b/default/generated/azure/09-spring-boot-to-azure-eureka.windup.yaml
index d6856cc4..7ed1d382 100644
--- a/default/generated/azure/09-spring-boot-to-azure-eureka.windup.yaml
+++ b/default/generated/azure/09-spring-boot-to-azure-eureka.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    eureka
-    The application uses Eureka.. Azure Spring Apps will host eureka server for you.. Eureka connection configurations will be injected automatically by ASA, if you put these configurations in your Config Server, please remove them.
+  description: eureka
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -12,18 +10,14 @@
   - konveyor.io/target=azure-container-apps
   - eureka
   links:
-  - title: Azure Spring Apps - Enable Service Registration
-    url: https://learn.microsoft.com/azure/spring-apps/how-to-service-registration?pivots=programming-language-java
-  - title: Azure Spring Apps - Access Config Server and Service Registry
-    url: https://learn.microsoft.com/azure/spring-apps/how-to-access-data-plane-azure-ad-rbac
-  - title: Restricted configurations
-    url: http://aka.ms/spring-cloud-to-asa?pivots=sc-standard-tier#remove-restricted-configurations
-  message: The application uses Eureka.. Azure Spring Apps will host eureka server
-    for you.. Eureka connection configurations will be injected automatically by ASA,
-    if you put these configurations in your Config Server, please remove them.
+  - title: Distributed Tracing
+    url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#remove-explicit-configuration-server-settings
+  message: "\n \n The application uses Eureka.\n\n If a setting like this appears
+    in your application configuration, remove it. Azure Spring Apps will automatically
+    inject the connection information of its configuration server\n\n ```\n eureka:\n
+    client:\n serviceUrl:\n defaultZone: http://myusername:mysecretpassword@localhost:8761/eureka/\n
+    ```\n \n "
   ruleID: spring-boot-to-azure-eureka-01000
-  tag:
-  - Eureka
   when:
     or:
     - java.dependency:
@@ -35,34 +29,3 @@
     - java.dependency:
         lowerbound: 0.0.0
         nameregex: com\.netflix\.eureka\..*
-- category: potential
-  customVariables: []
-  description: |-
-    Explicit eureka connection info found in configuration file
-    The application uses an eureka connection string.. Azure Spring Apps will host eureka server for you.. Eureka connection configurations will be injected automatically by ASA, if you put these configurations in your Config Server, please remove them.
-  effort: 0
-  labels:
-  - konveyor.io/source=springboot
-  - konveyor.io/target=azure-spring-apps
-  - konveyor.io/target=azure-aks
-  - konveyor.io/target=azure-appservice
-  - konveyor.io/target=azure-container-apps
-  - eureka
-  links:
-  - title: Azure Spring Apps - Enable Service Registration
-    url: https://learn.microsoft.com/azure/spring-apps/how-to-service-registration?pivots=programming-language-java
-  - title: Azure Spring Apps - Access Config Server and Service Registry
-    url: https://learn.microsoft.com/azure/spring-apps/how-to-access-data-plane-azure-ad-rbac
-  - title: Restricted configurations
-    url: http://aka.ms/spring-cloud-to-asa?pivots=sc-standard-tier#remove-restricted-configurations
-  message: The application uses an eureka connection string.. Azure Spring Apps will
-    host eureka server for you.. Eureka connection configurations will be injected
-    automatically by ASA, if you put these configurations in your Config Server, please
-    remove them.
-  ruleID: spring-boot-to-azure-eureka-02000
-  tag:
-  - Eureka
-  when:
-    builtin.filecontent:
-      filePattern: application.*\.(properties|yaml|yml)
-      pattern: eureka\.client\.(service-url|serviceUrl)
diff --git a/default/generated/azure/10-spring-boot-to-azure-feign.windup.yaml b/default/generated/azure/10-spring-boot-to-azure-feign.windup.yaml
index 8b2bd3c7..1715c9bb 100644
--- a/default/generated/azure/10-spring-boot-to-azure-feign.windup.yaml
+++ b/default/generated/azure/10-spring-boot-to-azure-feign.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Feign
-    The application uses Feign. Spring Cloud Service Registry uses OpenFeign instead. When migrating to Spring Cloud Service Registry, the Feign invocations will no longer be possible.. Update the clients to use Spring Cloud OpenFeign instead.
+  description: Feign
   effort: 3
   labels:
   - konveyor.io/source=springboot
@@ -16,10 +14,10 @@
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#identify-clients-that-bypass-the-service-registry
   - title: Spring Cloud OpenFeign
     url: https://spring.io/projects/spring-cloud-openfeign/
-  message: The application uses Feign. Spring Cloud Service Registry uses OpenFeign
+  message: "\n \n The application uses Feign. Spring Cloud Service Registry uses OpenFeign
     instead. When migrating to Spring Cloud Service Registry, the Feign invocations
-    will no longer be possible.. Update the clients to use Spring Cloud OpenFeign
-    instead.
+    will no longer be possible.\n \n Update the clients to use Spring Cloud OpenFeign
+    instead.\n \n "
   ruleID: spring-boot-to-azure-feign-01000
   when:
     or:
diff --git a/default/generated/azure/11-spring-boot-to-azure-identity-provider.windup.yaml b/default/generated/azure/11-spring-boot-to-azure-identity-provider.windup.yaml
index bd64ba97..b2ba6f42 100644
--- a/default/generated/azure/11-spring-boot-to-azure-identity-provider.windup.yaml
+++ b/default/generated/azure/11-spring-boot-to-azure-identity-provider.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Spring Security-related dependencies
-    The application uses Spring security.. Checkout Azure Active Directory as an identity provider.
+  description: Spring Security-related dependencies
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -20,8 +18,8 @@
     url: https://docs.spring.io/spring-security/reference/index.html
   - title: 'Spring Boot API: Authorization'
     url: https://auth0.com/docs/quickstart/backend/java-spring-security5/01-authorization
-  message: The application uses Spring security.. Checkout Azure Active Directory
-    as an identity provider.
+  message: "\n \n The application uses Spring security.\n\n Checkout Azure Active
+    Directory as an identity provider.\n \n "
   ruleID: spring-boot-to-azure-identity-provider-01000
   when:
     or:
diff --git a/default/generated/azure/12-spring-boot-to-azure-jms-broker.windup.yaml b/default/generated/azure/12-spring-boot-to-azure-jms-broker.windup.yaml
index 7792e702..a7fc91b5 100644
--- a/default/generated/azure/12-spring-boot-to-azure-jms-broker.windup.yaml
+++ b/default/generated/azure/12-spring-boot-to-azure-jms-broker.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Active MQ Broker
-    The application uses an ActiveMQ message broker.. Checkout Azure Service Bus for a fully managed message broker.
+  description: Active MQ Broker
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -21,8 +19,8 @@
     url: https://docs.microsoft.com/azure/developer/java/spring-framework/configure-spring-boot-starter-java-app-with-azure-service-bus
   - title: Azure Spring Boot Starter for Azure Service Bus JMS
     url: https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-servicebus-jms
-  message: The application uses an ActiveMQ message broker.. Checkout Azure Service
-    Bus for a fully managed message broker.
+  message: "\n \n The application uses an ActiveMQ message broker.\n \n Checkout Azure
+    Service Bus for a fully managed message broker.\n \n "
   ruleID: spring-boot-to-azure-jms-broker-01000
   when:
     or:
diff --git a/default/generated/azure/13-spring-boot-to-azure-schedule-job.windup.yaml b/default/generated/azure/13-spring-boot-to-azure-schedule-job.windup.yaml
index 9905b256..1d3f552b 100644
--- a/default/generated/azure/13-spring-boot-to-azure-schedule-job.windup.yaml
+++ b/default/generated/azure/13-spring-boot-to-azure-schedule-job.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The application uses Quartz to scheduled jobs
-    Scheduled jobs, such as Quartz Scheduler tasks or cron jobs, can't be used with App Service.. App Service won't prevent you from deploying an application containing scheduled tasks internally.. However, if your application is scaled out, the same scheduled job may run more than once per scheduled period.. This situation can lead to unintended consequences.. Inventory any scheduled jobs, inside or outside the application process.
+  description: The application uses Quartz to scheduled jobs
   effort: 7
   labels:
   - konveyor.io/source=springboot
@@ -15,12 +13,12 @@
   links:
   - title: The application uses Quartz to scheduled jobs
     url: https://docs.microsoft.com/azure/developer/java/migration/migrate-spring-boot-to-app-service#determine-whether-application-relies-on-scheduled-jobs
-  message: Scheduled jobs, such as Quartz Scheduler tasks or cron jobs, can't be used
-    with App Service.. App Service won't prevent you from deploying an application
-    containing scheduled tasks internally.. However, if your application is scaled
-    out, the same scheduled job may run more than once per scheduled period.. This
-    situation can lead to unintended consequences.. Inventory any scheduled jobs,
-    inside or outside the application process.
+  message: "\n \n Scheduled jobs, such as Quartz Scheduler tasks or cron jobs, can't
+    be used with App Service.\n App Service won't prevent you from deploying an application
+    containing scheduled tasks internally.\n However, if your application is scaled
+    out, the same scheduled job may run more than once per scheduled period.\n This
+    situation can lead to unintended consequences.\n\n Inventory any scheduled jobs,
+    inside or outside the application process.\n \n "
   ruleID: spring-boot-to-azure-schedule-job-01000
   when:
     or:
diff --git a/default/generated/azure/14-spring-boot-to-azure-static-content.windup.yaml b/default/generated/azure/14-spring-boot-to-azure-static-content.windup.yaml
index c029bc19..7478d854 100644
--- a/default/generated/azure/14-spring-boot-to-azure-static-content.windup.yaml
+++ b/default/generated/azure/14-spring-boot-to-azure-static-content.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Static content found in the application
-    Your application currently serves static content, you'll need an alternate location for it. You may wish to consider moving static content to Azure Blob Storage and adding Azure CDN for lightning-fast downloads globally.. For more information, see Static website hosting in Azure Storage and Quickstart: Integrate an Azure storage account with Azure CDN.
+  description: Static content found in the application
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -18,11 +16,11 @@
     url: https://docs.microsoft.com/azure/storage/blobs/storage-blob-static-website
   - title: 'Quickstart: Integrate an Azure Storage account with Azure CDN'
     url: https://docs.microsoft.com/azure/cdn/cdn-create-a-storage-account-with-cdn
-  message: 'Your application currently serves static content, you''ll need an alternate
-    location for it. You may wish to consider moving static content to Azure Blob
-    Storage and adding Azure CDN for lightning-fast downloads globally.. For more
-    information, see Static website hosting in Azure Storage and Quickstart: Integrate
-    an Azure storage account with Azure CDN.'
+  message: "\n \n Your application currently serves static content, you'll need an
+    alternate location for it. You may wish to consider moving static content to Azure
+    Blob Storage and adding Azure CDN for lightning-fast downloads globally.\n \n
+    For more information, see Static website hosting in Azure Storage and Quickstart:
+    Integrate an Azure storage account with Azure CDN.\n \n "
   ruleID: spring-boot-to-azure-static-content-01000
   when:
     builtin.file:
diff --git a/default/generated/azure/15-spring-boot-to-azure-zipkin.windup.yaml b/default/generated/azure/15-spring-boot-to-azure-zipkin.windup.yaml
index 81d2f1a6..56c81a2d 100644
--- a/default/generated/azure/15-spring-boot-to-azure-zipkin.windup.yaml
+++ b/default/generated/azure/15-spring-boot-to-azure-zipkin.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Zipkin
-    The application uses Zipkin.
+  description: Zipkin
   effort: 0
   labels:
   - konveyor.io/source=springboot
@@ -16,7 +14,7 @@
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-cloud-to-azure-spring-apps?pivots=sc-standard-tier#identify-zipkin-dependencies
   - title: Distributed Tracing
     url: https://learn.microsoft.com/azure/azure-monitor/app/distributed-tracing-telemetry-correlation
-  message: The application uses Zipkin.
+  message: "\n \n The application uses Zipkin.\n \n "
   ruleID: spring-boot-to-azure-zipkin-01000
   when:
     or:
diff --git a/default/generated/azure/ruleset.yaml b/default/generated/azure/ruleset.yaml
index ea9cfda5..527fc3f7 100644
--- a/default/generated/azure/ruleset.yaml
+++ b/default/generated/azure/ruleset.yaml
@@ -1,2 +1,2 @@
 name: azure/springboot
-description: Identify Zipkin dependencies.
+description: Identify eureka dependencies.
diff --git a/default/generated/camel3/16-component-changes.windup.yaml b/default/generated/camel3/16-component-changes.windup.yaml
index e8f897b2..a664964f 100644
--- a/default/generated/camel3/16-component-changes.windup.yaml
+++ b/default/generated/camel3/16-component-changes.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The `org.apache.camel:camel-kafka` component has removed the options `bridgeEndpoint` and `circularEndpointDetection`
-    The `org.apache.camel:camel-kafka` component has removed the options `bridgeEndpoint` and `circularEndpointDetection` as they are no longer needed because the component is acting as bridging would work on Camel 2.x. In other words camel-kafka will send messages to the topic from the endpoint uri. To override this use the KafkaConstants.OVERRIDE_TOPIC header with the new topic. See more details in the camel-kafka component documentation.
+  description: The `org.apache.camel:camel-kafka` component has removed the options
+    `bridgeEndpoint` and `circularEndpointDetection`
   effort: 3
   labels:
   - konveyor.io/source=camel2
@@ -22,7 +21,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: .to\("kafka:{[^"]+}(circularTopicDetection|bridgeEndpoint)=.*
+        pattern: .to("kafka:{[^"]+}(circularTopicDetection|bridgeEndpoint)=.*
     - java.referenced:
         location: METHOD_CALL
         pattern: org.apache.camel.component.kafka.KafkaConfiguration.(setBridgeEndpoint|setCircularTopicDetection)*
diff --git a/default/generated/camel3/17-java-dsl-changes.windup.yaml b/default/generated/camel3/17-java-dsl-changes.windup.yaml
index f0c66600..40835c99 100644
--- a/default/generated/camel3/17-java-dsl-changes.windup.yaml
+++ b/default/generated/camel3/17-java-dsl-changes.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    `hystrix()` has been renamed.
-    Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker()`. instead of `hystrix()`
+  description: '`hystrix()` has been renamed.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -12,8 +10,8 @@
   links:
   - title: Camel 3 - Migration Guide - Hystrix EIP
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_hystrix_eip
-  message: Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker()`.
-    instead of `hystrix()`
+  message: "Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker()`\n
+    instead of `hystrix()`\n "
   ruleID: java-dsl-changes-00001
   when:
     java.referenced:
diff --git a/default/generated/camel3/18-java-generic-information.windup.yaml b/default/generated/camel3/18-java-generic-information.windup.yaml
index e6d5e504..cd6748bb 100644
--- a/default/generated/camel3/18-java-generic-information.windup.yaml
+++ b/default/generated/camel3/18-java-generic-information.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.processor.aggregate.AggregationStrategy` has been moved
-    The class `org.apache.camel.processor.aggregate.AggregationStrategy` has been moved to `org.apache.camel.AggregationStrategy`.
+  description: '`org.apache.camel.processor.aggregate.AggregationStrategy` has been
+    moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -12,8 +11,8 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: The class `org.apache.camel.processor.aggregate.AggregationStrategy` has
-    been moved to `org.apache.camel.AggregationStrategy`.
+  message: "\n The class `org.apache.camel.processor.aggregate.AggregationStrategy`
+    has been moved to `org.apache.camel.AggregationStrategy`.\n "
   ruleID: java-generic-information-00000
   when:
     java.referenced:
@@ -24,8 +23,7 @@
   - name: SupportClass
     nameOfCaptureGroup: SupportClass
     pattern: org.apache.camel.impl.(?P<SupportClass>(BaseSelectorProducer|AsyncCallbackToCompletableFutureAdapter|BridgeExceptionHandlerToErrorHandler|DefaultAsyncProducer|DefaultComponent|DefaultConsumer|DefaultEndpoint|DefaultExchange|DefaultExchangeHolder|DefaultHeaderFilterStrategy|DefaultMessage|DefaultMessageHistory|DefaultPollingConsumerPollStrategy|DefaultPollingEndpoint|DefaultProducer|DefaultScheduledPollConsumer|DefaultScheduledPollConsumerScheduler|DefaultThreadPoolFactory|EventDrivenPollingConsumer|ExpressionAdapter|ExpressionComparator|ExpressionListComparator|ExpressionSupport|HeaderFilterStrategyComponent|HeaderSelectorProducer|LoggingExceptionHandler|MessageSupport|PollingConsumerSupport|ProcessorEndpoint|ProcessorPollingConsumer|ScheduledBatchPollingConsumer|ScheduledPollConsumer|ScheduledPollEndpoint|SimpleRegistry|SimpleUuidGeneratorSynchronizationAdapter|SynchronousDelegateProducer))
-  description: |
-    `org.apache.camel.impl.{SupportClass}` has been moved
+  description: '`org.apache.camel.impl.{SupportClass}` has been moved'
   effort: 3
   labels:
   - konveyor.io/source=camel2
@@ -35,8 +33,9 @@
   links:
   - title: 'Camel 3 - Migration Guide: Migrating custom Components'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_migrating_custom_components
-  message: The class `org.apache.camel.impl.{{SupportClass}}` has been moved to `org.apache.camel.support.{{SupportClass}}`.
-    It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`.
+  message: "\n The class `org.apache.camel.impl.{{SupportClass}}` has been moved to
+    `org.apache.camel.support.{{SupportClass}}`. It has been moved out of `org.apache.camel:camel-core`
+    and into `org.apache.camel:camel-support`.\n "
   ruleID: java-generic-information-00001
   when:
     java.referenced:
@@ -44,9 +43,7 @@
       pattern: org.apache.camel.impl.(BaseSelectorProducer|AsyncCallbackToCompletableFutureAdapter|BridgeExceptionHandlerToErrorHandler|DefaultAsyncProducer|DefaultComponent|DefaultConsumer|DefaultEndpoint|DefaultExchange|DefaultExchangeHolder|DefaultHeaderFilterStrategy|DefaultMessage|DefaultMessageHistory|DefaultPollingConsumerPollStrategy|DefaultPollingEndpoint|DefaultProducer|DefaultScheduledPollConsumer|DefaultScheduledPollConsumerScheduler|DefaultThreadPoolFactory|EventDrivenPollingConsumer|ExpressionAdapter|ExpressionComparator|ExpressionListComparator|ExpressionSupport|HeaderFilterStrategyComponent|HeaderSelectorProducer|LoggingExceptionHandler|MessageSupport|PollingConsumerSupport|ProcessorEndpoint|ProcessorPollingConsumer|ScheduledBatchPollingConsumer|ScheduledPollConsumer|ScheduledPollEndpoint|SimpleRegistry|SimpleUuidGeneratorSynchronizationAdapter|SynchronousDelegateProducer)
 - category: mandatory
   customVariables: []
-  description: |-
-    `zip` and `gzip` dataformat was renamed
-    `zip` and `gzip` dataformats were renamed to `zipdeflater and `gzipdeflater`
+  description: '`zip` and `gzip` dataformat was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -54,7 +51,7 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: '`zip` and `gzip` dataformats were renamed to `zipdeflater and `gzipdeflater`'
+  message: "`zip` and `gzip` dataformats were renamed to `zipdeflater and `gzipdeflater`\n "
   ruleID: java-generic-information-00002
   when:
     or:
@@ -76,8 +73,7 @@
   - name: registry
     nameOfCaptureGroup: registry
     pattern: org.apache.camel.impl.(?P<registry>(PropertyPlaceholderDelegateRegistry|CompositeRegistry))
-  description: |
-    `org.apache.camel.impl.{registry}` has been removed.
+  description: '`org.apache.camel.impl.{registry}` has been removed.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -85,8 +81,8 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: The class `org.apache.camel.impl.{{registry}}` has been removed. Use `org.apache.camel.support.DefaultRegistry`
-    instead.
+  message: "\n The class `org.apache.camel.impl.{{registry}}` has been removed. Use
+    `org.apache.camel.support.DefaultRegistry` instead.\n "
   ruleID: java-generic-information-00004
   when:
     as: javaClass
@@ -95,9 +91,8 @@
       pattern: org.apache.camel.impl.(PropertyPlaceholderDelegateRegistry|CompositeRegistry)
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport` has been removed.
-    The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport` has been removed. Use. `org.apache.camel.processor.loadbalancer.LoadBalancerSupport` instead.
+  description: '`org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport`
+    has been removed.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -107,9 +102,9 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport`
-    has been removed. Use. `org.apache.camel.processor.loadbalancer.LoadBalancerSupport`
-    instead.
+  message: "\n The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport`
+    has been removed. Use\n `org.apache.camel.processor.loadbalancer.LoadBalancerSupport`
+    instead.\n "
   ruleID: java-generic-information-00005
   when:
     as: javaClass
@@ -121,8 +116,7 @@
   - name: removed
     nameOfCaptureGroup: removed
     pattern: org.apache.camel.(?P<removed>(impl.FileWatcherReloadStrategy|support.ReloadStrategySupport))
-  description: |
-    `org.apache.camel.{removed}` has been removed.
+  description: '`org.apache.camel.{removed}` has been removed.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -132,7 +126,7 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: The class `org.apache.camel.{{removed}}` has been removed.
+  message: "\n The class `org.apache.camel.{{removed}}` has been removed.\n "
   ruleID: java-generic-information-00006
   when:
     as: javaClass
@@ -141,9 +135,7 @@
       pattern: org.apache.camel.(impl.FileWatcherReloadStrategy|support.ReloadStrategySupport)
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.util.toolbox.AggregationStrategies` has been moved
-    The class `org.apache.camel.util.toolbox.AggregationStrategies` has been moved to `org.apache.camel.builder.AggregationStrategies`.
+  description: '`org.apache.camel.util.toolbox.AggregationStrategies` has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -153,8 +145,8 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: The class `org.apache.camel.util.toolbox.AggregationStrategies` has been
-    moved to `org.apache.camel.builder.AggregationStrategies`.
+  message: "\n The class `org.apache.camel.util.toolbox.AggregationStrategies` has
+    been moved to `org.apache.camel.builder.AggregationStrategies`.\n "
   ruleID: java-generic-information-00008
   when:
     java.referenced:
@@ -162,9 +154,7 @@
       pattern: org.apache.camel.util.toolbox.AggregationStrategies
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.management.JmxSystemPropertyKeys` has been moved
-    The class `org.apache.camel.management.JmxSystemPropertyKeys` has been moved to ` org.apache.camel.api.management.JmxSystemPropertyKeys`.
+  description: '`org.apache.camel.management.JmxSystemPropertyKeys` has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -174,8 +164,8 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: The class `org.apache.camel.management.JmxSystemPropertyKeys` has been
-    moved to ` org.apache.camel.api.management.JmxSystemPropertyKeys`.
+  message: "\n The class `org.apache.camel.management.JmxSystemPropertyKeys` has been
+    moved to ` org.apache.camel.api.management.JmxSystemPropertyKeys`.\n "
   ruleID: java-generic-information-00009
   when:
     java.referenced:
@@ -183,9 +173,7 @@
       pattern: org.apache.camel.management.JmxSystemPropertyKeys
 - category: mandatory
   customVariables: []
-  description: |-
-    `includeRoutes` method has been removed
-    `includeRoutes` method has been removed
+  description: '`includeRoutes` method has been removed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -195,7 +183,7 @@
   links:
   - title: Camel 3 - Migration Guide
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: '`includeRoutes` method has been removed'
+  message: "`includeRoutes` method has been removed\n "
   ruleID: java-generic-information-00010
   when:
     builtin.filecontent:
@@ -203,9 +191,7 @@
       pattern: .includeRoutes(.*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.language.Bean` method has been moved
-    Annotation `org.apache.camel.language.Bean` has been moved to `org.apache.camel.language.bean.Bean`
+  description: Annotation `org.apache.camel.language.Bean` method has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -224,9 +210,7 @@
       pattern: org.apache.camel.language.Bean
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.language.Simple` method has been moved
-    Annotation `org.apache.camel.language.Simple` has been moved to `org.apache.camel.language.simple.Simple`
+  description: Annotation `org.apache.camel.language.Simple` method has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -245,9 +229,7 @@
       pattern: org.apache.camel.language.Simple
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.language.SpEL` method has been moved
-    Annotation `org.apache.camel.language.SpEL` has been moved to `org.apache.camel.language.spel.SpEL`
+  description: Annotation `org.apache.camel.language.SpEL` method has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -269,8 +251,7 @@
   - name: annotation
     nameOfCaptureGroup: annotation
     pattern: org.apache.camel.(?P<annotation>(InvokeOnHeaders|InvokeOnHeader))
-  description: |
-    Annotation `org.apache.camel.{annotation}` has been moved
+  description: Annotation `org.apache.camel.{annotation}` has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -289,9 +270,7 @@
       pattern: org.apache.camel.(InvokeOnHeaders|InvokeOnHeader)
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.Constant`has been removed
-    Annotation `org.apache.camel.Constant` has been removed. Use `@Simple` instead.`
+  description: Annotation `org.apache.camel.Constant`has been removed
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -311,9 +290,7 @@
       pattern: org.apache.camel.Constant
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.builder.xml.XPathBuilder`has been moved
-    Class `org.apache.camel.builder.xml.XPathBuilder` has been moved to `org.apache.camel.language.xpath.XPathBuilder`.
+  description: Annotation `org.apache.camel.builder.xml.XPathBuilder`has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -332,9 +309,7 @@
       pattern: org.apache.camel.builder.xml.XPathBuilder
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.language.XPath` has been moved
-    Annotation `org.apache.camel.language.XPath` has been moved to `org.apache.camel.language.xpath.XPath`
+  description: Annotation `org.apache.camel.language.XPath` has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -353,9 +328,8 @@
       pattern: org.apache.camel.language.XPath
 - category: mandatory
   customVariables: []
-  description: |-
-    Exception `org.apache.camel.builder.xml.InvalidXPathExpression` has been moved
-    Exception `org.apache.camel.builder.xml.InvalidXPathExpression` has been moved to `org.apache.camel.language.xpath.InvalidXPathException `
+  description: Exception `org.apache.camel.builder.xml.InvalidXPathExpression` has
+    been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -375,9 +349,8 @@
       pattern: org.apache.camel.builder.xml.InvalidXPathExpression
 - category: mandatory
   customVariables: []
-  description: |-
-    Exception `org.apache.camel.processor.validation.PredicateValidationException` has been moved
-    Exception `org.apache.camel.processor.validation.PredicateValidationException` has been moved to `org.apache.camel.support.processor.validation.PredicateValidationException`
+  description: Exception `org.apache.camel.processor.validation.PredicateValidationException`
+    has been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -397,9 +370,7 @@
       pattern: org.apache.camel.processor.validation.PredicateValidationException
 - category: mandatory
   customVariables: []
-  description: |-
-    xslt method was removed from `org.apache.camel.util.toolbox.AggregationStrategies`
-    xslt method was removed from `org.apache.camel.util.toolbox.AggregationStrategies`. Instead use the `XsltAggregationStrategy` from `camel-xslt` JAR directly
+  description: xslt method was removed from `org.apache.camel.util.toolbox.AggregationStrategies`
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -418,9 +389,7 @@
       pattern: org.apache.camel.util.toolbox.AggregationStrategies.xslt*
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.language.LanguageAnnotation` has been moved
-    The class `org.apache.camel.language.LanguageAnnotation` has been moved to `org.apache.camel.support.language.LanguageAnnotation`. It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`.
+  description: '`org.apache.camel.language.LanguageAnnotation` has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -443,8 +412,7 @@
   - name: moved
     nameOfCaptureGroup: moved
     pattern: org.apache.camel.util.(?P<moved>(AsyncProcessorHelper|AsyncProcessorConverterHelper|EndpointHelper|EventHelper|ExchangeHelper|GZIPHelper|JsonSchemaHelper|MessageHelper|PlatformHelper|PredicateAssertHelper|ResolverHelper|ResourceHelper|UnitOfWorkHelper))
-  description: |
-    `org.apache.camel.util.{moved}` has been moved.
+  description: '`org.apache.camel.util.{moved}` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -462,9 +430,7 @@
       pattern: org.apache.camel.util.(AsyncProcessorHelper|AsyncProcessorConverterHelper|EndpointHelper|EventHelper|ExchangeHelper|GZIPHelper|JsonSchemaHelper|MessageHelper|PlatformHelper|PredicateAssertHelper|ResolverHelper|ResourceHelper|UnitOfWorkHelper)
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.util.ServiceHelper` has been moved.
-    The class `org.apache.camel.util.ServiceHelper` has been moved to `org.apache.camel.support.service.ServiceHelper`. It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-api`
+  description: '`org.apache.camel.util.ServiceHelper` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -482,9 +448,7 @@
       pattern: org.apache.camel.util.ServiceHelper
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.spi.RestProducerFactoryHelper` has been moved.
-    The class `org.apache.camel.spi.RestProducerFactoryHelper` has been moved to `org.apache.camel.support.RestProducerFactoryHelper`. It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`
+  description: '`org.apache.camel.spi.RestProducerFactoryHelper` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -503,9 +467,7 @@
       pattern: org.apache.camel.spi.RestProducerFactoryHelper
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.util.ObjectHelper` has been moved.
-    The class `org.apache.camel.util.ObjectHelper` has been moved out of the `org.apache.camel:camel-core` and has been split into two classes: `org.apache.camel.support.ObjectHelper` (`org.apache.camel:camel-support`) and `org.apache.camel.util.ObjectHelper` (`org.apache.camel:camel-util`). This has been done to isolate the methods using `org.apache.camel:camel-api`.
+  description: '`org.apache.camel.util.ObjectHelper` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -525,9 +487,7 @@
       pattern: org.apache.camel.util.ObjectHelper
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.support.RoutePolicySupport` has been moved.
-    The class `org.apache.camel.support.RoutePolicySupport` has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`. The return type from `startConsumer` and `stopConsumer` has been changed from boolean to void as they always returned true before.
+  description: '`org.apache.camel.support.RoutePolicySupport` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -547,9 +507,7 @@
       pattern: org.apache.camel.support.RoutePolicySupport
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved.
-    The class `org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved to `org.apache.camel.throttling.ThrottlingInflightRoutePolicy`. It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-base`.
+  description: '`org.apache.camel.impl.ThrottlingInflightRoutePolicy` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -568,8 +526,7 @@
       pattern: org.apache.camel.impl.ThrottlingInflightRoutePolicy
 - category: mandatory
   customVariables: []
-  description: |
-    `org.apache.camel.processor.idempotent.{moved}` has been moved
+  description: '`org.apache.camel.processor.idempotent.{moved}` has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -579,9 +536,9 @@
   links:
   - title: 'Camel 3 - Migration Guide: Idempotent repositories'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_idempotent_repositories
-  message: The class `org.apache.camel.processor.idempotent.{{moved}}` has been moved
-    to `org.apache.camel.support.processor.idempotent.{{moved}}`. It has been moved
-    out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`.
+  message: "\n The class `org.apache.camel.processor.idempotent.{{moved}}` has been
+    moved to `org.apache.camel.support.processor.idempotent.{{moved}}`. It has been
+    moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-support`.\n "
   ruleID: java-generic-information-00029
   when:
     or:
@@ -590,9 +547,7 @@
         pattern: org.apache.camel.processor.idempotent.(FileIdempotentRepository|MemoryIdempotentRepository)
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `org.apache.camel.FallbackConverter` has been removed
-    Annotation `org.apache.camel.FallbackConverter` has been removed. You should use `@org.apache.camel.Converter(fallback = true)` from `org.apache.camel:camel-api` instead. You can also set `@org.apache.camel.Converter(generateLoader = true)` on the converter class to allow Camel to generate source code for loading type converters in a faster way.
+  description: Annotation `org.apache.camel.FallbackConverter` has been removed
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -614,9 +569,7 @@
       pattern: org.apache.camel.FallbackConverter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.util.toolbox.XsltAggregationStrategy` has been moved.
-    The class `org.apache.camel.util.toolbox.XsltAggregationStrategy` has been moved to `org.apache.camel.component.xslt.XsltAggregationStrategy`. It has been moved out of `org.apache.camel:camel-core` and into `org.apache.camel:camel-xslt`. When using the option `groupedExchange` on the `aggregator` EIP, the output of the aggregation is no longer stored in the exchange property `Exchange.GROUPED_EXCHANGE`. This behaviour was already deprecated from Camel 2.13 onwards.
+  description: '`org.apache.camel.util.toolbox.XsltAggregationStrategy` has been moved.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -648,9 +601,7 @@
         xpath: //*/c:bean/@class[matches(self::node(), 'org.apache.camel.util.toolbox.XsltAggregationStrategy')]
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.CamelContext` property methods have been removed.
-    The `getProperties` and `setProperty` methods have been removed from `org.apache.camel.CamelContext`. Please use `getGlobalOptions` and `setGlobalOptions` instead
+  description: '`org.apache.camel.CamelContext` property methods have been removed.'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -678,9 +629,8 @@
         xpath: //c:camelContext/c:properties
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-fhir` default FHIR specification has changed from DSTU3 to R4
-    The default FHIR specification in the `org.apache.camel:camel-fhir` artifact has changed from DSTU3 to R4. Therefore if DSTU3 is desired it has to be explicitly set.
+  description: '`org.apache.camel:camel-fhir` default FHIR specification has changed
+    from DSTU3 to R4'
   effort: 0
   labels:
   - konveyor.io/source=camel2
@@ -703,8 +653,9 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.apache.camel.CamelContext.(?P<method>(getManagedCamelContext|getManagedProcessor|getManagedRoute))?(.*)
-  description: |
-    The methods on `CamelContext` that are related to JMX has been moved into a new `ManagedCamelContext` interface present in the `org.apache.camel:camel-management-api` artifact
+  description: The methods on `CamelContext` that are related to JMX has been moved
+    into a new `ManagedCamelContext` interface present in the `org.apache.camel:camel-management-api`
+    artifact
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -714,11 +665,11 @@
   links:
   - title: Camel 3 - Managed Camel Context
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_jmx
-  message: The method `org.apache.camel.CamelContext.{{method}}` has been moved to
+  message: "The method `org.apache.camel.CamelContext.{{method}}` has been moved to
     `org.apache.camel.api.management.ManagedCamelContext.{{method}}`. You can access
-    it by adapting your CamelContext like so:. `ManagedCamelContext managed = context.adapt(ManagedCamelContext.class);`.
-    `managed.{{method}}(...);`. If you want JMX to be enabled out of the box, `org.apache.camel:camel-management`
-    needs to be on the classpath.
+    it by adapting your CamelContext like so:\n\n `ManagedCamelContext managed = context.adapt(ManagedCamelContext.class);`\n
+    `managed.{{method}}(...);`\n\n If you want JMX to be enabled out of the box, `org.apache.camel:camel-management`
+    needs to be on the classpath.\n "
   ruleID: java-generic-information-00045
   when:
     java.referenced:
@@ -726,8 +677,8 @@
       pattern: org.apache.camel.CamelContext.(getManagedCamelContext|getManagedProcessor|getManagedRoute)*
 - category: mandatory
   customVariables: []
-  description: |
-    The functionality to change the simple language tokens for start/end functions has been removed.
+  description: The functionality to change the simple language tokens for start/end
+    functions has been removed.
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -765,8 +716,7 @@
   - name: class
     nameOfCaptureGroup: class
     pattern: org.apache.camel.(?P<class>(Consume|EndpointInject|Produce))
-  description: |
-    @{class}: `uri` attribute has been deprecated
+  description: '@{class}: `uri` attribute has been deprecated'
   effort: 0
   labels:
   - konveyor.io/source=camel2
@@ -789,8 +739,7 @@
   - name: class
     nameOfCaptureGroup: class
     pattern: org.apache.camel.(?P<class>(Consume|EndpointInject|Produce))
-  description: |
-    @{class}: `ref` attribute has been removed
+  description: '@{class}: `ref` attribute has been removed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -812,8 +761,8 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.apache.camel.CamelContext.(?P<method>(getComponentParameterJsonSchema|getDataFormatParameterJsonSchema|getLanguageParameterJsonSchema|getEipParameterJsonSchema))?(.*)
-  description: |
-    The methods on `CamelContext` that are related to the catalog have been moved into a new `CatalogCamelContext` interface
+  description: The methods on `CamelContext` that are related to the catalog have
+    been moved into a new `CatalogCamelContext` interface
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -823,9 +772,9 @@
   links:
   - title: Camel 3 - Catalog Camel Context
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_camelcontext
-  message: The method `org.apache.camel.CamelContext.{{method}}` has moved to `org.apache.camel.CatalogCamelContext.{{method}}`.
-    You can access it by adapting your `CamelContext` like so:. `CatalogCamelContext
-    ccc = context.adapt(CatalogCamelContext.class);`. `ccc.{{method}}(...);`
+  message: "The method `org.apache.camel.CamelContext.{{method}}` has moved to `org.apache.camel.CatalogCamelContext.{{method}}`.
+    You can access it by adapting your `CamelContext` like so:\n\n `CatalogCamelContext
+    ccc = context.adapt(CatalogCamelContext.class);`\n `ccc.{{method}}(...);`\n "
   ruleID: java-generic-information-00049
   when:
     java.referenced:
@@ -836,8 +785,8 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.apache.camel.CamelContext.(?P<method>(loadRoutesDefinition|loadRestsDefinition))?(.*)
-  description: |
-    The duplicate method `org.apache.camel.CamelContext.{method}` has been removed
+  description: The duplicate method `org.apache.camel.CamelContext.{method}` has been
+    removed
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -847,9 +796,9 @@
   links:
   - title: Camel 3 - Catalog Camel Context
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_camelcontext
-  message: The duplicate method `org.apache.camel.CamelContext.{{method}}` has been
+  message: "The duplicate method `org.apache.camel.CamelContext.{{method}}` has been
     removed. You should use the `static` method `org.apache.camel.model.ModelHelper{{method}}`
-    instead.
+    instead.\n "
   ruleID: java-generic-information-00050
   when:
     java.referenced:
@@ -860,8 +809,8 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.apache.camel.CamelContext.(?P<method>(getRouteDefinitions|getRouteDefinition|addRouteDefinitions|addRouteDefinition|removeRouteDefinitions|removeRouteDefinition|getRestDefinitions|addRestDefinitions|setDataFormats|getDataFormats|resolveDataFormatDefinition|getProcessorDefinition|setValidators|getHystrixConfiguration|setHystrixConfiguration|setHystrixConfigurations|addHystrixConfiguration|getValidators|setTransformers|getTransformers|addServiceCallConfiguration|setServiceCallConfigurations|setServiceCallConfiguration|getServiceCallConfiguration))?(.*)
-  description: |
-    The methods on `CamelContext` that are related to the routes model have been moved into a new `Model` interface
+  description: The methods on `CamelContext` that are related to the routes model
+    have been moved into a new `Model` interface
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -871,10 +820,10 @@
   links:
   - title: Camel 3 - Model Camel Context
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_modelcamelcontext
-  message: The method `org.apache.camel.CamelContext.{{method}}` has been moved to
+  message: "The method `org.apache.camel.CamelContext.{{method}}` has been moved to
     `org.apache.camel.model.Model.{{method}}`. You can access it by adapting your
-    `CamelContext` like so:. `ModelCamelContext ccc = context.adapt(ModelCamelContext.class);`.
-    `mcc.{{method}}(...);`
+    `CamelContext` like so:\n\n `ModelCamelContext ccc = context.adapt(ModelCamelContext.class);`\n
+    `mcc.{{method}}(...);`\n "
   ruleID: java-generic-information-00051
   when:
     java.referenced:
@@ -885,8 +834,8 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.apache.camel.CamelContext.(?P<method>(setupRoutes|isSetupRoutes|getRouteStartupOrder|getManagementMBeanAssembler|addInterceptStrategy|getInterceptStrategies|getErrorHandlerExecutorService|getDataFormatResolver|setDataFormatResolver|getDefaultFactoryFinder|setFactoryFinderResolver|getFactoryFinder|getPackageScanClassResolver|setPackageScanClassResolver|setNodeIdFactory|getNodeIdFactory|getAsyncProcessorAwaitManager|setAsyncProcessorAwaitManager|getProcessorFactory|setProcessorFactory|getUnitOfWorkFactory|setUnitOfWorkFactory|getModelJAXBContextFactory|setModelJAXBContextFactory|getLogListeners|addLogListener))?(.*)
-  description: |
-    The methods on `CamelContext` that are intended for advanced use cases have been moved into a new `ExtendedCamelContext` interface
+  description: The methods on `CamelContext` that are intended for advanced use cases
+    have been moved into a new `ExtendedCamelContext` interface
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -896,10 +845,10 @@
   links:
   - title: Camel 3 - Extended Camel Context
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_extended_camelcontext
-  message: The method `org.apache.camel.CamelContext.{{method}}` has been moved to
+  message: "The method `org.apache.camel.CamelContext.{{method}}` has been moved to
     `org.apache.camel.ExtendedCamelContext.{{method}}`. You can access it by adapting
-    your `CamelContext` like so:. `ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class);`.
-    `ecc.{{method}}(...);`
+    your `CamelContext` like so:\n\n `ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class);`\n
+    `ecc.{{method}}(...);`\n "
   ruleID: java-generic-information-00052
   when:
     java.referenced:
diff --git a/default/generated/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml b/default/generated/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
index dd6bccaf..ca7f754d 100644
--- a/default/generated/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
+++ b/default/generated/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
@@ -3,8 +3,7 @@
   - name: class
     nameOfCaptureGroup: class
     pattern: org.apache.camel.(?P<class>(BeanInject|Consume|DynamicRouter|EndpointInject|Produce|PropertyInject|RecipientList|RoutingSlip))
-  description: |
-    {class}: `context` attribute removed
+  description: '{class}: `context` attribute removed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -15,9 +14,9 @@
   - title: 'Camel 3 - Migration Guide: multiple CamelContexts per application not
       supported'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_multiple_camelcontexts_per_application_not_supported
-  message: The `context` attribute on `{{class}}` annotations has been removed since
-    support for multiple CamelContexts has been removed and only one CamelContext
-    per deployment is supported.
+  message: "\n The `context` attribute on `{{class}}` annotations has been removed
+    since support for multiple CamelContexts has been removed and only one CamelContext
+    per deployment is supported.\n "
   ruleID: java-multiple-camelcontexts-per-application-not-supported-00000
   when:
     java.referenced:
@@ -28,8 +27,7 @@
   - name: CdiCamelContextName
     nameOfCaptureGroup: CdiCamelContextName
     pattern: org.apache.camel.cdi.(?P<CdiCamelContextName>(ContextName|ContextNames))
-  description: |
-    {CdiCamelContextName} has been removed
+  description: '{CdiCamelContextName} has been removed'
   effort: 3
   labels:
   - konveyor.io/source=camel2
@@ -40,9 +38,9 @@
   - title: 'Camel 3 - Migration Guide: multiple CamelContexts per application not
       supported'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_camel_cdi
-  message: Support for multiple CamelContexts has been removed, and therefore `{{CdiCamelContextName}}`
-    has been removed. Instead use standard CDI annotations such as `javax.inject.Named`
-    and `javax.enterprise.context.ApplicationScoped`.
+  message: "\n Support for multiple CamelContexts has been removed, and therefore
+    `{{CdiCamelContextName}}` has been removed. Instead use standard CDI annotations
+    such as `javax.inject.Named` and `javax.enterprise.context.ApplicationScoped`.\n "
   ruleID: java-multiple-camelcontexts-per-application-not-supported-00001
   when:
     java.referenced:
diff --git a/default/generated/camel3/20-xml-dsl-changes.windup.yaml b/default/generated/camel3/20-xml-dsl-changes.windup.yaml
index 134ec6cb..6954f188 100644
--- a/default/generated/camel3/20-xml-dsl-changes.windup.yaml
+++ b/default/generated/camel3/20-xml-dsl-changes.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    `zip` and `gzip` dataformat was renamed
-    `zip` and `gzip` dataformats were renamed to `zipdeflater` and `gzipdeflater`
+  description: '`zip` and `gzip` dataformat was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -12,7 +10,7 @@
   links:
   - title: 'Camel 3 - Migration Guide: Zip and Gzip dafaformats'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_zip_and_gzip_dataformat
-  message: '`zip` and `gzip` dataformats were renamed to `zipdeflater` and `gzipdeflater`'
+  message: "`zip` and `gzip` dataformats were renamed to `zipdeflater` and `gzipdeflater`\n\n "
   ruleID: xml-dsl-changes-00001
   when:
     or:
@@ -26,9 +24,7 @@
         xpath: //*[(count(c:gzip)+count(c:zip)) > 0]
 - category: mandatory
   customVariables: []
-  description: |-
-    `custom` load balancer was renamed `customLoadBalancer`
-    `custom` load balancer was renamed to `customLoadBalancer`
+  description: '`custom` load balancer was renamed `customLoadBalancer`'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -38,7 +34,7 @@
   links:
   - title: Camel 3 - Migration Guide
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_xml_dsl_migration
-  message: '`custom` load balancer was renamed to `customLoadBalancer`'
+  message: "`custom` load balancer was renamed to `customLoadBalancer`\n\n "
   ruleID: xml-dsl-changes-00002
   when:
     or:
@@ -52,9 +48,7 @@
         xpath: //*/c:route/c:loadBalance/c:custom
 - category: mandatory
   customVariables: []
-  description: |-
-    `zipFile` data format was renamed to `zipfile`
-    `zipFile` data format was renamed to `zipfile`
+  description: '`zipFile` data format was renamed to `zipfile`'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -64,7 +58,7 @@
   links:
   - title: Camel 3 - Migration Guide
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_xml_dsl_migration
-  message: '`zipFile` data format was renamed to `zipfile`'
+  message: "`zipFile` data format was renamed to `zipfile`\n\n "
   ruleID: xml-dsl-changes-00003
   when:
     or:
@@ -86,9 +80,7 @@
         xpath: //*/c:unmarshal/c:zipFile
 - category: mandatory
   customVariables: []
-  description: |-
-    `keyOrTrustStoreParametersId` attribute was renamed
-    `keyOrTrustStoreParametersId` attribute was renamed to `keyOrTrustStoreParametersRef`
+  description: '`keyOrTrustStoreParametersId` attribute was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -98,7 +90,7 @@
   links:
   - title: Camel 3 - Migration Guide
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_xml_dsl_migration
-  message: '`keyOrTrustStoreParametersId` attribute was renamed to `keyOrTrustStoreParametersRef`'
+  message: "`keyOrTrustStoreParametersId` attribute was renamed to `keyOrTrustStoreParametersRef`\n\n "
   ruleID: xml-dsl-changes-00004
   when:
     or:
@@ -112,9 +104,7 @@
         xpath: //*/c:secureXML/@keyOrTrustStoreParametersId
 - category: mandatory
   customVariables: []
-  description: |-
-    `hystrix` was renamed
-    Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker`. instead of `hystrix'.
+  description: '`hystrix` was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -124,8 +114,8 @@
   links:
   - title: Camel 3 - Migration Guide
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_xml_dsl_migration
-  message: Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker`.
-    instead of `hystrix'.
+  message: "Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker`\n
+    instead of `hystrix'.\n "
   ruleID: xml-dsl-changes-00005
   when:
     or:
@@ -139,9 +129,7 @@
         xpath: //*/c:hystrix
 - category: mandatory
   customVariables: []
-  description: |-
-    `completionSize` in aggregate was renamed
-    Use `completionSizeExpression` instead of `completionSize`. Expressions (not the attributes) for. setting correlation size/timeout were renamed.
+  description: '`completionSize` in aggregate was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -151,8 +139,8 @@
   links:
   - title: Camel 3 - Migration Guide - Aggregate EIP changes
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_aggregate_eip_in_xml_dsl
-  message: Use `completionSizeExpression` instead of `completionSize`. Expressions
-    (not the attributes) for. setting correlation size/timeout were renamed.
+  message: "Use `completionSizeExpression` instead of `completionSize`. Expressions
+    (not the attributes) for\n setting correlation size/timeout were renamed.\n "
   ruleID: xml-dsl-changes-00006
   when:
     or:
@@ -166,9 +154,7 @@
         xpath: //*/c:aggregate/c:completionSize
 - category: mandatory
   customVariables: []
-  description: |-
-    `completionTimeout` in aggregate was renamed
-    Use `completionTimeoutExpression` instead of `completionTimeout`. Expressions (not the. attributes) for. setting correlation size/timeout were renamed.
+  description: '`completionTimeout` in aggregate was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -178,8 +164,8 @@
   links:
   - title: Camel 3 - Migration Guide - Aggregate EIP changes
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_aggregate_eip_in_xml_dsl
-  message: Use `completionTimeoutExpression` instead of `completionTimeout`. Expressions
-    (not the. attributes) for. setting correlation size/timeout were renamed.
+  message: "Use `completionTimeoutExpression` instead of `completionTimeout`. Expressions
+    (not the\n attributes) for\n setting correlation size/timeout were renamed.\n "
   ruleID: xml-dsl-changes-00007
   when:
     or:
@@ -193,9 +179,7 @@
         xpath: //*/c:aggregate/c:completionTimeout
 - category: mandatory
   customVariables: []
-  description: |-
-    `headerName` attribute was renamed
-    The attribute `headerName` was renamed to `name`.
+  description: '`headerName` attribute was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -219,9 +203,7 @@
         xpath: //*/c:setHeader/@headerName
 - category: mandatory
   customVariables: []
-  description: |-
-    `propertyName` attribute was renamed
-    The attribute `propertyName` was renamed to `name`.
+  description: '`propertyName` attribute was renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
diff --git a/default/generated/camel3/21-xml-java-versions.windup.yaml b/default/generated/camel3/21-xml-java-versions.windup.yaml
index 1d3c4966..fc700cf5 100644
--- a/default/generated/camel3/21-xml-java-versions.windup.yaml
+++ b/default/generated/camel3/21-xml-java-versions.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    'jaxb-api' Maven dependency missing
-    `jaxb-api` Maven dependency missing.. Apache Camel 3 supports Java 11 and in this Java version JAXB modules have been removed from the JDK, therefore you will need to add them as Maven dependencies since there are couple of components rely on them:. ```Xml. <dependency>. <groupId>javax.xml.bind</groupId>. <artifactId>jaxb-api</artifactId>. <version>2.3.1</version>. </dependency>. ```
+  description: '''jaxb-api'' Maven dependency missing'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -12,11 +10,12 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  message: '`jaxb-api` Maven dependency missing.. Apache Camel 3 supports Java 11
-    and in this Java version JAXB modules have been removed from the JDK, therefore
-    you will need to add them as Maven dependencies since there are couple of components
-    rely on them:. ```Xml. <dependency>. <groupId>javax.xml.bind</groupId>. <artifactId>jaxb-api</artifactId>.
-    <version>2.3.1</version>. </dependency>. ```'
+  message: "\n \n `jaxb-api` Maven dependency missing.\n\n Apache Camel 3 supports
+    Java 11 and in this Java version JAXB modules have been removed from the JDK,
+    therefore you will need to add them as Maven dependencies since there are couple
+    of components rely on them:\n\n ```Xml\n <dependency>\n <groupId>javax.xml.bind</groupId>\n
+    <artifactId>jaxb-api</artifactId>\n <version>2.3.1</version>\n </dependency>\n
+    ```\n \n "
   ruleID: xml-java-versions-00001
   when:
     or:
@@ -33,9 +32,7 @@
         xpath: /m:project/m:dependencies
 - category: potential
   customVariables: []
-  description: |-
-    'jaxb-core' Maven dependency missing
-    `jaxb-core` Maven dependency missing.. Apache Camel 3 supports Java 11 and in this Java version JAXB modules have been removed from the JDK, therefore you will need to add them as Maven dependencies since there are couple of components rely on them:. ```Xml. <dependency>. <groupId>com.sun.xml.bind</groupId>. <artifactId>jaxb-core</artifactId>. <version>2.3.0.1</version>. </dependency>. ```
+  description: '''jaxb-core'' Maven dependency missing'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -45,11 +42,12 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  message: '`jaxb-core` Maven dependency missing.. Apache Camel 3 supports Java 11
-    and in this Java version JAXB modules have been removed from the JDK, therefore
-    you will need to add them as Maven dependencies since there are couple of components
-    rely on them:. ```Xml. <dependency>. <groupId>com.sun.xml.bind</groupId>. <artifactId>jaxb-core</artifactId>.
-    <version>2.3.0.1</version>. </dependency>. ```'
+  message: "\n \n `jaxb-core` Maven dependency missing.\n\n Apache Camel 3 supports
+    Java 11 and in this Java version JAXB modules have been removed from the JDK,
+    therefore you will need to add them as Maven dependencies since there are couple
+    of components rely on them:\n\n ```Xml\n <dependency>\n <groupId>com.sun.xml.bind</groupId>\n
+    <artifactId>jaxb-core</artifactId>\n <version>2.3.0.1</version>\n </dependency>\n
+    ```\n \n "
   ruleID: xml-java-versions-00002
   when:
     or:
@@ -66,9 +64,7 @@
         xpath: /m:project/m:dependencies
 - category: potential
   customVariables: []
-  description: |-
-    'jaxb-impl' Maven dependency missing
-    `jaxb-impl` Maven dependency missing.. Apache Camel 3 supports Java 11 and in this Java version JAXB modules have been removed from the JDK, therefore you will need to add them as Maven dependencies since there are couple of components rely on them:. ```Xml. <dependency>. <groupId>com.sun.xml.bind</groupId>. <artifactId>jaxb-impl</artifactId>. <version>2.3.2</version>. </dependency>. ```
+  description: '''jaxb-impl'' Maven dependency missing'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -78,11 +74,12 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  message: '`jaxb-impl` Maven dependency missing.. Apache Camel 3 supports Java 11
-    and in this Java version JAXB modules have been removed from the JDK, therefore
-    you will need to add them as Maven dependencies since there are couple of components
-    rely on them:. ```Xml. <dependency>. <groupId>com.sun.xml.bind</groupId>. <artifactId>jaxb-impl</artifactId>.
-    <version>2.3.2</version>. </dependency>. ```'
+  message: "\n \n `jaxb-impl` Maven dependency missing.\n\n Apache Camel 3 supports
+    Java 11 and in this Java version JAXB modules have been removed from the JDK,
+    therefore you will need to add them as Maven dependencies since there are couple
+    of components rely on them:\n\n ```Xml\n <dependency>\n <groupId>com.sun.xml.bind</groupId>\n
+    <artifactId>jaxb-impl</artifactId>\n <version>2.3.2</version>\n </dependency>\n
+    ```\n \n "
   ruleID: xml-java-versions-00003
   when:
     or:
diff --git a/default/generated/camel3/22-xml-moved-components.windup.yaml b/default/generated/camel3/22-xml-moved-components.windup.yaml
index 5136fa74..8c347513 100644
--- a/default/generated/camel3/22-xml-moved-components.windup.yaml
+++ b/default/generated/camel3/22-xml-moved-components.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The classes from `org.apache.camel.util.component` have been moved
-    All the classes from `org.apache.camel.util.component` have been moved to `org.apache.camel.support.component`.. `org.apache.camel:camel-support` is a transitive dependency of `camel-core` but it could be used also separately to trim the application size.
+  description: The classes from `org.apache.camel.util.component` have been moved
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -10,10 +8,10 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: All the classes from `org.apache.camel.util.component` have been moved
-    to `org.apache.camel.support.component`.. `org.apache.camel:camel-support` is
+  message: "All the classes from `org.apache.camel.util.component` have been moved
+    to `org.apache.camel.support.component`.\n `org.apache.camel:camel-support` is
     a transitive dependency of `camel-core` but it could be used also separately to
-    trim the application size.
+    trim the application size.\n "
   ruleID: xml-moved-components-00012
   when:
     as: javaClass
@@ -25,8 +23,7 @@
   - name: moved
     nameOfCaptureGroup: moved
     pattern: org.apache.camel.impl.(?P<moved>(CamelPostProcessorHelper|DefaultAsyncProcessorAwaitManager|DefaultCamelBeanPostProcessor|DefaultCamelContextNameStrategy|DefaultClaimCheckRepository|DefaultClassResolver|DefaultComponentResolver|DefaultConsumerTemplate|DefaultDataFormatResolver|DefaultEndpointRegistry|DefaultEndpointUtilizationStatistics|DefaultFactoryFinder|DefaultFactoryFinderResolver|DefaultHeadersMapFactory|DefaultInflightRepository|DefaultInjector|DefaultLanguageResolver|DefaultManagementNameStrategy|DefaultMessageHistoryFactory|DefaultNodeIdFactory|DefaultPackageScanClassResolver|DefaultProcessorFactory|DefaultProducerTemplate|DefaultRoute|DefaultRouteContext|DefaultRouteController|DefaultRouteError|DefaultRouteStartupOrder|DefaultRuntimeEndpointRegistry|DefaultShutdownStrategy|DefaultStreamCachingStrategy|DefaultTransformerRegistry|DefaultUnitOfWork|DefaultUnitOfWorkFactory|DefaultUuidGenerator|DefaultValidatorRegistry|DeferProducer|DeferServiceStartupListener|DurationRoutePolicy|DurationRoutePolicyFactory|EndpointKey|EventDrivenConsumerRoute|EventNotifierCallback|ExplicitCamelContextNameStrategy|FileStateRepository|HashMapHeadersMapFactory|HeadersMapFactoryResolver|InterceptSendToEndpointProcessor|InterceptSendToMockEndpointStrategy|JavaUuidGenerator|LimitedPollingConsumerPollStrategy|MDCUnitOfWork|MemoryStateRepository|SubscribeMethodProcessor|SupervisingRouteController|SupervisingRouteController.FilterResult|SupervisingRouteControllerFilters|SupervisingRouteControllerFilters.BlackList|TypedProcessorFactory|WebSpherePackageScanClassResolver))
-  description: |
-    `org.apache.camel.impl.{moved}` class has been moved
+  description: '`org.apache.camel.impl.{moved}` class has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -34,10 +31,10 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: The class `org.apache.camel.impl.{{moved}}` has been moved to `org.apache.camel.impl.engine`
-    package in `camel-base` dependency.. `org.apache.camel:camel-base` is a transitive
+  message: "The class `org.apache.camel.impl.{{moved}}` has been moved to `org.apache.camel.impl.engine`
+    package in `camel-base` dependency.\n `org.apache.camel:camel-base` is a transitive
     dependency of `camel-core` but it could be used also separately to trim the application
-    size.
+    size.\n "
   ruleID: xml-moved-components-00013
   when:
     as: javaClass
@@ -46,9 +43,7 @@
       pattern: org.apache.camel.impl.(CamelPostProcessorHelper|DefaultAsyncProcessorAwaitManager|DefaultCamelBeanPostProcessor|DefaultCamelContextNameStrategy|DefaultClaimCheckRepository|DefaultClassResolver|DefaultComponentResolver|DefaultConsumerTemplate|DefaultDataFormatResolver|DefaultEndpointRegistry|DefaultEndpointUtilizationStatistics|DefaultFactoryFinder|DefaultFactoryFinderResolver|DefaultHeadersMapFactory|DefaultInflightRepository|DefaultInjector|DefaultLanguageResolver|DefaultManagementNameStrategy|DefaultMessageHistoryFactory|DefaultNodeIdFactory|DefaultPackageScanClassResolver|DefaultProcessorFactory|DefaultProducerTemplate|DefaultRoute|DefaultRouteContext|DefaultRouteController|DefaultRouteError|DefaultRouteStartupOrder|DefaultRuntimeEndpointRegistry|DefaultShutdownStrategy|DefaultStreamCachingStrategy|DefaultTransformerRegistry|DefaultUnitOfWork|DefaultUnitOfWorkFactory|DefaultUuidGenerator|DefaultValidatorRegistry|DeferProducer|DeferServiceStartupListener|DurationRoutePolicy|DurationRoutePolicyFactory|EndpointKey|EventDrivenConsumerRoute|EventNotifierCallback|ExplicitCamelContextNameStrategy|FileStateRepository|HashMapHeadersMapFactory|HeadersMapFactoryResolver|InterceptSendToEndpointProcessor|InterceptSendToMockEndpointStrategy|JavaUuidGenerator|LimitedPollingConsumerPollStrategy|MDCUnitOfWork|MemoryStateRepository|SubscribeMethodProcessor|SupervisingRouteController|SupervisingRouteController.FilterResult|SupervisingRouteControllerFilters|SupervisingRouteControllerFilters.BlackList|TypedProcessorFactory|WebSpherePackageScanClassResolver)
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel.main.Main` class has been moved
-    The class `org.apache.camel.main.Main` has been moved out of `org.apache.camel:camel-core` and into its own JAR named `org.apache.camel:camel-main`.. `org.apache.camel:camel-main` has to be added as a dependency to your project pom.xml file
+  description: '`org.apache.camel.main.Main` class has been moved'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -56,9 +51,9 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: The class `org.apache.camel.main.Main` has been moved out of `org.apache.camel:camel-core`
-    and into its own JAR named `org.apache.camel:camel-main`.. `org.apache.camel:camel-main`
-    has to be added as a dependency to your project pom.xml file
+  message: "The class `org.apache.camel.main.Main` has been moved out of `org.apache.camel:camel-core`
+    and into its own JAR named `org.apache.camel:camel-main`.\n `org.apache.camel:camel-main`
+    has to be added as a dependency to your project pom.xml file\n "
   ruleID: xml-moved-components-00014
   when:
     as: javaClass
@@ -67,9 +62,7 @@
       pattern: org.apache.camel.main.Main
 - category: potential
   customVariables: []
-  description: |-
-    JMX is disable by default
-    If you run Camel standalone with just `camel-core` as a dependency, and you want JMX enabled out of the box, then you need to add `org.apache.camel:camel-management` as a dependency.
+  description: JMX is disable by default
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -77,9 +70,9 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: If you run Camel standalone with just `camel-core` as a dependency, and
+  message: "If you run Camel standalone with just `camel-core` as a dependency, and
     you want JMX enabled out of the box, then you need to add `org.apache.camel:camel-management`
-    as a dependency.
+    as a dependency.\n "
   ruleID: xml-moved-components-00015
   when:
     as: dependencies-block
diff --git a/default/generated/camel3/23-xml-removed-components.windup.yaml b/default/generated/camel3/23-xml-removed-components.windup.yaml
index 51c3a5d4..809ba59a 100644
--- a/default/generated/camel3/23-xml-removed-components.windup.yaml
+++ b/default/generated/camel3/23-xml-removed-components.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-linkedin` artifact has been removed
-    `org.apache.camel:camel-linkedin` artifact has been removed in Apache Camel 3 so it won't be available
+  description: '`org.apache.camel:camel-linkedin` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -21,9 +19,7 @@
       name: org.apache.camel.camel-linkedin
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-linkedin-starter` artifact has been removed
-    `org.apache.camel:camel-linkedin-starter` artifact has been removed in Apache Camel 3 so it won't be available
+  description: '`org.apache.camel:camel-linkedin-starter` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -42,9 +38,7 @@
       name: org.apache.camel.camel-linkedin-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-script` artifact has been removed
-    `org.apache.camel:camel-script` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 as there is no support for javax.script, which is also deprecated in the JDK and to be removed from Java 11 onwards.
+  description: '`org.apache.camel:camel-script` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -64,9 +58,7 @@
       name: org.apache.camel.camel-script
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-script-starter` artifact has been removed
-    `org.apache.camel:camel-script-starter` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 as there is no support for javax.script, which is also deprecated in the JDK and to be removed from Java 11 onwards.
+  description: '`org.apache.camel:camel-script-starter` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -86,9 +78,7 @@
       name: org.apache.camel.camel-script-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-jibx` artifact has been removed
-    `org.apache.camel:camel-jibx` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 because it did not support JDK8.
+  description: '`org.apache.camel:camel-jibx` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -107,9 +97,7 @@
       name: org.apache.camel.camel-jibx
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-jibx-starter` artifact has been removed
-    `org.apache.camel:camel-jibx-starter` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 because it did not support JDK8.
+  description: '`org.apache.camel:camel-jibx-starter` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -128,9 +116,7 @@
       name: org.apache.camel.camel-jibx-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-boon` artifact has been removed
-    `org.apache.camel:camel-boon` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 because it did not support JDK9 and later.
+  description: '`org.apache.camel:camel-boon` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -149,9 +135,7 @@
       name: org.apache.camel.camel-boon
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-boon-starter` artifact has been removed
-    `org.apache.camel:camel-boon-starter` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3 because it did not support JDK9 and later.
+  description: '`org.apache.camel:camel-boon-starter` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -171,9 +155,7 @@
       name: org.apache.camel.camel-boon-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `twitter-streaming` component has been removed
-    `twitter-streaming` component has been deprecated in Apache Camel 2 and removed in Apache Camel 3 because it relied on the deprecated Twitter Streaming API and is no longer functional.
+  description: '`twitter-streaming` component has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -191,7 +173,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: from\("twitter-streaming:.*
+        pattern: from("twitter-streaming:.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/spring
@@ -202,9 +184,7 @@
         xpath: //*/c:from/@uri[matches(self::node(), 'twitter-streaming:{*}')]
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-restlet` artifact has been removed
-    `org.apache.camel:camel-restlet` artifact has been deprecated in Apache Camel 2 and removed in Apache Camel 3. Use any of the other REST capable components, such as `camel-rest`, `camel-jetty`, `camel-netty-http` or `camel-undertow`
+  description: '`org.apache.camel:camel-restlet` artifact has been removed'
   effort: 3
   labels:
   - konveyor.io/source=camel2
@@ -226,9 +206,7 @@
       name: org.apache.camel.camel-restlet
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-core-starter` artifact has been removed
-    `org.apache.camel:camel-core-starter` artifact has been removed and split into several modules. Please add the relevant starter artifacts to your pom.xml file.
+  description: '`org.apache.camel:camel-core-starter` artifact has been removed'
   effort: 7
   labels:
   - konveyor.io/source=camel2
@@ -248,9 +226,7 @@
       name: org.apache.camel.camel-core-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-maven-plugin` has been split
-    The `camel-maven-plugin` has been split up into two Maven plugins: `camel-maven-plugin` and `camel-report-maven-plugin`. The `camel-maven-plugin` contains the `run` goal which is intended for quickly running Camel applications. The `camel-report-maven-plugin` has the `validate` and `route-coverage` goals which is used for generating reports of your Camel projects by validating Camel endpoint URIs and performing route coverage reports. Please use the `org.apache.camel:camel-report-maven-plugin` in this case.
+  description: '`org.apache.camel:camel-maven-plugin` has been split'
   effort: 1
   labels:
   - konveyor.io/source=camel2
diff --git a/default/generated/camel3/24-xml-renamed-components.windup.yaml b/default/generated/camel3/24-xml-renamed-components.windup.yaml
index 11d6fdfb..76361246 100644
--- a/default/generated/camel3/24-xml-renamed-components.windup.yaml
+++ b/default/generated/camel3/24-xml-renamed-components.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-http4` artifact has been renamed
-    `org.apache.camel:camel-http4` artifact has been renamed in Apache Camel 3 to `org.apache.camel:camel-http` artifact
+  description: '`org.apache.camel:camel-http4` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -21,9 +19,7 @@
       name: org.apache.camel.camel-http4
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-http4-starter` artifact has been renamed
-    `org.apache.camel:camel-http4-starter` artifact has been renamed in Apache Camel 3 to `org.apache.camel.springboot:camel-http-starter` artifact
+  description: '`org.apache.camel:camel-http4-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -42,9 +38,7 @@
       name: org.apache.camel.camel-http4-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-rxjava2` artifact has been renamed
-    `org.apache.camel:camel-rxjava2` artifact has been renamed in Apache Camel 3 to `org.apache.camel:camel-rxjava` artifact
+  description: '`org.apache.camel:camel-rxjava2` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -63,9 +57,7 @@
       name: org.apache.camel.camel-rxjava2
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-rxjava2-starter` artifact has been renamed
-    `org.apache.camel:camel-rxjava2-starter` artifact has been renamed in Apache Camel 3 to `org.apache.camel.springboot:camel-rxjava-starter` artifact
+  description: '`org.apache.camel:camel-rxjava2-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -84,8 +76,8 @@
       name: org.apache.camel.camel-rxjava2-starter
 - category: mandatory
   customVariables: []
-  description: |
-    `org.apache.camel:camel-{substitution}-starter` artifact has been renamed
+  description: '`org.apache.camel:camel-{substitution}-starter` artifact has been
+    renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -106,9 +98,7 @@
       name: org.apache.camel.camel-{substitution}-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mongodb3` artifact has been renamed
-    `org.apache.camel:camel-mongodb3` artifact has been renamed to `org.apache.camel:camel-mongodb`. It’s corresponding component package was renamed from `org.apache.camel.component.mongodb3` to `org.apache.camel.component.mongodb`. The supported scheme is now `mongodb`.
+  description: '`org.apache.camel:camel-mongodb3` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -128,9 +118,7 @@
       name: org.apache.camel.camel-mongodb3
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mongodb3-starter` artifact has been renamed
-    `org.apache.camel:camel-mongodb3-starter` artifact has been renamed to `org.apache.camel.springboot:camel-mongodb-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.mongodb3` to `org.apache.camel.component.mongodb`. The supported scheme is now `mongodb`.
+  description: '`org.apache.camel:camel-mongodb3-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -151,9 +139,7 @@
       name: org.apache.camel.camel-mongodb3-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-hdfs2` artifact has been renamed
-    `org.apache.camel:camel-hdfs2` artifact has been renamed to `org.apache.camel:camel-hdfs`. It’s corresponding component package was renamed from `org.apache.camel.component.hdfs2` to `org.apache.camel.component.hdfs`. The supported scheme is now `hdfs`.
+  description: '`org.apache.camel:camel-hdfs2` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -173,9 +159,7 @@
       name: org.apache.camel.camel-hdfs2
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-hdfs2-starter` artifact has been renamed
-    `org.apache.camel:camel-hdfs2-starter` artifact has been renamed to `org.apache.camel.springboot:camel-hdfs-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.hdfs2` to `org.apache.camel.component.hdfs`. The supported scheme is now `hdfs`.
+  description: '`org.apache.camel:camel-hdfs2-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -195,9 +179,7 @@
       name: org.apache.camel.camel-hdfs2-starter
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-hdfs` artifact has been replaced
-    In Camel 3, the `org.apache.camel:camel-hdfs` artifact has the same implementation as the Camel 2 `org.apache.camel:camel-hdfs2` artifact. The component now depends on Hadoop 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-hdfs` artifact has been replaced'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -217,9 +199,7 @@
       upperbound: "2"
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-hdfs-starter` artifact has been renamed
-    `org.apache.camel:camel-hdfs-starter` artifact has been renamed to `org.apache.camel.springboot:camel-hdfs-starter`. The component now depends on Hadoop 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-hdfs-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -238,9 +218,7 @@
       name: org.apache.camel.camel-hdfs-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mina2` artifact has been renamed
-    `org.apache.camel:camel-mina2` artifact has been renamed to `org.apache.camel:camel-mina`. It’s corresponding component package was renamed from `org.apache.camel.component.mina2` to `org.apache.camel.component.mina`. The supported scheme is now `mina`.
+  description: '`org.apache.camel:camel-mina2` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -260,9 +238,7 @@
       name: org.apache.camel.camel-mina2
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mina2-starter` artifact has been renamed
-    `org.apache.camel:camel-mina2-starter` artifact has been renamed to `org.apache.camel.springboot:camel-mina-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.mina2` to `org.apache.camel.component.mina`. The supported scheme is now `mina`.
+  description: '`org.apache.camel:camel-mina2-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -282,9 +258,7 @@
       name: org.apache.camel.camel-mina2-starter
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mina` artifact has been replaced
-    In Camel 3, the `org.apache.camel:camel-mina` artifact has the same implementation as the Camel 2 `org.apache.camel:camel-mina2` artifact. The component now depends on Mina 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-mina` artifact has been replaced'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -304,9 +278,7 @@
       upperbound: "2"
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-mina-starter` artifact has been renamed
-    `org.apache.camel:camel-mina-starter` artifact has been renamed to `org.apache.camel.springboot:camel-mina-starter`. The component now depends on Mina 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-mina-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -325,9 +297,7 @@
       name: org.apache.camel.camel-mina-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty4` artifact has been renamed
-    `org.apache.camel:camel-netty4` artifact has been renamed to `org.apache.camel:camel-netty`. It’s corresponding component package was renamed from `org.apache.camel.component.netty4` to `org.apache.camel.component.netty`. The supported scheme is now `netty`.
+  description: '`org.apache.camel:camel-netty4` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -347,9 +317,7 @@
       name: org.apache.camel.camel-netty4
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty4-starter` artifact has been renamed
-    `org.apache.camel:camel-netty4-starter` artifact has been renamed to `org.apache.camel.springboot:camel-netty-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.netty4` to `org.apache.camel.component.netty`. The supported scheme is now `netty`.
+  description: '`org.apache.camel:camel-netty4-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -369,9 +337,7 @@
       name: org.apache.camel.camel-netty4-starter
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty` artifact has been replaced
-    In Camel 3, the `org.apache.camel:camel-netty` artifact has the same implementation as the Camel 2 `org.apache.camel:camel-netty4` artifact. The component now depends on Netty 4.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-netty` artifact has been replaced'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -391,9 +357,7 @@
       upperbound: "2"
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty-starter` artifact has been renamed
-    `org.apache.camel:camel-netty-starter` artifact has been renamed to `org.apache.camel.springboot:camel-netty-starter` artifact. The component now depends on Netty 4.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-netty-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -412,9 +376,7 @@
       name: org.apache.camel.camel-netty-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty4-http` artifact has been renamed
-    `org.apache.camel:camel-netty4-http` artifact has been renamed to `org.apache.camel:camel-netty-http`. It’s corresponding component package was renamed from `org.apache.camel.component.netty4.http` to `org.apache.camel.component.netty.http`. The supported scheme is now `netty-http`.
+  description: '`org.apache.camel:camel-netty4-http` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -434,9 +396,7 @@
       name: org.apache.camel.camel-netty4-http
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty4-http-starter` artifact has been renamed
-    `org.apache.camel:camel-netty4-http` artifact has been renamed to `org.apache.camel.springboot:camel-netty-http-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.netty4.http` to `org.apache.camel.component.netty.http`. The supported scheme is now `netty-http`.
+  description: '`org.apache.camel:camel-netty4-http-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -456,9 +416,7 @@
       name: org.apache.camel.camel-netty4-http-starter
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty-http` artifact has been replaced
-    In Camel 3, the `org.apache.camel:camel-netty-http` artifact has the same implementation as the Camel 2 `org.apache.camel:camel-netty4-http` artifact. The component now depends on Netty 4.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-netty-http` artifact has been replaced'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -478,9 +436,7 @@
       upperbound: "2"
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-netty-http-starter` artifact has been renamed
-    `org.apache.camel:camel-netty-http-starter` artifact has been renamed to `org.apache.camel.springboot:camel-netty-http-starter`. The component now depends on Netty 4.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-netty-http-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -500,9 +456,7 @@
       name: org.apache.camel.camel-netty-http-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-quartz2` artifact has been renamed
-    `org.apache.camel:camel-quartz2` artifact has been renamed to `org.apache.camel:camel-quartz`. It’s corresponding component package was renamed from `org.apache.camel.component.quartz2` to `org.apache.camel.component.quartz`. The supported scheme is now `quartz`.
+  description: '`org.apache.camel:camel-quartz2` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -522,9 +476,7 @@
       name: org.apache.camel.camel-quartz2
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-quartz2-starter` artifact has been renamed
-    `org.apache.camel:camel-quartz2-starter` artifact has been renamed to `org.apache.camel.springboot:camel-quartz-starter`. It’s corresponding component package was renamed from `org.apache.camel.component.quartz2` to `org.apache.camel.component.quartz`. The supported scheme is now `quartz`.
+  description: '`org.apache.camel:camel-quartz2-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -545,9 +497,7 @@
       name: org.apache.camel.camel-quartz2-starter
 - category: potential
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-quartz` artifact has been replaced
-    In Camel 3, the `org.apache.camel:camel-quartz` artifact has the same implementation as the Camel 2 `org.apache.camel:camel-quartz2` artifact. The component now depends on Quartz 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-quartz` artifact has been replaced'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -567,9 +517,7 @@
       upperbound: "2"
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-quartz-starter` artifact has been renamed
-    `org.apache.camel:camel-quartz-starter` artifact has been renamed to `org.apache.camel.springboot:camel-quartz-starter`. The component now depends on Quartz 2.x, upgrade efforts may vary.
+  description: '`org.apache.camel:camel-quartz-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -588,9 +536,7 @@
       name: org.apache.camel.camel-quartz-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-jetty9` artifact has been renamed
-    `org.apache.camel:camel-jetty9` artifact has been renamed to `org.apache.camel:camel-jetty`.
+  description: '`org.apache.camel:camel-jetty9` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -608,9 +554,7 @@
       name: org.apache.camel.camel-jetty9
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.camel:camel-jetty9-starter` artifact has been renamed
-    `org.apache.camel:camel-jetty9-starter` artifact has been renamed to `org.apache.camel.springboot:camel-jetty-starter`.
+  description: '`org.apache.camel:camel-jetty9-starter` artifact has been renamed'
   effort: 1
   labels:
   - konveyor.io/source=camel2
@@ -628,9 +572,7 @@
       name: org.apache.camel.camel-jetty9-starter
 - category: mandatory
   customVariables: []
-  description: |-
-    `org.apache.activemq:activemq-camel` artifact has been moved
-    The `org.apache.activemq:activemq-camel` artifact has been moved to `org.apache.camel:camel-activemq`, where the component name has changed from `org.apache.activemq.camel.component.ActiveMQComponent` to `org.apache.camel.component.activemq.ActiveMQComponent`.
+  description: '`org.apache.activemq:activemq-camel` artifact has been moved'
   effort: 3
   labels:
   - konveyor.io/source=camel2
diff --git a/default/generated/cloud-readiness/02-java-corba.windup.yaml b/default/generated/cloud-readiness/02-java-corba.windup.yaml
deleted file mode 100644
index 036689bb..00000000
--- a/default/generated/cloud-readiness/02-java-corba.windup.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- category: optional
-  customVariables: []
-  description: |-
-    CORBA
-    Common Object Request Broker Architecture (CORBA) found in the application. CORBA is not recommended in cloud environments. Try to replace it with a more modern technology.
-  effort: 5
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/target=cloud-readiness
-  - corba
-  links: []
-  message: Common Object Request Broker Architecture (CORBA) found in the application.
-    CORBA is not recommended in cloud environments. Try to replace it with a more
-    modern technology.
-  ruleID: java-corba-00000
-  when:
-    or:
-    - java.referenced:
-        location: PACKAGE
-        pattern: com.sun.corba*
-    - java.referenced:
-        location: PACKAGE
-        pattern: org.omg.CORBA*
-    - java.referenced:
-        location: PACKAGE
-        pattern: com.iona.corba*
diff --git a/default/generated/cloud-readiness/03-java-rmi.windup.yaml b/default/generated/cloud-readiness/03-java-rmi.windup.yaml
deleted file mode 100644
index 200c2bcd..00000000
--- a/default/generated/cloud-readiness/03-java-rmi.windup.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    Java Remote Method Invocation (RMI) service
-    Java RMI is a tightly coupled service. Tight coupling is not suitable in a cloud environment because of scalability problems.. Recommendations. Use Java EE standard or loosely coupled protocols for backing service interactions:. ** Message-based communication (JMS) for asynchronous use cases. ** HTTP-based protocol or API (JAX-RS and JAX-WS) for synchronous use cases. When used with load-balancing, both options ensure scalability and high availability.
-  effort: 1
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=rmi
-  - konveyor.io/target=cloud-readiness
-  - cloud-readiness
-  - rmi
-  links:
-  - title: Twelve-factor app - Backing services
-    url: https://12factor.net/backing-services
-  message: Java RMI is a tightly coupled service. Tight coupling is not suitable in
-    a cloud environment because of scalability problems.. Recommendations. Use Java
-    EE standard or loosely coupled protocols for backing service interactions:. **
-    Message-based communication (JMS) for asynchronous use cases. ** HTTP-based protocol
-    or API (JAX-RS and JAX-WS) for synchronous use cases. When used with load-balancing,
-    both options ensure scalability and high availability.
-  ruleID: java-rmi-00000
-  tag:
-  - Java Remote Method Invocation (RMI) service
-  when:
-    java.referenced:
-      location: INHERITANCE
-      pattern: java.rmi.Remote
-- customVariables: []
-  description: "Java Remote Method Invocation (RMI) API\n\n                            The
-    Java RMI API is tightly coupled. Tight coupling is not suitable in a cloud environment
-    because of scalability problems.\n\n                            Use a RESTful
-    API or a message queue.\n                            \n"
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=rmi
-  - konveyor.io/target=cloud-readiness
-  - cloud-readiness
-  - rmi
-  links: []
-  ruleID: java-rmi-00001
-  tag:
-  - rmi
-  - Java Remote Method Invocation (RMI) API
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: java.rmi*
diff --git a/default/generated/cloud-readiness/05-jca.windup.yaml b/default/generated/cloud-readiness/05-jca.windup.yaml
deleted file mode 100644
index 414786cb..00000000
--- a/default/generated/cloud-readiness/05-jca.windup.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- category: optional
-  customVariables: []
-  description: |-
-    Resource adapter descriptor (ra.xml)
-    The application contains an embedded resource adapter descriptor ('ra.xml'), which implements the Java Connector Architecture (JCA) for certain Enterprise Information Systems (EIS).. JCA often uses tightly coupled interactions between the connector and the application. Tight coupling is not suitable in a cloud environment because of scalability problems.. Recommendation: Review the purpose of the resource adapter to determine whether it is required in a cloud environment.
-  effort: 1
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - jca
-  links:
-  - title: Resource adapter compatibility with JBoss EAP
-    url: https://access.redhat.com/solutions/2476751
-  - title: Red Hat JBoss EAP 7 documentation - Deploying a Generic JMS Resource Adapter
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuring_messaging/index#deploy_configure_generic_jms_resource_adapter
-  message: 'The application contains an embedded resource adapter descriptor (''ra.xml''),
-    which implements the Java Connector Architecture (JCA) for certain Enterprise
-    Information Systems (EIS).. JCA often uses tightly coupled interactions between
-    the connector and the application. Tight coupling is not suitable in a cloud environment
-    because of scalability problems.. Recommendation: Review the purpose of the resource
-    adapter to determine whether it is required in a cloud environment.'
-  ruleID: jca-00000
-  when:
-    builtin.file:
-      pattern: ra\.xml
diff --git a/default/generated/cloud-readiness/06-jni-native-code.windup.yaml b/default/generated/cloud-readiness/06-jni-native-code.windup.yaml
deleted file mode 100644
index 8accfae1..00000000
--- a/default/generated/cloud-readiness/06-jni-native-code.windup.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    Java native libraries (JNI, JNA)
-    Java native libraries might not run in a cloud or container environment.. Recommendations. * Review the purpose of the native library in your application.. * Check whether the native library is compatible with a cloud environment.. * Reuse or embed the native library or application in a cloud environment, for example, in a JBoss module.. * Replace, remove, or rewrite the native library or application using a cloud-compatible equivalent.
-  effort: 7
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - jni
-  links:
-  - title: How to load native libraries and access them via JNI in EAP (with or without
-      a module)
-    url: https://access.redhat.com/solutions/229443
-  - title: Is it supported to compile the JNI code as 32-bit shared libraries and
-      use it in 64-bit compiled Java code ?
-    url: https://access.redhat.com/solutions/1444643
-  message: Java native libraries might not run in a cloud or container environment..
-    Recommendations. * Review the purpose of the native library in your application..
-    * Check whether the native library is compatible with a cloud environment.. *
-    Reuse or embed the native library or application in a cloud environment, for example,
-    in a JBoss module.. * Replace, remove, or rewrite the native library or application
-    using a cloud-compatible equivalent.
-  ruleID: jni-native-code-00000
-  when:
-    or:
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.lang.System.load*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.lang.System.loadLibrary*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.lang.System.mapLibraryName*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.lang.Runtime.load*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.lang.Runtime.loadLibrary*
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: com.sun.jna*
-    - java.referenced:
-        location: IMPORT
-        pattern: com.sun.jna*
-    - java.referenced:
-        location: INHERITANCE
-        pattern: com.sun.jna*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: com.sun.jna*
-    - java.referenced:
-        location: VARIABLE_DECLARATION
-        pattern: com.sun.jna*
-- category: mandatory
-  customVariables: []
-  description: |-
-    Java Native Processes
-    Native Processes might not run in a cloud or container environment.. Recommendations. * Review the purpose of the native process in your application.. * Check whether the native process is compatible with a cloud environment.. * Replace, remove, or rewrite the native process or application using a cloud-compatible equivalent.
-  effort: 7
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - jni
-  links: []
-  message: Native Processes might not run in a cloud or container environment.. Recommendations.
-    * Review the purpose of the native process in your application.. * Check whether
-    the native process is compatible with a cloud environment.. * Replace, remove,
-    or rewrite the native process or application using a cloud-compatible equivalent.
-  ruleID: jni-native-code-00001
-  when:
-    or:
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: java.lang.Process
-    - java.referenced:
-        location: IMPORT
-        pattern: java.lang.Process
-    - java.referenced:
-        location: INHERITANCE
-        pattern: java.lang.Process
-    - java.referenced:
-        location: VARIABLE_DECLARATION
-        pattern: java.lang.Process
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: java.lang.ProcessBuilder
-    - java.referenced:
-        location: IMPORT
-        pattern: java.lang.ProcessBuilder
-    - java.referenced:
-        location: INHERITANCE
-        pattern: java.lang.ProcessBuilder
-    - java.referenced:
-        location: VARIABLE_DECLARATION
-        pattern: java.lang.ProcessBuilder
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: java.lang.ProcessHandle
-    - java.referenced:
-        location: IMPORT
-        pattern: java.lang.ProcessHandle
-    - java.referenced:
-        location: INHERITANCE
-        pattern: java.lang.ProcessHandle
-    - java.referenced:
-        location: VARIABLE_DECLARATION
-        pattern: java.lang.ProcessHandle
diff --git a/default/generated/cloud-readiness/07-local-storage.windup.yaml b/default/generated/cloud-readiness/07-local-storage.windup.yaml
deleted file mode 100644
index 22a26896..00000000
--- a/default/generated/cloud-readiness/07-local-storage.windup.yaml
+++ /dev/null
@@ -1,188 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    File system - Java IO
-    An application running inside a container could lose access to a file in local storage.. Recommendations. The following recommendations depend on the function of the file in local storage:. * Logging: Log to standard output and use a centralized log collector to analyze the logs.. * Caching: Use a cache backing service.. * Configuration: Store configuration settings in environment variables so that they can be updated without code changes.. * Data storage: Use a database backing service for relational data or use a persistent data storage system.. * Temporary data storage: Use the file system of a running container as a brief, single-transaction cache.
-  effort: 1
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - storage
-  links:
-  - title: 'Twelve-Factor App: Logs'
-    url: https://12factor.net/logs
-  - title: 'OpenShift Container Platform: Understanding cluster logging'
-    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
-  - title: 'Twelve-Factor App: Backing services'
-    url: https://12factor.net/backing-services
-  - title: 'Twelve-Factor App: Config'
-    url: https://12factor.net/config
-  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
-    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
-  - title: 'OpenShift Container Platform: Understanding persistent storage'
-    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
-  message: 'An application running inside a container could lose access to a file
-    in local storage.. Recommendations. The following recommendations depend on the
-    function of the file in local storage:. * Logging: Log to standard output and
-    use a centralized log collector to analyze the logs.. * Caching: Use a cache backing
-    service.. * Configuration: Store configuration settings in environment variables
-    so that they can be updated without code changes.. * Data storage: Use a database
-    backing service for relational data or use a persistent data storage system..
-    * Temporary data storage: Use the file system of a running container as a brief,
-    single-transaction cache.'
-  ruleID: local-storage-00001
-  when:
-    or:
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: java.io.(FileWriter|FileReader|PrintStream|File|PrintWriter|RandomAccessFile)*
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: java.util.zip.ZipFile*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.io.File.createTempFile*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: java.nio.file.Paths.get*
-- category: mandatory
-  customVariables:
-  - name: class
-    nameOfCaptureGroup: class
-    pattern: java.net.(?P<class>(URL|URI))?(.*)
-  description: |-
-    File system - java.net.URL/URI
-    An application running inside a container could lose access to a file in local storage.. Recommendations. The following recommendations depend on the function of the file in local storage:. * Logging: Log to standard output and use a centralized log collector to analyze the logs.. * Caching: Use a cache backing service.. * Configuration: Store configuration settings in environment variables so that they can be updated without code changes.. * Data storage: Use a database backing service for relational data or use a persistent data storage system.. * Temporary data storage: Use the file system of a running container as a brief, single-transaction cache.
-  effort: 1
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - storage
-  links:
-  - title: 'Twelve-Factor App: Logs'
-    url: https://12factor.net/logs
-  - title: 'OpenShift Container Platform: Understanding cluster logging'
-    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
-  - title: 'Twelve-Factor App: Backing services'
-    url: https://12factor.net/backing-services
-  - title: 'Twelve-Factor App: Config'
-    url: https://12factor.net/config
-  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
-    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
-  - title: 'OpenShift Container Platform: Understanding persistent storage'
-    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
-  message: 'An application running inside a container could lose access to a file
-    in local storage.. Recommendations. The following recommendations depend on the
-    function of the file in local storage:. * Logging: Log to standard output and
-    use a centralized log collector to analyze the logs.. * Caching: Use a cache backing
-    service.. * Configuration: Store configuration settings in environment variables
-    so that they can be updated without code changes.. * Data storage: Use a database
-    backing service for relational data or use a persistent data storage system..
-    * Temporary data storage: Use the file system of a running container as a brief,
-    single-transaction cache.'
-  ruleID: local-storage-00002
-  when:
-    java.referenced:
-      location: CONSTRUCTOR_CALL
-      pattern: java.net.(URL|URI)*
-- category: mandatory
-  customVariables: []
-  description: |-
-    File system - 'file://' scheme
-    An application running inside a container could lose access to a file in local storage.. Recommendations. The following recommendations depend on the function of the file in local storage:. * Logging: Log to standard output and use a centralized log collector to analyze the logs.. * Caching: Use a cache backing service.. * Configuration: Store configuration settings in environment variables so that they can be updated without code changes.. * Data storage: Use a database backing service for relational data or use a persistent data storage system.. * Temporary data storage: Use the file system of a running container as a brief, single-transaction cache.
-  effort: 1
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - storage
-  links:
-  - title: 'Twelve-Factor App: Logs'
-    url: https://12factor.net/logs
-  - title: 'OpenShift Container Platform: Understanding cluster logging'
-    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
-  - title: 'Twelve-Factor App: Backing services'
-    url: https://12factor.net/backing-services
-  - title: 'Twelve-Factor App: Config'
-    url: https://12factor.net/config
-  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
-    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
-  - title: 'OpenShift Container Platform: Understanding persistent storage'
-    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
-  message: 'An application running inside a container could lose access to a file
-    in local storage.. Recommendations. The following recommendations depend on the
-    function of the file in local storage:. * Logging: Log to standard output and
-    use a centralized log collector to analyze the logs.. * Caching: Use a cache backing
-    service.. * Configuration: Store configuration settings in environment variables
-    so that they can be updated without code changes.. * Data storage: Use a database
-    backing service for relational data or use a persistent data storage system..
-    * Temporary data storage: Use the file system of a running container as a brief,
-    single-transaction cache.'
-  ruleID: local-storage-00004
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(\\\.java|\\\.properties|\\\.jsp|\\\.jspf|\\\.tag|[^pom]\\\.xml|\\\.txt)
-      pattern: file://
-- category: mandatory
-  customVariables: []
-  description: |-
-    File system - Java NIO
-    An application running inside a container could lose access to a file in local storage.. Recommendations. The following recommendations depend on the function of the file in local storage:. * Logging: Log to standard output and use a centralized log collector to analyze the logs.. * Caching: Use a cache backing service.. * Configuration: Store configuration settings in environment variables so that they can be updated without code changes.. * Data storage: Use a database backing service for relational data or use a persistent data storage system.. * Temporary data storage: Use the file system of a running container as a brief, single-transaction cache.
-  effort: 1
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - storage
-  links: []
-  message: 'An application running inside a container could lose access to a file
-    in local storage.. Recommendations. The following recommendations depend on the
-    function of the file in local storage:. * Logging: Log to standard output and
-    use a centralized log collector to analyze the logs.. * Caching: Use a cache backing
-    service.. * Configuration: Store configuration settings in environment variables
-    so that they can be updated without code changes.. * Data storage: Use a database
-    backing service for relational data or use a persistent data storage system..
-    * Temporary data storage: Use the file system of a running container as a brief,
-    single-transaction cache.'
-  ruleID: local-storage-00005
-  when:
-    or:
-    - java.referenced:
-        location: IMPORT
-        pattern: java.nio.channels.AsynchronousFileChannel*
-    - java.referenced:
-        location: IMPORT
-        pattern: java.nio.channels.FileChannel*
-    - java.referenced:
-        location: IMPORT
-        pattern: java.nio.channels.FileLock*
-    - java.referenced:
-        location: IMPORT
-        pattern: java.nio.file*
-- category: mandatory
-  customVariables: []
-  description: |-
-    Apache Commons I/O
-    An application running inside a container could lose access to a file in local storage.. Recommendations. The following recommendations depend on the function of the file in local storage:. * Logging: Log to standard output and use a centralized log collector to analyze the logs.. * Caching: Use a cache backing service.. * Configuration: Store configuration settings in environment variables so that they can be updated without code changes.. * Data storage: Use a database backing service for relational data or use a persistent data storage system.. * Temporary data storage: Use the file system of a running container as a brief, single-transaction cache.
-  effort: 1
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - storage
-  links: []
-  message: 'An application running inside a container could lose access to a file
-    in local storage.. Recommendations. The following recommendations depend on the
-    function of the file in local storage:. * Logging: Log to standard output and
-    use a centralized log collector to analyze the logs.. * Caching: Use a cache backing
-    service.. * Configuration: Store configuration settings in environment variables
-    so that they can be updated without code changes.. * Data storage: Use a database
-    backing service for relational data or use a persistent data storage system..
-    * Temporary data storage: Use the file system of a running container as a brief,
-    single-transaction cache.'
-  ruleID: local-storage-00006
-  when:
-    or:
-    - java.referenced:
-        location: IMPORT
-        pattern: org.apache.commons.io.input*
-    - java.referenced:
-        location: IMPORT
-        pattern: org.apache.commons.io.output*
diff --git a/default/generated/cloud-readiness/08-localhost.windup.yaml b/default/generated/cloud-readiness/08-localhost.windup.yaml
deleted file mode 100644
index 09f94689..00000000
--- a/default/generated/cloud-readiness/08-localhost.windup.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    Local HTTP Calls
-    The app is trying to access local resource by HTTP, please try to migrate the resource to cloud
-  effort: 7
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - localhost
-  links: []
-  message: The app is trying to access local resource by HTTP, please try to migrate
-    the resource to cloud
-  ruleID: localhost-http-00001
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|jsp|jspf|tag|xml|txt|yaml)
-      pattern: http(s)?://((localhost)|(127\.0\.0\.1))+(:[0-9]+)?(/.*)?
-- category: mandatory
-  customVariables: []
-  description: |-
-    Local JDBC Calls
-    The app is trying to access local resource by JDBC, please try to migrate the resource to cloud
-  effort: 7
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - localhost
-  links: []
-  message: The app is trying to access local resource by JDBC, please try to migrate
-    the resource to cloud
-  ruleID: localhost-jdbc-00002
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|jsp|jspf|tag|xml|txt|yaml)
-      pattern: jdbc:([a-z0-9-]+)://(localhost|127\.0\.0\.1)(:[0-9]+)?
-- category: mandatory
-  customVariables: []
-  description: |-
-    Local WebSocket Calls
-    The app is trying to access local resource using WebSocket, please try to migrate the resource to cloud
-  effort: 7
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  - localhost
-  links: []
-  message: The app is trying to access local resource using WebSocket, please try
-    to migrate the resource to cloud
-  ruleID: localhost-ws-00003
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|jsp|jspf|tag|xml|txt|yaml)
-      pattern: ws(s)?://((localhost)|(127\.0\.0\.1))+(:[0-9]+)?(/.*)?
diff --git a/default/generated/cloud-readiness/09-logging.windup.yaml b/default/generated/cloud-readiness/09-logging.windup.yaml
deleted file mode 100644
index b29717ed..00000000
--- a/default/generated/cloud-readiness/09-logging.windup.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    Logging to file system
-    If the application writes logs to a file system, local log files may be lost if an instance terminates or restarts.. Recommendations. * Use a centralized log management system.. * Log to standard output and allow the cloud platform to manage the logging.. * Use shared storage for log files.
-  effort: 1
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - logging
-  links: []
-  message: If the application writes logs to a file system, local log files may be
-    lost if an instance terminates or restarts.. Recommendations. * Use a centralized
-    log management system.. * Log to standard output and allow the cloud platform
-    to manage the logging.. * Use shared storage for log files.
-  ruleID: logging-0000
-  tag:
-  - Logging to file system
-  when:
-    or:
-    - builtin.filecontent:
-        filePattern: log4j\.(xml|properties)
-        pattern: ((Daily)?Rolling)?FileAppender
-    - java.referenced:
-        location: IMPORT
-        pattern: org.apache*log4j*FileAppender*
-    - java.referenced:
-        location: IMPORT
-        pattern: java.util.logging.FileHandler*
-    - java.referenced:
-        location: IMPORT
-        pattern: ch.qos.logback.core.FileAppender
-    - java.referenced:
-        location: IMPORT
-        pattern: org.pmw.tinylog.writers.FileWriter
-- category: mandatory
-  customVariables: []
-  description: |-
-    Logging to Socket Handler
-    If an application writes logs with `SocketHandler`, an alternative method is required. Socket communication is not suitable for a cloud environment because it requires fixed communication with a target host.. Recommendations. * Use a centralized log management system.. * Log to standard output and allow the cloud platform to manage the logging.. * Use shared storage for log files.
-  effort: 3
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - logging
-  links: []
-  message: If an application writes logs with `SocketHandler`, an alternative method
-    is required. Socket communication is not suitable for a cloud environment because
-    it requires fixed communication with a target host.. Recommendations. * Use a
-    centralized log management system.. * Log to standard output and allow the cloud
-    platform to manage the logging.. * Use shared storage for log files.
-  ruleID: logging-0001
-  tag:
-  - Logging to Socket Handler
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: java.util.logging.SocketHandler*
diff --git a/default/generated/cloud-readiness/10-mail.windup.yaml b/default/generated/cloud-readiness/10-mail.windup.yaml
deleted file mode 100644
index d7ebd724..00000000
--- a/default/generated/cloud-readiness/10-mail.windup.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-- category: optional
-  customVariables: []
-  description: |-
-    Java Mail API
-    The configuration parameters of SMTP services for outbound mail may contain environment-specific values such as static IP addresses, host names, properties, credentials, or certificates.. Recommendations. * In a cloud environment, mail systems should be considered backing services and treated like attached resources.. * Ensure that the configuration of the underlying outbound mail connection is not environment-specific.. * In OpenShift Container Platform, store configuration parameters as environment variables or in a ConfigMap.
-  effort: 3
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - mail
-  links:
-  - title: Twelve-factor app - Backing services
-    url: https://12factor.net/backing-services
-  - title: Twelve-factor app - Config
-    url: https://12factor.net/config
-  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
-    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
-  message: The configuration parameters of SMTP services for outbound mail may contain
-    environment-specific values such as static IP addresses, host names, properties,
-    credentials, or certificates.. Recommendations. * In a cloud environment, mail
-    systems should be considered backing services and treated like attached resources..
-    * Ensure that the configuration of the underlying outbound mail connection is
-    not environment-specific.. * In OpenShift Container Platform, store configuration
-    parameters as environment variables or in a ConfigMap.
-  ruleID: mail-00000
-  when:
-    or:
-    - java.referenced:
-        location: PACKAGE
-        pattern: javax.mail*
-    - java.referenced:
-        location: PACKAGE
-        pattern: com.sun.mail*
-    - java.referenced:
-        location: PACKAGE
-        pattern: org.simplejavamail*
-    - java.referenced:
-        location: PACKAGE
-        pattern: org.apache.commons.mail*
diff --git a/default/generated/cloud-readiness/11-session.windup.yaml b/default/generated/cloud-readiness/11-session.windup.yaml
deleted file mode 100644
index b36e7d37..00000000
--- a/default/generated/cloud-readiness/11-session.windup.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: |-
-    HTTP session replication (distributable web.xml)
-    Session replication ensures that client sessions are not disrupted by node failure. Each node in the cluster shares information about ongoing sessions and can take over sessions if another node disappears. In a cloud environment, however, data in the memory of a running container can be wiped out by a restart.. Recommendations. * Review the session replication usage and ensure that it is configured properly.. * Disable HTTP session clustering and accept its implications.. * Re-architect the application so that sessions are stored in a cache backing service or a remote data grid.. A remote data grid has the following benefits:. * The application is more scaleable and elastic.. * The application can survive EAP node failures because a JVM failure does not cause session data loss.. * Session data can be shared by multiple applications.
-  effort: 3
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - clustering
-  links:
-  - title: 'JBoss EAP: Clustering in Web Applications'
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html/development_guide/clustering_in_web_applications
-  - title: 'Twelve-Factor App: Processes'
-    url: https://12factor.net/processes
-  - title: 'Getting Started with JBoss EAP for OpenShift Container Platform: Clustering'
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/getting_started_with_jboss_eap_for_openshift_container_platform/index#reference_clustering
-  - title: 'Twelve-Factor App: Backing services'
-    url: https://12factor.net/backing-services
-  - title: Running Data Grid on OpenShift
-    url: https://access.redhat.com/documentation/en-us/red_hat_data_grid/8.0/html-single/running_data_grid_on_openshift/index
-  - title: 'JBoss EAP:  Externalize HTTP Sessions to Red Hat Data Grid'
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuration_guide/index#jdg_externalize_http_sessions
-  message: Session replication ensures that client sessions are not disrupted by node
-    failure. Each node in the cluster shares information about ongoing sessions and
-    can take over sessions if another node disappears. In a cloud environment, however,
-    data in the memory of a running container can be wiped out by a restart.. Recommendations.
-    * Review the session replication usage and ensure that it is configured properly..
-    * Disable HTTP session clustering and accept its implications.. * Re-architect
-    the application so that sessions are stored in a cache backing service or a remote
-    data grid.. A remote data grid has the following benefits:. * The application
-    is more scaleable and elastic.. * The application can survive EAP node failures
-    because a JVM failure does not cause session data loss.. * Session data can be
-    shared by multiple applications.
-  ruleID: session-00000
-  when:
-    builtin.xml:
-      namespaces:
-        w: http://java.sun.com/xml/ns/javaee
-      xpath: /w:web-app/w:distributable
-- category: optional
-  customVariables: []
-  description: |-
-    HTTP Session data storage
-    In a cloud environment, a restart can wipe out HTTP session data in the memory of a running container.. Recommendation: Store HTTP session data in a cache backing service or a remote data grid.. A remote data grid has the following benefits:. * The application is more scaleable and elastic.. * The application can survive EAP node failures because a JVM failure does not cause session data loss.. * Session data can be shared by multiple applications.
-  effort: 3
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - clustering
-  links:
-  - title: 'Twelve-Factor App: Processes'
-    url: https://12factor.net/processes
-  - title: 'Twelve-Factor App: Backing services'
-    url: https://12factor.net/backing-services
-  - title: 'JBoss EAP:  Externalize HTTP Sessions to Red Hat Data Grid'
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuration_guide/index#jdg_externalize_http_sessions
-  - title: Running Data Grid on OpenShift
-    url: https://access.redhat.com/documentation/en-us/red_hat_data_grid/8.0/html-single/running_data_grid_on_openshift/index
-  message: 'In a cloud environment, a restart can wipe out HTTP session data in the
-    memory of a running container.. Recommendation: Store HTTP session data in a cache
-    backing service or a remote data grid.. A remote data grid has the following benefits:.
-    * The application is more scaleable and elastic.. * The application can survive
-    EAP node failures because a JVM failure does not cause session data loss.. * Session
-    data can be shared by multiple applications.'
-  ruleID: session-00001
-  when:
-    or:
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: javax.servlet.http.HttpSession.setAttribute*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: javax.servlet.http.HttpSession.putValue*
diff --git a/default/generated/cloud-readiness/12-socket-communication.windup.yaml b/default/generated/cloud-readiness/12-socket-communication.windup.yaml
deleted file mode 100644
index a38b65d1..00000000
--- a/default/generated/cloud-readiness/12-socket-communication.windup.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- category: optional
-  customVariables: []
-  description: |-
-    Socket communication
-    Java sockets are internal endpoints of two-way communications. They are defined by an IP address, port, and protocol (TCP/UDP).. Socket communication is not suitable for a cloud environment because it requires fixed communication with a target host.. Recommendation: Use Java EE standard or loosely coupled protocols such as JMS, JAX-RS, or JAX-WS for backing service interactions.
-  effort: 5
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - socket
-  links: []
-  message: 'Java sockets are internal endpoints of two-way communications. They are
-    defined by an IP address, port, and protocol (TCP/UDP).. Socket communication
-    is not suitable for a cloud environment because it requires fixed communication
-    with a target host.. Recommendation: Use Java EE standard or loosely coupled protocols
-    such as JMS, JAX-RS, or JAX-WS for backing service interactions.'
-  ruleID: socket-communication-00000
-  when:
-    or:
-    - java.referenced:
-        location: PACKAGE
-        pattern: java.net.(Socket|MulticastSocket|DatagramSocket|InetSocketAddress)*
-    - java.referenced:
-        location: PACKAGE
-        pattern: java.net.ServerSocket*
-    - java.referenced:
-        location: PACKAGE
-        pattern: java.nio.channels.AsynchronousServerSocketChannel*
-    - java.referenced:
-        location: PACKAGE
-        pattern: java.nio.channels.ServerSocketChannel*
-- category: optional
-  customVariables:
-  - name: niochannelclass
-    nameOfCaptureGroup: niochannelclass
-    pattern: java.nio.channels.(?P<niochannelclass>(NetworkChannel|MulticastChannel|DatagramChannel|AsynchronousSocketChannel|SocketChannel))?.*
-  description: |-
-    Java NIO channel
-    Java NIO channels provide bulk data transfer to and from NIO buffers. They can be synchronously and asynchronously read and written.. Channels are not suitable for a cloud environment because they are not a reliable or scalable way to interact with other systems.. Recommendation: Use Java EE standard or loosely coupled protocols such as JMS, JAX-RS, or JAX-WS for backing service interactions.
-  effort: 5
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=cloud-readiness
-  - socket
-  links: []
-  message: 'Java NIO channels provide bulk data transfer to and from NIO buffers.
-    They can be synchronously and asynchronously read and written.. Channels are not
-    suitable for a cloud environment because they are not a reliable or scalable way
-    to interact with other systems.. Recommendation: Use Java EE standard or loosely
-    coupled protocols such as JMS, JAX-RS, or JAX-WS for backing service interactions.'
-  ruleID: socket-communication-00001
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: java.nio.channels.(NetworkChannel|MulticastChannel|DatagramChannel|AsynchronousSocketChannel|SocketChannel)*
diff --git a/default/generated/cloud-readiness/01-embedded-cache-libraries.windup.yaml b/default/generated/cloud-readiness/155-embedded-cache-libraries.windup.yaml
similarity index 86%
rename from default/generated/cloud-readiness/01-embedded-cache-libraries.windup.yaml
rename to default/generated/cloud-readiness/155-embedded-cache-libraries.windup.yaml
index 37f5a28e..9703ba94 100644
--- a/default/generated/cloud-readiness/01-embedded-cache-libraries.windup.yaml
+++ b/default/generated/cloud-readiness/155-embedded-cache-libraries.windup.yaml
@@ -3,7 +3,7 @@
     application embeds an Ehcache library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -20,7 +20,7 @@
     application embeds a Coherence library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -37,7 +37,7 @@
     application embeds an Apache Commons JCS library.\n\n                        An
     embedded cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -54,7 +54,7 @@
     application embeds a Dynacache library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -71,7 +71,7 @@
     embeds a library that provides caching.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -88,7 +88,7 @@
     application embeds a Hazelcast library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -105,7 +105,7 @@
     application embeds an Apache Ignite library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -122,7 +122,7 @@
     application embeds an Infinispan library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -139,7 +139,7 @@
     application embedds a JBoss Cache library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -155,7 +155,7 @@
   description: "Caching - JCache embedded library\n\n                        The application
     embeds a JCache library.\n\n                        An embedded cache library
     is problematic because state information might not be persisted to a backing service.\n\n
-    \                       Recommendation: Use a cache backing service.\n                    \n"
+    \                       Recommendation: Use a cache backing service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -172,7 +172,7 @@
     application embeds a Memcached client library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -189,7 +189,7 @@
     application embeds an Oscache library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -206,7 +206,7 @@
     application embeds a ShiftOne library (Java Object Cache or JOCache).\n\n                        An
     embedded cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -223,7 +223,7 @@
     application embeds a SwarmCache library.\n\n                        An embedded
     cache library is problematic because state information might not be persisted
     to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    service.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -237,10 +237,7 @@
       pattern: .*swarmcache.*\.jar$
 - customVariables: []
   description: "Caching - Spring Boot Cache library\n\n                        The
-    application embeds the Spring Boot Cache library.\n\n                        An
-    embedded cache library is problematic because state information might not be persisted
-    to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
+    application embeds the Spring Boot Cache library.\n                    "
   labels:
   - konveyor.io/target=cloud-readiness
   - konveyor.io/source
@@ -257,20 +254,3 @@
     - java.dependency:
         lowerbound: 0.0.0
         name: org.springframework.boot.spring-boot-starter-cache
-- customVariables: []
-  description: "Caching - Redis Cache library\n\n                        The application
-    embeds the Redis client.\n                    \n                        An embedded
-    cache library is problematic because state information might not be persisted
-    to a backing service.\n\n                        Recommendation: Use a cache backing
-    service.\n                    \n"
-  labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
-  links: []
-  ruleID: embedded-cache-libraries-16000
-  tag:
-  - Redis
-  - Caching - Redis Cache library
-  when:
-    builtin.file:
-      pattern: .*redis.*\.jar
diff --git a/default/generated/cloud-readiness/156-java-rmi.windup.yaml b/default/generated/cloud-readiness/156-java-rmi.windup.yaml
new file mode 100644
index 00000000..1f5a1fe7
--- /dev/null
+++ b/default/generated/cloud-readiness/156-java-rmi.windup.yaml
@@ -0,0 +1,46 @@
+- category: mandatory
+  customVariables: []
+  description: Java Remote Method Invocation (RMI) service
+  effort: 1
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=rmi
+  - konveyor.io/target=cloud-readiness
+  - cloud-readiness
+  - rmi
+  links:
+  - title: Twelve-factor app - Backing services
+    url: https://12factor.net/backing-services
+  message: "\n Java RMI is a tightly coupled service. Tight coupling is not suitable
+    in a cloud environment because of scalability problems.\n\n Recommendations\n\n
+    Use Java EE standard or loosely coupled protocols for backing service interactions:\n\n
+    ** Message-based communication (JMS) for asynchronous use cases\n ** HTTP-based
+    protocol or API (JAX-RS and JAX-WS) for synchronous use cases\n\n When used with
+    load-balancing, both options ensure scalability and high availability.\n "
+  ruleID: java-rmi-00000
+  tag:
+  - Java Remote Method Invocation (RMI) service
+  when:
+    java.referenced:
+      location: INHERITANCE
+      pattern: java.rmi.Remote
+- customVariables: []
+  description: "Java Remote Method Invocation (RMI) API\n\n                            The
+    Java RMI API is tightly coupled. Tight coupling is not suitable in a cloud environment
+    because of scalability problems.\n\n                            Use a RESTful
+    API or a message queue.\n                            "
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=rmi
+  - konveyor.io/target=cloud-readiness
+  - cloud-readiness
+  - rmi
+  links: []
+  ruleID: java-rmi-00001
+  tag:
+  - rmi
+  - Java Remote Method Invocation (RMI) API
+  when:
+    java.referenced:
+      location: PACKAGE
+      pattern: java.rmi*
diff --git a/default/generated/cloud-readiness/04-java-rpc.windup.yaml b/default/generated/cloud-readiness/157-java-rpc.windup.yaml
similarity index 51%
rename from default/generated/cloud-readiness/04-java-rpc.windup.yaml
rename to default/generated/cloud-readiness/157-java-rpc.windup.yaml
index 44919551..40d6ebe5 100644
--- a/default/generated/cloud-readiness/04-java-rpc.windup.yaml
+++ b/default/generated/cloud-readiness/157-java-rpc.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Java API for XML-based RPC (JAX-RPC)
-    The Java API for XML-based RPC (JAX-RPC) was deprecated in Java EE 6 and is optional in Java EE 7. It is no longer available or supported in JBoss EAP 7.. Recommendation: Use JAX-WS, which is the current Java EE standard web services framework.
+  description: Java API for XML-based RPC (JAX-RPC)
   effort: 5
   labels:
   - konveyor.io/source=java
@@ -12,10 +10,10 @@
   links:
   - title: JAX-RPC not supported in JBoss EAP 7
     url: https://access.redhat.com/solutions/4030521
-  message: 'The Java API for XML-based RPC (JAX-RPC) was deprecated in Java EE 6 and
-    is optional in Java EE 7. It is no longer available or supported in JBoss EAP
-    7.. Recommendation: Use JAX-WS, which is the current Java EE standard web services
-    framework.'
+  message: "\n The Java API for XML-based RPC (JAX-RPC) was deprecated in Java EE
+    6 and is optional in Java EE 7. It is no longer available or supported in JBoss
+    EAP 7.\n\n Recommendation: Use JAX-WS, which is the current Java EE standard web
+    services framework.\n "
   ruleID: java-rpc-00000
   when:
     or:
diff --git a/default/generated/cloud-readiness/158-jca.windup.yaml b/default/generated/cloud-readiness/158-jca.windup.yaml
new file mode 100644
index 00000000..d6cfdd06
--- /dev/null
+++ b/default/generated/cloud-readiness/158-jca.windup.yaml
@@ -0,0 +1,24 @@
+- category: optional
+  customVariables: []
+  description: Resource adapter descriptor (ra.xml)
+  effort: 1
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - jca
+  links:
+  - title: Resource adapter compatibility with JBoss EAP
+    url: https://access.redhat.com/solutions/2476751
+  - title: Red Hat JBoss EAP 7 documentation - Deploying a Generic JMS Resource Adapter
+    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuring_messaging/index#deploy_configure_generic_jms_resource_adapter
+  message: "\n The application contains an embedded resource adapter descriptor ('ra.xml'),
+    which implements the Java Connector Architecture (JCA) for certain Enterprise
+    Information Systems (EIS).\n\n JCA often uses tightly coupled interactions between
+    the connector and the application. Tight coupling is not suitable in a cloud environment
+    because of scalability problems.\n\n Recommendation: Review the purpose of the
+    resource adapter to determine whether it is required in a cloud environment.\n "
+  ruleID: jca-00000
+  when:
+    builtin.file:
+      pattern: ra\.xml
diff --git a/default/generated/cloud-readiness/159-jni-native-code.windup.yaml b/default/generated/cloud-readiness/159-jni-native-code.windup.yaml
new file mode 100644
index 00000000..3a58830e
--- /dev/null
+++ b/default/generated/cloud-readiness/159-jni-native-code.windup.yaml
@@ -0,0 +1,54 @@
+- category: mandatory
+  customVariables: []
+  description: Java native libraries (JNI, JNA)
+  effort: 7
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - jni
+  links:
+  - title: How to load native libraries and access them via JNI in EAP (with or without
+      a module)
+    url: https://access.redhat.com/solutions/229443
+  - title: Is it supported to compile the JNI code as 32-bit shared libraries and
+      use it in 64-bit compiled Java code ?
+    url: https://access.redhat.com/solutions/1444643
+  message: "\n Java native libraries might not run in a cloud or container environment.\n\n
+    Recommendations\n\n * Review the purpose of the native library in your application.\n
+    * Check whether the native library is compatible with a cloud environment.\n *
+    Reuse or embed the native library or application in a cloud environment, for example,
+    in a JBoss module.\n * Replace, remove, or rewrite the native library or application
+    using a cloud-compatible equivalent.\n "
+  ruleID: jni-native-code-00000
+  when:
+    or:
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.lang.System.load*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.lang.System.loadLibrary*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.lang.System.mapLibraryName*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.lang.Runtime.load*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.lang.Runtime.loadLibrary*
+    - java.referenced:
+        location: CONSTRUCTOR_CALL
+        pattern: com.sun.jna*
+    - java.referenced:
+        location: IMPORT
+        pattern: com.sun.jna*
+    - java.referenced:
+        location: INHERITANCE
+        pattern: com.sun.jna*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: com.sun.jna*
+    - java.referenced:
+        location: VARIABLE_DECLARATION
+        pattern: com.sun.jna*
diff --git a/default/generated/cloud-readiness/160-local-storage.windup.yaml b/default/generated/cloud-readiness/160-local-storage.windup.yaml
new file mode 100644
index 00000000..6d52f98d
--- /dev/null
+++ b/default/generated/cloud-readiness/160-local-storage.windup.yaml
@@ -0,0 +1,186 @@
+- category: mandatory
+  customVariables: []
+  description: File system - Java IO
+  effort: 1
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - storage
+  links:
+  - title: 'Twelve-Factor App: Logs'
+    url: https://12factor.net/logs
+  - title: 'OpenShift Container Platform: Understanding cluster logging'
+    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: 'Twelve-Factor App: Config'
+    url: https://12factor.net/config
+  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
+    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
+  - title: 'OpenShift Container Platform: Understanding persistent storage'
+    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
+  message: "\n An application running inside a container could lose access to a file
+    in local storage.\n\n Recommendations\n\n The following recommendations depend
+    on the function of the file in local storage:\n\n * Logging: Log to standard output
+    and use a centralized log collector to analyze the logs.\n * Caching: Use a cache
+    backing service.\n * Configuration: Store configuration settings in environment
+    variables so that they can be updated without code changes.\n * Data storage:
+    Use a database backing service for relational data or use a persistent data storage
+    system.\n * Temporary data storage: Use the file system of a running container
+    as a brief, single-transaction cache.\n "
+  ruleID: local-storage-00001
+  when:
+    or:
+    - java.referenced:
+        location: CONSTRUCTOR_CALL
+        pattern: java.io.(FileWriter|FileReader|PrintStream|File|PrintWriter|RandomAccessFile)*
+    - java.referenced:
+        location: CONSTRUCTOR_CALL
+        pattern: java.util.zip.ZipFile*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.io.File.createTempFile*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: java.nio.file.Paths.get*
+- category: mandatory
+  customVariables:
+  - name: class
+    nameOfCaptureGroup: class
+    pattern: java.net.(?P<class>(URL|URI))?(.*)
+  description: File system - java.net.URL/URI
+  effort: 1
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - storage
+  links:
+  - title: 'Twelve-Factor App: Logs'
+    url: https://12factor.net/logs
+  - title: 'OpenShift Container Platform: Understanding cluster logging'
+    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: 'Twelve-Factor App: Config'
+    url: https://12factor.net/config
+  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
+    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
+  - title: 'OpenShift Container Platform: Understanding persistent storage'
+    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
+  message: "\n An application running inside a container could lose access to a file
+    in local storage.\n\n Recommendations\n\n The following recommendations depend
+    on the function of the file in local storage:\n\n * Logging: Log to standard output
+    and use a centralized log collector to analyze the logs.\n * Caching: Use a cache
+    backing service.\n * Configuration: Store configuration settings in environment
+    variables so that they can be updated without code changes.\n * Data storage:
+    Use a database backing service for relational data or use a persistent data storage
+    system.\n * Temporary data storage: Use the file system of a running container
+    as a brief, single-transaction cache.\n "
+  ruleID: local-storage-00002
+  when:
+    java.referenced:
+      location: CONSTRUCTOR_CALL
+      pattern: java.net.(URL|URI)*
+- category: mandatory
+  customVariables: []
+  description: File system - File path URL
+  effort: 1
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - storage
+  links:
+  - title: 'Twelve-Factor App: Logs'
+    url: https://12factor.net/logs
+  - title: 'OpenShift Container Platform: Understanding cluster logging'
+    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: 'Twelve-Factor App: Config'
+    url: https://12factor.net/config
+  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
+    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
+  - title: 'OpenShift Container Platform: Understanding persistent storage'
+    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
+  message: "\n An application running inside a container could lose access to a file
+    in local storage.\n\n Recommendations\n\n The following recommendations depend
+    on the function of the file in local storage:\n\n * Logging: Log to standard output
+    and use a centralized log collector to analyze the logs.\n * Caching: Use a cache
+    backing service.\n * Configuration: Store configuration settings in environment
+    variables so that they can be updated without code changes.\n * Data storage:
+    Use a database backing service for relational data or use a persistent data storage
+    system.\n * Temporary data storage: Use the file system of a running container
+    as a brief, single-transaction cache.\n "
+  ruleID: local-storage-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*(\\.java|\\.properties|\\.jsp|\\.jspf|\\.tag|[^pom]\\.xml|\\.txt)
+      pattern: (([:=(,\{])([ ])*(["'])?([a-zA-Z]):)(?<![\<\\\/\d\w])([\\\/]\w+)+(\.\w+)?
+- category: mandatory
+  customVariables: []
+  description: File system - 'file://' scheme
+  effort: 1
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - storage
+  links:
+  - title: 'Twelve-Factor App: Logs'
+    url: https://12factor.net/logs
+  - title: 'OpenShift Container Platform: Understanding cluster logging'
+    url: https://docs.openshift.com/container-platform/4.5/logging/cluster-logging.html
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: 'Twelve-Factor App: Config'
+    url: https://12factor.net/config
+  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
+    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
+  - title: 'OpenShift Container Platform: Understanding persistent storage'
+    url: https://docs.openshift.com/container-platform/4.5/storage/understanding-persistent-storage.html
+  message: "\n An application running inside a container could lose access to a file
+    in local storage.\n\n Recommendations\n\n The following recommendations depend
+    on the function of the file in local storage:\n\n * Logging: Log to standard output
+    and use a centralized log collector to analyze the logs.\n * Caching: Use a cache
+    backing service.\n * Configuration: Store configuration settings in environment
+    variables so that they can be updated without code changes.\n * Data storage:
+    Use a database backing service for relational data or use a persistent data storage
+    system.\n * Temporary data storage: Use the file system of a running container
+    as a brief, single-transaction cache.\n "
+  ruleID: local-storage-00004
+  when:
+    builtin.filecontent:
+      filePattern: .*\.(\\\.java|\\\.properties|\\\.jsp|\\\.jspf|\\\.tag|[^pom]\\\.xml|\\\.txt)
+      pattern: file://
+- category: mandatory
+  customVariables: []
+  description: File system - Java NIO
+  effort: 1
+  labels:
+  - konveyor.io/target=cloud-readiness
+  - konveyor.io/source
+  - storage
+  links: []
+  message: "\n An application running inside a container could lose access to a file
+    in local storage.\n\n Recommendations\n\n The following recommendations depend
+    on the function of the file in local storage:\n\n * Logging: Log to standard output
+    and use a centralized log collector to analyze the logs.\n * Caching: Use a cache
+    backing service.\n * Configuration: Store configuration settings in environment
+    variables so that they can be updated without code changes.\n * Data storage:
+    Use a database backing service for relational data or use a persistent data storage
+    system.\n * Temporary data storage: Use the file system of a running container
+    as a brief, single-transaction cache.\n "
+  ruleID: local-storage-00005
+  when:
+    or:
+    - java.referenced:
+        location: IMPORT
+        pattern: java.nio.channels.AsynchronousFileChannel*
+    - java.referenced:
+        location: IMPORT
+        pattern: java.nio.channels.FileChannel*
+    - java.referenced:
+        location: IMPORT
+        pattern: java.nio.channels.FileLock*
+    - java.referenced:
+        location: IMPORT
+        pattern: java.nio.file*
diff --git a/default/generated/cloud-readiness/161-logging.windup.yaml b/default/generated/cloud-readiness/161-logging.windup.yaml
new file mode 100644
index 00000000..d612e5ec
--- /dev/null
+++ b/default/generated/cloud-readiness/161-logging.windup.yaml
@@ -0,0 +1,56 @@
+- category: mandatory
+  customVariables: []
+  description: Logging to file system
+  effort: 1
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - logging
+  links: []
+  message: "\n If the application writes logs to a file system, local log files may
+    be lost if an instance terminates or restarts.\n\n Recommendations\n\n * Use a
+    centralized log management system.\n * Log to standard output and allow the cloud
+    platform to manage the logging.\n * Use shared storage for log files.\n "
+  ruleID: logging-0000
+  tag:
+  - Logging to file system
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: log4j\.(xml|properties)
+        pattern: ((Daily)?Rolling)?FileAppender
+    - java.referenced:
+        location: IMPORT
+        pattern: org.apache*log4j*FileAppender*
+    - java.referenced:
+        location: IMPORT
+        pattern: java.util.logging.FileHandler*
+    - java.referenced:
+        location: IMPORT
+        pattern: ch.qos.logback.core.FileAppender
+    - java.referenced:
+        location: IMPORT
+        pattern: org.pmw.tinylog.writers.FileWriter
+- category: mandatory
+  customVariables: []
+  description: Logging to Socket Handler
+  effort: 3
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - logging
+  links: []
+  message: "\n If an application writes logs with `SocketHandler`, an alternative
+    method is required. Socket communication is not suitable for a cloud environment
+    because it requires fixed communication with a target host.\n\n Recommendations\n\n
+    * Use a centralized log management system.\n * Log to standard output and allow
+    the cloud platform to manage the logging.\n * Use shared storage for log files.\n "
+  ruleID: logging-0001
+  tag:
+  - Logging to Socket Handler
+  when:
+    java.referenced:
+      location: PACKAGE
+      pattern: java.util.logging.SocketHandler*
diff --git a/default/generated/cloud-readiness/162-mail.windup.yaml b/default/generated/cloud-readiness/162-mail.windup.yaml
new file mode 100644
index 00000000..ca0be6e8
--- /dev/null
+++ b/default/generated/cloud-readiness/162-mail.windup.yaml
@@ -0,0 +1,38 @@
+- category: optional
+  customVariables: []
+  description: Java Mail API
+  effort: 3
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - mail
+  links:
+  - title: Twelve-factor app - Backing services
+    url: https://12factor.net/backing-services
+  - title: Twelve-factor app - Config
+    url: https://12factor.net/config
+  - title: 'OpenShift Container Platform: Input secrets and ConfigMaps'
+    url: https://docs.openshift.com/container-platform/4.5/builds/creating-build-inputs.html#builds-input-secrets-configmaps_creating-build-inputs
+  message: "\n The configuration parameters of SMTP services for outbound mail may
+    contain environment-specific values such as static IP addresses, host names, properties,
+    credentials, or certificates.\n\n Recommendations\n\n * In a cloud environment,
+    mail systems should be considered backing services and treated like attached resources.\n
+    * Ensure that the configuration of the underlying outbound mail connection is
+    not environment-specific.\n * In OpenShift Container Platform, store configuration
+    parameters as environment variables or in a ConfigMap.\n "
+  ruleID: mail-00000
+  when:
+    or:
+    - java.referenced:
+        location: PACKAGE
+        pattern: javax.mail*
+    - java.referenced:
+        location: PACKAGE
+        pattern: com.sun.mail*
+    - java.referenced:
+        location: PACKAGE
+        pattern: org.simplejavamail*
+    - java.referenced:
+        location: PACKAGE
+        pattern: org.apache.commons.mail*
diff --git a/default/generated/cloud-readiness/163-session.windup.yaml b/default/generated/cloud-readiness/163-session.windup.yaml
new file mode 100644
index 00000000..26f84016
--- /dev/null
+++ b/default/generated/cloud-readiness/163-session.windup.yaml
@@ -0,0 +1,72 @@
+- category: mandatory
+  customVariables: []
+  description: HTTP session replication (distributable web.xml)
+  effort: 3
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - clustering
+  links:
+  - title: 'JBoss EAP: Clustering in Web Applications'
+    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html/development_guide/clustering_in_web_applications
+  - title: 'Twelve-Factor App: Processes'
+    url: https://12factor.net/processes
+  - title: 'Getting Started with JBoss EAP for OpenShift Container Platform: Clustering'
+    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/getting_started_with_jboss_eap_for_openshift_container_platform/index#reference_clustering
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: Running Data Grid on OpenShift
+    url: https://access.redhat.com/documentation/en-us/red_hat_data_grid/8.0/html-single/running_data_grid_on_openshift/index
+  - title: 'JBoss EAP:  Externalize HTTP Sessions to Red Hat Data Grid'
+    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuration_guide/index#jdg_externalize_http_sessions
+  message: "\n Session replication ensures that client sessions are not disrupted
+    by node failure. Each node in the cluster shares information about ongoing sessions
+    and can take over sessions if another node disappears. In a cloud environment,
+    however, data in the memory of a running container can be wiped out by a restart.\n\n
+    Recommendations\n\n * Review the session replication usage and ensure that it
+    is configured properly.\n * Disable HTTP session clustering and accept its implications.\n
+    * Re-architect the application so that sessions are stored in a cache backing
+    service or a remote data grid.\n\n A remote data grid has the following benefits:\n\n
+    * The application is more scaleable and elastic.\n * The application can survive
+    EAP node failures because a JVM failure does not cause session data loss.\n *
+    Session data can be shared by multiple applications.\n "
+  ruleID: session-00000
+  when:
+    builtin.xml:
+      namespaces:
+        w: http://java.sun.com/xml/ns/javaee
+      xpath: /w:web-app/w:distributable
+- category: optional
+  customVariables: []
+  description: HTTP Session data storage
+  effort: 3
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - clustering
+  links:
+  - title: 'Twelve-Factor App: Processes'
+    url: https://12factor.net/processes
+  - title: 'Twelve-Factor App: Backing services'
+    url: https://12factor.net/backing-services
+  - title: 'JBoss EAP:  Externalize HTTP Sessions to Red Hat Data Grid'
+    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.3/html-single/configuration_guide/index#jdg_externalize_http_sessions
+  - title: Running Data Grid on OpenShift
+    url: https://access.redhat.com/documentation/en-us/red_hat_data_grid/8.0/html-single/running_data_grid_on_openshift/index
+  message: "\n In a cloud environment, a restart can wipe out HTTP session data in
+    the memory of a running container.\n\n Recommendation: Store HTTP session data
+    in a cache backing service or a remote data grid.\n\n A remote data grid has the
+    following benefits:\n\n * The application is more scaleable and elastic.\n * The
+    application can survive EAP node failures because a JVM failure does not cause
+    session data loss.\n * Session data can be shared by multiple applications.\n "
+  ruleID: session-00001
+  when:
+    or:
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: javax.servlet.http.HttpSession.setAttribute*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: javax.servlet.http.HttpSession.putValue*
diff --git a/default/generated/cloud-readiness/164-socket-communication.windup.yaml b/default/generated/cloud-readiness/164-socket-communication.windup.yaml
new file mode 100644
index 00000000..583f7f9f
--- /dev/null
+++ b/default/generated/cloud-readiness/164-socket-communication.windup.yaml
@@ -0,0 +1,53 @@
+- category: optional
+  customVariables: []
+  description: Socket communication
+  effort: 5
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - socket
+  links: []
+  message: "\n Java sockets are internal endpoints of two-way communications. They
+    are defined by an IP address, port, and protocol (TCP/UDP).\n\n Socket communication
+    is not suitable for a cloud environment because it requires fixed communication
+    with a target host.\n\n Recommendation: Use Java EE standard or loosely coupled
+    protocols such as JMS, JAX-RS, or JAX-WS for backing service interactions.\n "
+  ruleID: socket-communication-00000
+  when:
+    or:
+    - java.referenced:
+        location: PACKAGE
+        pattern: java.net.(Socket|MulticastSocket|DatagramSocket|InetSocketAddress)*
+    - java.referenced:
+        location: PACKAGE
+        pattern: java.net.ServerSocket*
+    - java.referenced:
+        location: PACKAGE
+        pattern: java.nio.channels.AsynchronousServerSocketChannel*
+    - java.referenced:
+        location: PACKAGE
+        pattern: java.nio.channels.ServerSocketChannel*
+- category: optional
+  customVariables:
+  - name: niochannelclass
+    nameOfCaptureGroup: niochannelclass
+    pattern: java.nio.channels.(?P<niochannelclass>(NetworkChannel|MulticastChannel|DatagramChannel|AsynchronousSocketChannel|SocketChannel))?.*
+  description: Java NIO channel
+  effort: 5
+  labels:
+  - konveyor.io/source=java
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=cloud-readiness
+  - socket
+  links: []
+  message: "\n Java NIO channels provide bulk data transfer to and from NIO buffers.
+    They can be synchronously and asynchronously read and written.\n\n Channels are
+    not suitable for a cloud environment because they are not a reliable or scalable
+    way to interact with other systems.\n\n Recommendation: Use Java EE standard or
+    loosely coupled protocols such as JMS, JAX-RS, or JAX-WS for backing service interactions.\n "
+  ruleID: socket-communication-00001
+  when:
+    java.referenced:
+      location: PACKAGE
+      pattern: java.nio.channels.(NetworkChannel|MulticastChannel|DatagramChannel|AsynchronousSocketChannel|SocketChannel)*
diff --git a/default/generated/cloud-readiness/ruleset.yaml b/default/generated/cloud-readiness/ruleset.yaml
index b0ca56b9..916a20e2 100644
--- a/default/generated/cloud-readiness/ruleset.yaml
+++ b/default/generated/cloud-readiness/ruleset.yaml
@@ -1,3 +1,3 @@
 name: openshift
-description: This ruleset detects the Java Mail API, which may be problematic when
-  migrating an application to a cloud environment.
+description: This ruleset detects local storage usage, which is problematic when migrating
+  an application to a cloud environment.
diff --git a/default/generated/droolsjbpm/25-kie-api.windup.yaml b/default/generated/droolsjbpm/25-kie-api.windup.yaml
index 70e36828..9f45e032 100644
--- a/default/generated/droolsjbpm/25-kie-api.windup.yaml
+++ b/default/generated/droolsjbpm/25-kie-api.windup.yaml
@@ -1,7 +1,5 @@
 - customVariables: []
-  description: |-
-    org.drools.KnowledgeBase is deprecated
-    Replace with : org.kie.api.KieBase
+  description: org.drools.KnowledgeBase is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -22,9 +20,7 @@
       location: IMPORT
       pattern: org.drools.KnowledgeBase
 - customVariables: []
-  description: |-
-    org.drools.event.AgendaEventListener is deprecated
-    Replace with : org.kie.api.event.rule.AgendaEventListener
+  description: org.drools.event.AgendaEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -45,9 +41,7 @@
       location: IMPORT
       pattern: org.drools.event.AgendaEventListener
 - customVariables: []
-  description: |-
-    AgendaEventListener is deprecated
-    Replace with : org.kie.api.event.rule.AgendaEventListener
+  description: AgendaEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -68,9 +62,7 @@
       location: IMPORT
       pattern: org.drools.event.rule.AgendaEventListener
 - customVariables: []
-  description: |-
-    org.drools.event.DefaultAgendaEventListener is deprecated
-    Replace with : org.kie.drools.core.event.DefaultAgendaEventListener
+  description: org.drools.event.DefaultAgendaEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -91,9 +83,7 @@
       location: IMPORT
       pattern: org.drools.event.DefaultAgendaEventListener
 - customVariables: []
-  description: |-
-    org.drools.event.rule.DefaultAgendaEventListener is deprecated
-    Replace with : org.kie.api.event.rule.DefaultAgendaEventListener
+  description: org.drools.event.rule.DefaultAgendaEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -114,9 +104,7 @@
       location: IMPORT
       pattern: org.drools.event.rule.DefaultAgendaEventListener
 - customVariables: []
-  description: |-
-    org.drools.event.process.ProcessEventListener is deprecated
-    Replace with : org.kie.api.event.process.ProcessEventListener
+  description: org.drools.event.process.ProcessEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -137,9 +125,7 @@
       location: IMPORT
       pattern: org.drools.event.process.ProcessEventListener
 - customVariables: []
-  description: |-
-    org.drools.event.process.DefaultProcessEventListener is deprecated
-    Replace with : org.kie.api.event.process.DefaultProcessEventListener
+  description: org.drools.event.process.DefaultProcessEventListener is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -160,9 +146,7 @@
       location: IMPORT
       pattern: org.drools.event.process.DefaultProcessEventListener
 - customVariables: []
-  description: |-
-    org.drools.logger.KnowledgeRuntimeLogger is deprecated
-    Replace with : org.kie.api.logger.KieRuntimeLogger
+  description: org.drools.logger.KnowledgeRuntimeLogger is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -183,9 +167,7 @@
       location: IMPORT
       pattern: org.drools.logger.KnowledgeRuntimeLogger
 - customVariables: []
-  description: |-
-    org.drools.logger.KnowledgeRuntimeLoggerFactory is deprecated
-    Replace with : org.kie.api.logger.KieLoggers
+  description: org.drools.logger.KnowledgeRuntimeLoggerFactory is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -206,9 +188,7 @@
       location: IMPORT
       pattern: org.drools.logger.KnowledgeRuntimeLoggerFactory
 - customVariables: []
-  description: |-
-    org.drools.runtime.StatefulKnowledgeSession is deprecated
-    Replace with : org.kie.api.runtime.KieSession
+  description: org.drools.runtime.StatefulKnowledgeSession is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -229,9 +209,7 @@
       location: IMPORT
       pattern: org.drools.runtime.StatefulKnowledgeSession
 - customVariables: []
-  description: |-
-    org.drools.runtime.StatelessKnowledgeSession is deprecated
-    Replace with : org.kie.api.runtime.KieSession
+  description: org.drools.runtime.StatelessKnowledgeSession is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -252,9 +230,7 @@
       location: IMPORT
       pattern: org.drools.runtime.StatelessKnowledgeSession
 - customVariables: []
-  description: |-
-    org.drools.builder.KnowledgeBuilderFactory is deprecated
-    Replace with : org.kie.internal.builder.KnowledgeBuilderFactory
+  description: org.drools.builder.KnowledgeBuilderFactory is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -275,9 +251,7 @@
       location: IMPORT
       pattern: org.drools.builder.KnowledgeBuilderFactory
 - customVariables: []
-  description: |-
-    org.drools.io.ResourceFactory is deprecated
-    Replace with : org.kie.internal.io.ResourceFactory
+  description: org.drools.io.ResourceFactory is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -298,9 +272,7 @@
       location: IMPORT
       pattern: org.drools.io.ResourceFactory
 - customVariables: []
-  description: |-
-    org.drools.io.ResourceType is deprecated
-    Replace with : org.kie.internal.io.ResourceType
+  description: org.drools.io.ResourceType is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -321,9 +293,7 @@
       location: IMPORT
       pattern: org.drools.io.ResourceType
 - customVariables: []
-  description: |-
-    org.drools.runtime.Environment is deprecated
-    Replace with : org.kie.api.runtime.Environment
+  description: org.drools.runtime.Environment is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -344,9 +314,7 @@
       location: IMPORT
       pattern: org.drools.runtime.Environment
 - customVariables: []
-  description: |-
-    org.drools.runtime.EnvironmentName is deprecated
-    Replace with : org.kie.api.runtime.EnvironmentName
+  description: org.drools.runtime.EnvironmentName is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
@@ -367,9 +335,7 @@
       location: IMPORT
       pattern: org.drools.runtime.EnvironmentName
 - customVariables: []
-  description: |-
-    org.drools.runtime.KnowledgeSessionConfiguration is deprecated
-    Replace with : org.kie.api.runtime.KieSessionConfiguration
+  description: org.drools.runtime.KnowledgeSessionConfiguration is deprecated
   effort: 0
   labels:
   - konveyor.io/source=drools5
diff --git a/default/generated/eap6/26-commonj.windup.yaml b/default/generated/eap6/26-commonj.windup.yaml
index c0f558f2..ae6d0ae3 100644
--- a/default/generated/eap6/26-commonj.windup.yaml
+++ b/default/generated/eap6/26-commonj.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/source=websphere
@@ -21,9 +22,7 @@
       pattern: commonj.timers*
 - category: mandatory
   customVariables: []
-  description: |-
-    Migrate commonj.timers.TimerManager to Java EE TimerService API
-    Commonj Timer Manager API is similar to the EJB 3.1 java.ejb.Timer Service.. In Java EE 6, the Timer Service was updated to allow cron like configuration of scheduling which is similar to Quartz's timer configurations.
+  description: Migrate commonj.timers.TimerManager to Java EE TimerService API
   effort: 7
   labels:
   - konveyor.io/source=weblogic
@@ -38,18 +37,16 @@
     url: http://docs.oracle.com/javaee/6/tutorial/doc/bnboy.html
   - title: Java EE 6 TimerService API
     url: http://docs.oracle.com/javaee/6/api/javax/ejb/TimerService.html
-  message: Commonj Timer Manager API is similar to the EJB 3.1 java.ejb.Timer Service..
+  message: "Commonj Timer Manager API is similar to the EJB 3.1 java.ejb.Timer Service.\n
     In Java EE 6, the Timer Service was updated to allow cron like configuration of
-    scheduling which is similar to Quartz's timer configurations.
+    scheduling which is similar to Quartz's timer configurations.\n "
   ruleID: commonj-02000
   when:
     java.referenced:
       pattern: commonj.timers.TimerManager
 - category: mandatory
   customVariables: []
-  description: |-
-    Migrate commonj.timers.Timer to Java EE javax.ejb.Timer
-    Commonj Timer Interface is similar to the EJB 3.1 javax.ejb.Timer Interface.
+  description: Migrate commonj.timers.Timer to Java EE javax.ejb.Timer
   effort: 7
   labels:
   - konveyor.io/source=weblogic
@@ -60,12 +57,13 @@
   - konveyor.io/target=java-ee
   - commonj
   links: []
-  message: Commonj Timer Interface is similar to the EJB 3.1 javax.ejb.Timer Interface.
+  message: "\n Commonj Timer Interface is similar to the EJB 3.1 javax.ejb.Timer Interface.\n "
   ruleID: commonj-03000
   when:
     java.referenced:
       pattern: commonj.timers.Timer
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/source=websphere
@@ -92,9 +90,7 @@
       pattern: commonj.work*
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace CommonJ WorkManager with a JCA Resource Adapter
-    The CommonJ WorkManager can be replaced with a JCA Resource Adapter.
+  description: Replace CommonJ WorkManager with a JCA Resource Adapter
   effort: 7
   labels:
   - konveyor.io/source=weblogic
@@ -117,8 +113,7 @@
   - name: part
     nameOfCaptureGroup: part
     pattern: commonj.work.Work(?P<part>(Event|Item|Listener)?)
-  description: |
-    Commonj WorkManager API
+  description: Commonj WorkManager API
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -139,8 +134,7 @@
   - name: subpart
     nameOfCaptureGroup: subpart
     pattern: commonj.work.Work(?P<subpart>(Completed|Rejected)?)?Exception
-  description: |
-    CommonJ WorkManager API Exception
+  description: CommonJ WorkManager API Exception
   effort: 1
   labels:
   - konveyor.io/source=weblogic
diff --git a/default/generated/eap6/27-xml-glassfish.windup.yaml b/default/generated/eap6/27-xml-glassfish.windup.yaml
index e268121a..cd6e70ea 100644
--- a/default/generated/eap6/27-xml-glassfish.windup.yaml
+++ b/default/generated/eap6/27-xml-glassfish.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Glassfish EJB Descriptor
      Glassfish specific ejb configuration file used to configure EJBs, map them to jndi names etc.
   labels:
@@ -20,7 +20,7 @@
       namespaces: {}
       xpath: /glassfish-ejb-jar
 - customVariables: []
-  description: |
+  description: |-
     Glassfish Application EAR configuration file
      Glassfish-application  is a Glassfish specific EAR configuration file used to configure security roles, url addresses, JNDI binding etc. This file is glassfish specific and needs to be migrated to application.xml or jboss-app.xml.
   labels:
diff --git a/default/generated/eap6/28-java-ee-jaxrpc.windup.yaml b/default/generated/eap6/28-java-ee-jaxrpc.windup.yaml
index b56968e9..59f19f29 100644
--- a/default/generated/eap6/28-java-ee-jaxrpc.windup.yaml
+++ b/default/generated/eap6/28-java-ee-jaxrpc.windup.yaml
@@ -6,7 +6,7 @@
     class as a superclass. It is a convenience abstract\n                        class
     that makes writing Handlers easy. GenericHandler provides default implementations\n
     \                       of the lifecycle methods init and destroy and also different
-    handle methods.\n                        \n                    \n"
+    handle methods.\n                        \n                    "
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
diff --git a/default/generated/eap6/29-seam-java.windup.yaml b/default/generated/eap6/29-seam-java.windup.yaml
index b98b529c..3e50cdba 100644
--- a/default/generated/eap6/29-seam-java.windup.yaml
+++ b/default/generated/eap6/29-seam-java.windup.yaml
@@ -15,7 +15,7 @@
     the expected behavior can differ based on what your application uses and how.\n
     \                       2. Switch to standard CDI beans and migrate to JSF 2.2
     if your server platform is EAP 7+. This will require significant migration effort.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/source=eap4
@@ -52,9 +52,7 @@
       pattern: org.jboss.seam*
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.core.Conversation
-    You can use Java EE `javax.enterprise.context.Conversation` interface like:. ```java. @Inject Conversation conversation;. ```
+  description: Seam API - org.jboss.seam.core.Conversation
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -71,17 +69,15 @@
   links:
   - title: Java EE API - Conversation
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/context/Conversation.html
-  message: You can use Java EE `javax.enterprise.context.Conversation` interface like:.
-    ```java. @Inject Conversation conversation;. ```
+  message: "\n You can use Java EE `javax.enterprise.context.Conversation` interface
+    like:\n \n ```java\n @Inject Conversation conversation;\n ```\n "
   ruleID: seam-java-00010
   when:
     java.referenced:
       pattern: org.jboss.seam.core.Conversation
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.Seam
-    There is no direct replacement for this Seam API. The `org.jboss.seam.Seam` contains methods for accessing annotated information. about Seam component classes. For majority cases you can replace this Seam API with standard CDI's `javax.enterprise.inject.spi.BeanManager`.
+  description: Seam API - org.jboss.seam.Seam
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -100,9 +96,9 @@
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/spi/BeanManager.html
   - title: Seam API - org.jboss.seam.Seam
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_API_Documentation/files/api/org/jboss/seam/Seam.html
-  message: There is no direct replacement for this Seam API. The `org.jboss.seam.Seam`
-    contains methods for accessing annotated information. about Seam component classes.
-    For majority cases you can replace this Seam API with standard CDI's `javax.enterprise.inject.spi.BeanManager`.
+  message: |-
+    There is no direct replacement for this Seam API. The `org.jboss.seam.Seam` contains methods for accessing annotated information
+     about Seam component classes. For majority cases you can replace this Seam API with standard CDI's `javax.enterprise.inject.spi.BeanManager`.
   ruleID: seam-java-00030
   when:
     java.referenced:
@@ -110,9 +106,7 @@
       pattern: org.jboss.seam.Seam*
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Name
-    CDI supports static injection in comparison to Seam 2 dynamic injection. So you don't need to have `@Named` annotation on every Seam component you would like to migrate.. Remove that annotation or change to `@javax.inject.Named` only if you need to access managed bean in Expression Language (EL).
+  description: Seam API - org.jboss.seam.annotations.Name
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -131,10 +125,10 @@
     url: http://docs.oracle.com/javaee/7/tutorial/cdi-basic009.htm#GJBAK
   - title: Seam 2 Components
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#_seam_2_components
-  message: CDI supports static injection in comparison to Seam 2 dynamic injection.
+  message: "CDI supports static injection in comparison to Seam 2 dynamic injection.
     So you don't need to have `@Named` annotation on every Seam component you would
-    like to migrate.. Remove that annotation or change to `@javax.inject.Named` only
-    if you need to access managed bean in Expression Language (EL).
+    like to migrate. \n Remove that annotation or change to `@javax.inject.Named`
+    only if you need to access managed bean in Expression Language (EL)."
   ruleID: seam-java-00040
   when:
     java.referenced:
@@ -142,9 +136,7 @@
       pattern: org.jboss.seam.annotations.Name
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Scope
-    Convert to a valid CDI scope. CDI scopes has its own annotation.. See linked documentation link for CDI alternatives. For example, `@Scope(ScopeType.SESSION)` should be `@javax.enterprise.context.SessionScoped`.
+  description: Seam API - org.jboss.seam.annotations.Scope
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -163,9 +155,9 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#_scopes_and_contexts
   - title: Java EE 7 Tutorial - Using Scopes
     url: http://docs.oracle.com/javaee/7/tutorial/cdi-basic008.htm#GJBBK
-  message: Convert to a valid CDI scope. CDI scopes has its own annotation.. See linked
-    documentation link for CDI alternatives. For example, `@Scope(ScopeType.SESSION)`
-    should be `@javax.enterprise.context.SessionScoped`.
+  message: "Convert to a valid CDI scope. CDI scopes has its own annotation.\n See
+    linked documentation link for CDI alternatives. For example, `@Scope(ScopeType.SESSION)`
+    should be `@javax.enterprise.context.SessionScoped`. \n "
   ruleID: seam-java-00050
   when:
     java.referenced:
@@ -173,9 +165,7 @@
       pattern: org.jboss.seam.annotations.Scope
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.In
-    Convert Seam annotation `@In` to CDI `@javax.inject.Inject`.
+  description: Seam API - org.jboss.seam.annotations.In
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -200,9 +190,7 @@
       pattern: org.jboss.seam.annotations.In
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.AutoCreate
-    Remove this Seam annotation `@AutoCreate` as in CDI it is no longer needed since a bean will always be created when needed.
+  description: Seam API - org.jboss.seam.annotations.AutoCreate
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -228,9 +216,7 @@
       pattern: org.jboss.seam.annotations.AutoCreate
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Out
-    CDI does not support bijection and does a static injection in comparison to Seam 2, where it is performed dynamically. via interceptor every time a component is invoked.. CDI performs the static injection only once per component life cycle.. Refactor such Seam API usage with `@javax.enterprise.inject.Produces`.
+  description: Seam API - org.jboss.seam.annotations.Out
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -253,10 +239,10 @@
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Produces.html
   - title: JBoss EAP 6 - Use a Producer Method
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#Use_a_Producer_Method
-  message: CDI does not support bijection and does a static injection in comparison
-    to Seam 2, where it is performed dynamically. via interceptor every time a component
-    is invoked.. CDI performs the static injection only once per component life cycle..
-    Refactor such Seam API usage with `@javax.enterprise.inject.Produces`.
+  message: "\n CDI does not support bijection and does a static injection in comparison
+    to Seam 2, where it is performed dynamically \n via interceptor every time a component
+    is invoked. \n CDI performs the static injection only once per component life
+    cycle.\n \n Refactor such Seam API usage with `@javax.enterprise.inject.Produces`.\n "
   ruleID: seam-java-00070
   when:
     java.referenced:
@@ -264,9 +250,7 @@
       pattern: org.jboss.seam.annotations.Out
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Factory
-    Seam Factory annotation was used for binding non Seam component methods into Seam context life cycle.. Replace it with `@javax.enterprise.inject.Produces` and add additional annotation for context scope if you used `scope = ScopeType.*` enum like for instance. `@Factory(scope = ScopeType.APPLICATION)` use:. ```java. @Produces @ApplicationScoped .... ```
+  description: Seam API - org.jboss.seam.annotations.Factory
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -289,11 +273,11 @@
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Produces.html
   - title: JBoss EAP 6 - Use a Producer Method
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#Use_a_Producer_Method
-  message: Seam Factory annotation was used for binding non Seam component methods
-    into Seam context life cycle.. Replace it with `@javax.enterprise.inject.Produces`
+  message: "\n Seam Factory annotation was used for binding non Seam component methods
+    into Seam context life cycle.\n \n Replace it with `@javax.enterprise.inject.Produces`
     and add additional annotation for context scope if you used `scope = ScopeType.*`
-    enum like for instance. `@Factory(scope = ScopeType.APPLICATION)` use:. ```java.
-    @Produces @ApplicationScoped .... ```
+    enum like for instance\n `@Factory(scope = ScopeType.APPLICATION)` use:\n \n ```java\n
+    @Produces @ApplicationScoped ...\n ```\n "
   ruleID: seam-java-00071
   when:
     java.referenced:
@@ -301,9 +285,7 @@
       pattern: org.jboss.seam.annotations.Factory
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Startup
-    Java EE uses for such use case `@javax.ejb.Singleton` and `@javax.ejb.Startup` annotations.
+  description: Seam API - org.jboss.seam.annotations.Startup
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -332,9 +314,7 @@
       pattern: org.jboss.seam.annotations.Startup
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Create
-    Seam 2 provided along to standard Java EE `javax.annotation.PostConstruct` also Seam specific annotation `@Create`.. You can use `@javax.annotation.PostConstruct` as one to one replacement.
+  description: Seam API - org.jboss.seam.annotations.Create
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -351,9 +331,9 @@
   links:
   - title: Java EE API - javax.annotation.PostConstruct
     url: http://docs.oracle.com/javaee/7/api/javax/annotation/PostConstruct.html
-  message: Seam 2 provided along to standard Java EE `javax.annotation.PostConstruct`
-    also Seam specific annotation `@Create`.. You can use `@javax.annotation.PostConstruct`
-    as one to one replacement.
+  message: |-
+    Seam 2 provided along to standard Java EE `javax.annotation.PostConstruct` also Seam specific annotation `@Create`.
+     You can use `@javax.annotation.PostConstruct` as one to one replacement.
   ruleID: seam-java-00090
   when:
     java.referenced:
@@ -361,9 +341,7 @@
       pattern: org.jboss.seam.annotations.Create
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Destroy
-    Seam 2 provided along to standard Java EE `javax.annotation.PreDestroy` also Seam specific annotation `@Destroy`.. You can use `@javax.annotation.PreDestroy` as one to one replacement.
+  description: Seam API - org.jboss.seam.annotations.Destroy
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -380,9 +358,9 @@
   links:
   - title: Java EE API - javax.annotation.PreDestroy
     url: http://docs.oracle.com/javaee/7/api/javax/annotation/PreDestroy.html
-  message: Seam 2 provided along to standard Java EE `javax.annotation.PreDestroy`
-    also Seam specific annotation `@Destroy`.. You can use `@javax.annotation.PreDestroy`
-    as one to one replacement.
+  message: |-
+    Seam 2 provided along to standard Java EE `javax.annotation.PreDestroy` also Seam specific annotation `@Destroy`.
+     You can use `@javax.annotation.PreDestroy` as one to one replacement.
   ruleID: seam-java-00091
   when:
     java.referenced:
@@ -390,9 +368,7 @@
       pattern: org.jboss.seam.annotations.Destroy
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.faces.Switcher
-    There is no direct replacement, but it can be implemented with CDI Conversation support.
+  description: Seam API - org.jboss.seam.faces.Switcher
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -418,9 +394,7 @@
       pattern: org.jboss.seam.faces.Switcher
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.Component calls
-    If you need to keep programmatic lookup use `javax.enterprise.inject.Instance` with injection.. Like getting instance of `PaymentProcessor`:. ```java. @Inject Instance<PaymentProcessor> paymentProcessor;. ```. The second approach is to use `javax.enterprise.inject.spi.BeanManager` like. ```java. @Inject BeanManager manager;. ```
+  description: Seam API - org.jboss.seam.Component calls
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -439,11 +413,11 @@
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Instance.html
   - title: Java EE API - BeanManager
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/spi/BeanManager.html
-  message: If you need to keep programmatic lookup use `javax.enterprise.inject.Instance`
-    with injection.. Like getting instance of `PaymentProcessor`:. ```java. @Inject
-    Instance<PaymentProcessor> paymentProcessor;. ```. The second approach is to use
-    `javax.enterprise.inject.spi.BeanManager` like. ```java. @Inject BeanManager manager;.
-    ```
+  message: "\n If you need to keep programmatic lookup use `javax.enterprise.inject.Instance`
+    with injection. \n Like getting instance of `PaymentProcessor`:\n \n ```java\n
+    @Inject Instance<PaymentProcessor> paymentProcessor;\n ```\n \n The second approach
+    is to use `javax.enterprise.inject.spi.BeanManager` like\n \n ```java\n @Inject
+    BeanManager manager;\n ```\n \n "
   ruleID: seam-java-00110
   when:
     java.referenced:
@@ -451,9 +425,7 @@
       pattern: org.jboss.seam.Component*
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Redirect
-    Refactor to have annotated error handler which redirect to a viewID page for displaying error page.
+  description: Seam API - org.jboss.seam.annotations.Redirect
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -476,9 +448,7 @@
       pattern: org.jboss.seam.annotations.exception.Redirect
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Install
-    Seam 2 offers the `@Install` annotation for controlling whether a given bean should be installed or not together with configurable functionality.. Explicit prevention from installation is in CDI done by `@Vetoed` annotation.. If you need to use Bean specialization there are `@javax.enterprise.inject.Alternative` or `@javax.enterprise.inject.Specializes` instead of precedence.
+  description: Seam API - org.jboss.seam.annotations.Install
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -501,11 +471,10 @@
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Specializes.html
   - title: Java EE 7 - Alternative annotation
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Alternative.html
-  message: Seam 2 offers the `@Install` annotation for controlling whether a given
-    bean should be installed or not together with configurable functionality.. Explicit
-    prevention from installation is in CDI done by `@Vetoed` annotation.. If you need
-    to use Bean specialization there are `@javax.enterprise.inject.Alternative` or
-    `@javax.enterprise.inject.Specializes` instead of precedence.
+  message: |-
+    Seam 2 offers the `@Install` annotation for controlling whether a given bean should be installed or not together with configurable functionality.
+     Explicit prevention from installation is in CDI done by `@Vetoed` annotation.
+     If you need to use Bean specialization there are `@javax.enterprise.inject.Alternative` or `@javax.enterprise.inject.Specializes` instead of precedence.
   ruleID: seam-java-00130
   when:
     java.referenced:
@@ -513,9 +482,7 @@
       pattern: org.jboss.seam.annotations.Install
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.web.AbstractFilter
-    Rework code with a default Java Servlet `javax.servlet.Filter` or different filter interface.
+  description: Seam API - org.jboss.seam.web.AbstractFilter
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -540,9 +507,7 @@
       pattern: org.jboss.seam.web.AbstractFilter
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.web.Filter
-    Replace this Seam annotation with default Java Servlet `javax.servlet.Filter` or different filter interface.
+  description: Seam API - org.jboss.seam.annotations.web.Filter
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -569,9 +534,7 @@
       pattern: org.jboss.seam.annotations.web.Filter
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.contexts.Contexts
-    Rework using CDI's injected concrete context.
+  description: Seam API - org.jboss.seam.contexts.Contexts
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -594,7 +557,7 @@
       location: METHOD_CALL
       pattern: org.jboss.seam.contexts.Contexts*
 - customVariables: []
-  description: |
+  description: |-
     Seam integration with jBPM
     Seam integration with jBPM should be migrated with help of CDI integration presented directly in Drools - jBPM
   labels:
@@ -623,9 +586,7 @@
       pattern: org.jboss.seam.annotations.bpm*
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.core.ConversationEntry
-    Rework with CDI conversation context `javax.enterprise.context.Conversation`.
+  description: Seam API - org.jboss.seam.core.ConversationEntry
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -649,9 +610,7 @@
       pattern: org.jboss.seam.core.ConversationEntry
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Begin
-    Rework with `javax.enterprise.context.Conversation.begin()`.
+  description: Seam API - org.jboss.seam.annotations.Begin
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -676,9 +635,7 @@
       pattern: org.jboss.seam.annotations.Begin
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.End
-    Rework with `javax.enterprise.context.Conversation.end()`.
+  description: Seam API - org.jboss.seam.annotations.End
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -703,9 +660,7 @@
       pattern: org.jboss.seam.annotations.End
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.web.RequestParameter
-    The `@RequestParameter` annotation triggers injection of an HTTP request parameter.. The parameter name can be set explicitly as a value of the annotation or can be implied from the name of an injection point.. Java EE 6 does not have an annotation for this, however, the JSF 2 spec now has `<f:viewParam />` which can be used instead.
+  description: Seam API - org.jboss.seam.annotations.web.RequestParameter
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -724,11 +679,11 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#_requestparameter
   - title: JSF 2.2 VDL - Tag viewParam
     url: https://docs.oracle.com/javaee/7/javaserver-faces-2-2/vdldocs-facelets/toc.htm
-  message: The `@RequestParameter` annotation triggers injection of an HTTP request
-    parameter.. The parameter name can be set explicitly as a value of the annotation
-    or can be implied from the name of an injection point.. Java EE 6 does not have
-    an annotation for this, however, the JSF 2 spec now has `<f:viewParam />` which
-    can be used instead.
+  message: "\n The `@RequestParameter` annotation triggers injection of an HTTP request
+    parameter. \n The parameter name can be set explicitly as a value of the annotation
+    or can be implied from the name of an injection point.\n \n Java EE 6 does not
+    have an annotation for this, however, the JSF 2 spec now has `<f:viewParam />`
+    which can be used instead. "
   ruleID: seam-java-00210
   when:
     java.referenced:
@@ -736,8 +691,7 @@
       pattern: org.jboss.seam.annotations.web.RequestParameter
 - category: mandatory
   customVariables: []
-  description: |
-    Seam API - org.jboss.seam.annotations.Logger
+  description: Seam API - org.jboss.seam.annotations.Logger
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -756,15 +710,16 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#_logger
   - title: Java EE 7 - Produces annotation
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/inject/Produces.html
-  message: Seam 2 provides a built-in logger implementation. It is a thin wrapper
-    that delegates to an available logging framework (log4j or JDK logging).. Additionally,
-    it provides extra features such as EL expression evaluation.. Java SE or EE does
-    not have anything that correlates to this, but you can your own Logger with simple
-    producer for this case like:. ```java. import javax.enterprise.inject.Produces;.
-    import javax.enterprise.inject.spi.InjectionPoint;. @Singleton. public class LoggerProducer
-    {{. @Produces Logger createLogger(final InjectionPoint ip){{. return LoggerFactory.getLogger(ip.getMember().getDeclaringClass());.
-    }}. }}. ```. and use it in your code like:. ```java. @Inject private transient
-    Logger logger;. ```
+  message: "\n Seam 2 provides a built-in logger implementation. It is a thin wrapper
+    that delegates to an available logging framework (log4j or JDK logging). \n Additionally,
+    it provides extra features such as EL expression evaluation.\n \n Java SE or EE
+    does not have anything that correlates to this, but you can your own Logger with
+    simple producer for this case like:\n \n ```java\n import javax.enterprise.inject.Produces;
+    \n import javax.enterprise.inject.spi.InjectionPoint; \n \n @Singleton\n public
+    class LoggerProducer {{\n \n @Produces Logger createLogger(final InjectionPoint
+    ip){{\n return LoggerFactory.getLogger(ip.getMember().getDeclaringClass());\n
+    }}\n \n }}\n ```\n \n and use it in your code like:\n \n ```java\n @Inject private
+    transient Logger logger;\n ```\n "
   ruleID: seam-java-00220
   when:
     java.referenced:
@@ -772,9 +727,7 @@
       pattern: org.jboss.seam.annotations.Logger
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.datamodel.DataModel{*}
-    In Java EE, the Expression Language Specification has evolved and allows parameters to be passed to EL method expressions.. This approach should be used as a replacement for the `@DataModel*` functionality.
+  description: Seam API - org.jboss.seam.annotations.datamodel.DataModel{*}
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -793,18 +746,16 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#idm40851856
   - title: Java EE - Binding Component Values and Instances to Managed Bean Properties
     url: http://docs.oracle.com/javaee/7/tutorial/jsf-custom012.htm#BNATI
-  message: In Java EE, the Expression Language Specification has evolved and allows
-    parameters to be passed to EL method expressions.. This approach should be used
-    as a replacement for the `@DataModel*` functionality.
+  message: "In Java EE, the Expression Language Specification has evolved and allows
+    parameters to be passed to EL method expressions. \n This approach should be used
+    as a replacement for the `@DataModel*` functionality. \n "
   ruleID: seam-java-00230
   when:
     java.referenced:
       location: ANNOTATION
       pattern: org.jboss.seam.annotations.datamodel.DataModel*
 - customVariables: []
-  description: |-
-    Seam API - firing and observing events
-    Both Seam 2 and CDI beans may produce and consume events in order to communicate with other beans. Unlike method invocation, events allow for decoupled architecture with no compile-time dependency.. In Seam 2, the type of an event is represented by a string value. Observer methods may observe one or more event types.. Unlike Seam 2, the process of observer method resolution is type-safe in CDI. A CDI event is represented by a payload (any Java object) and a set of qualifiers. The Java types of the event payload together with qualifiers determine which observer methods are notified of the event
+  description: Seam API - firing and observing events
   effort: 0
   labels:
   - konveyor.io/source=java-ee
@@ -823,14 +774,14 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html-single/Seam_Guide/index.html#_events
   - title: Java EE - Using Events in CDI Applications
     url: http://docs.oracle.com/javaee/7/tutorial/cdi-adv005.htm#GKHIC
-  message: Both Seam 2 and CDI beans may produce and consume events in order to communicate
-    with other beans. Unlike method invocation, events allow for decoupled architecture
-    with no compile-time dependency.. In Seam 2, the type of an event is represented
-    by a string value. Observer methods may observe one or more event types.. Unlike
-    Seam 2, the process of observer method resolution is type-safe in CDI. A CDI event
-    is represented by a payload (any Java object) and a set of qualifiers. The Java
-    types of the event payload together with qualifiers determine which observer methods
-    are notified of the event
+  message: "\n Both Seam 2 and CDI beans may produce and consume events in order to
+    communicate with other beans. Unlike method invocation, events allow for decoupled
+    architecture with no compile-time dependency.\n \n In Seam 2, the type of an event
+    is represented by a string value. Observer methods may observe one or more event
+    types.\n \n Unlike Seam 2, the process of observer method resolution is type-safe
+    in CDI. A CDI event is represented by a payload (any Java object) and a set of
+    qualifiers. The Java types of the event payload together with qualifiers determine
+    which observer methods are notified of the event \n "
   ruleID: seam-java-00240
   when:
     or:
@@ -841,9 +792,7 @@
         location: METHOD_CALL
         pattern: org.jboss.seam.core.Events*
 - customVariables: []
-  description: |-
-    Seam API - Interceptors
-    In the Java EE, the concept of interceptors was extracted into a separate specification. As a result, not only EJBs but any CDI managed beans can benefit from this facility.. If you used interceptors in Seam 2, migration is straightforward. The names and semantics of most of the annotations remain unchanged. If you used meta-annotations to bind interceptors to your beans in Seam 2, this idea (slightly modified) made it into the specification and is now know as an Interceptor binding.
+  description: Seam API - Interceptors
   effort: 0
   labels:
   - konveyor.io/source=java-ee
@@ -862,12 +811,13 @@
     url: http://docs.oracle.com/javaee/7/tutorial/cdi-adv006.htm#GKHJX
   - title: Using Java EE Interceptors
     url: http://docs.oracle.com/javaee/7/tutorial/interceptors001.htm#GKIGQ
-  message: In the Java EE, the concept of interceptors was extracted into a separate
+  message: "\n In the Java EE, the concept of interceptors was extracted into a separate
     specification. As a result, not only EJBs but any CDI managed beans can benefit
-    from this facility.. If you used interceptors in Seam 2, migration is straightforward.
+    from this facility.\n\n If you used interceptors in Seam 2, migration is straightforward.
     The names and semantics of most of the annotations remain unchanged. If you used
     meta-annotations to bind interceptors to your beans in Seam 2, this idea (slightly
     modified) made it into the specification and is now know as an Interceptor binding.
+    \n "
   ruleID: seam-java-00250
   when:
     java.referenced:
@@ -875,9 +825,7 @@
       pattern: org.jboss.seam.annotations.intercept*
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - Asynchronous annotation
-    Replace with Java EE annotation `@javax.ejb.Asynchronous`.
+  description: Seam API - Asynchronous annotation
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -902,9 +850,7 @@
       pattern: org.jboss.seam.annotations.async.Asynchronous
 - category: mandatory
   customVariables: []
-  description: |-
-    Seam API - org.jboss.seam.annotations.Transactional annotation
-    Replace with Java EE annotation `@javax.transaction.Transactional`. The usage and transaction types are the same like in Seam API.
+  description: Seam API - org.jboss.seam.annotations.Transactional annotation
   effort: 1
   labels:
   - konveyor.io/source=java-ee
diff --git a/default/generated/eap6/30-seam-ui.windup.yaml b/default/generated/eap6/30-seam-ui.windup.yaml
index ad77c4a3..66acfb85 100644
--- a/default/generated/eap6/30-seam-ui.windup.yaml
+++ b/default/generated/eap6/30-seam-ui.windup.yaml
@@ -6,7 +6,7 @@
     This approach is low effort but the application will not use a tested and supported
     library and it may not work on EAP 7 at all.\n                        2. Switch
     to standard CDI beans and migrate to JSF 2.2 UI tags. This will require significant
-    migration effort.\n\n                    \n"
+    migration effort.\n\n                    "
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/source=eap5
@@ -44,7 +44,7 @@
     work on EAP 7 at all.\n                        2. Switch to standard CDI beans
     and migrate to JSF 2.2 UI tags. This will require significant migration effort.\n\n
     \                       The provided links describe the issue in more detail.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/source=eap5
@@ -70,9 +70,7 @@
       xpath: //*[namespace-uri()='http://jboss.org/schema/seam/taglib']
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:button
-    Seam UI's `<s:button>` JSF control should be replaced by `<h:button>`.. There are differences in attributes, for example the _action_ attribute maps to _outcome_ and there is no _propagation_ attribute.
+  description: JSF Seam 2 UI control s:button
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -88,9 +86,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:button>` JSF control should be replaced by `<h:button>`..
+  message: "\n Seam UI's `<s:button>` JSF control should be replaced by `<h:button>`.\n
     There are differences in attributes, for example the _action_ attribute maps to
-    _outcome_ and there is no _propagation_ attribute.
+    _outcome_ and there is no _propagation_ attribute.\n "
   ruleID: seam-ui-jsf-00001-01
   when:
     or:
@@ -104,9 +102,7 @@
         xpath: //s:button
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:link
-    Seam UI's `<s:link>` should be replaced by `<h:link>`.. There are differences in attributes, for example the _action_ attribute maps to _outcome_ and there is no _propagation_ attribute.
+  description: JSF Seam 2 UI control s:link
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -122,9 +118,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:link>` should be replaced by `<h:link>`.. There are differences
-    in attributes, for example the _action_ attribute maps to _outcome_ and there
-    is no _propagation_ attribute.
+  message: "\n Seam UI's `<s:link>` should be replaced by `<h:link>`.\n There are
+    differences in attributes, for example the _action_ attribute maps to _outcome_
+    and there is no _propagation_ attribute.\n "
   ruleID: seam-ui-jsf-01000
   when:
     or:
@@ -138,9 +134,7 @@
         xpath: //s:link
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:conversationId
-    There is no direct mapping for `<s:conversationId>` in JSF UI controls.
+  description: JSF Seam 2 UI control s:conversationId
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -156,7 +150,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:conversationId>` in JSF UI controls.
+  message: "\n There is no direct mapping for `<s:conversationId>` in JSF UI controls.\n "
   ruleID: seam-ui-jsf-01001
   when:
     or:
@@ -170,9 +164,7 @@
         xpath: //s:conversationId
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:conversationPropagation
-    There is no direct mapping for `<s:conversationPropagation>` in JSF UI controls
+  description: JSF Seam 2 UI control s:conversationPropagation
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -188,8 +180,8 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:conversationPropagation>` in JSF UI
-    controls
+  message: "\n There is no direct mapping for `<s:conversationPropagation>` in JSF
+    UI controls\n "
   ruleID: seam-ui-jsf-01002
   when:
     or:
@@ -203,9 +195,7 @@
         xpath: //s:conversationPropagation
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:taskId
-    There is no direct mapping for `<s:taskId>` in JSF UI controls
+  description: JSF Seam 2 UI control s:taskId
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -221,7 +211,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:taskId>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:taskId>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01003
   when:
     or:
@@ -235,9 +225,7 @@
         xpath: //s:taskId
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:defaultAction
-    There is no direct mapping for `<s:defaultAction>` in JSF UI controls
+  description: JSF Seam 2 UI control s:defaultAction
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -253,7 +241,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:defaultAction>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:defaultAction>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01004
   when:
     or:
@@ -267,9 +255,7 @@
         xpath: //s:defaultAction
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertDateTime
-    Seam UI's `<f:convertDateTime type="time" pattern="kk:mm:ss">` should be replaced by `<f:convertDateTime>`.. The format can be configured by setting  the locale,. or by setting the context-param `javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE` to `true`.
+  description: JSF Seam 2 UI control s:convertDateTime
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -285,10 +271,10 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<f:convertDateTime type="time" pattern="kk:mm:ss">` should be
-    replaced by `<f:convertDateTime>`.. The format can be configured by setting  the
-    locale,. or by setting the context-param `javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE`
-    to `true`.
+  message: "\n Seam UI's `<f:convertDateTime type=\"time\" pattern=\"kk:mm:ss\">`
+    should be replaced by `<f:convertDateTime>`.\n\n The format can be configured
+    by setting the locale,\n or by setting the context-param `javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE`
+    to `true`.\n "
   ruleID: seam-ui-jsf-01005
   when:
     or:
@@ -302,9 +288,7 @@
         xpath: //s:convertDateTime
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertEntity
-    Seam UI's `<s:convertEntity>` should be replaced by `<f:converter converterId="[yourConverterClass]">`.
+  description: JSF Seam 2 UI control s:convertEntity
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -320,7 +304,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:convertEntity>` should be replaced by `<f:converter converterId="[yourConverterClass]">`.
+  message: "\n Seam UI's `<s:convertEntity>` should be replaced by `<f:converter converterId=\"[yourConverterClass]\">`.\n "
   ruleID: seam-ui-jsf-01006
   when:
     or:
@@ -334,9 +318,7 @@
         xpath: //s:convertEntity
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:enumItem
-    There is no direct mapping for `<s:enumItem>` in JSF UI controls
+  description: JSF Seam 2 UI control s:enumItem
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -352,7 +334,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:enumItem>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:enumItem>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01007
   when:
     or:
@@ -366,9 +348,7 @@
         xpath: //s:enumItem
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:token
-    There is no direct mapping for `<s:token>` in JSF UI controls
+  description: JSF Seam 2 UI control s:token
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -384,7 +364,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:token>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:token>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01008
   when:
     or:
@@ -398,9 +378,7 @@
         xpath: //s:token
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:formattedText
-    There is no direct mapping for `<s:formattedText>` in JSF UI controls
+  description: JSF Seam 2 UI control s:formattedText
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -416,7 +394,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:formattedText>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:formattedText>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01009
   when:
     or:
@@ -430,9 +408,7 @@
         xpath: //s:formattedText
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:cache
-    There is no direct mapping for `<s:cache>` in JSF UI controls
+  description: JSF Seam 2 UI control s:cache
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -448,7 +424,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:cache>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:cache>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01010
   when:
     or:
@@ -462,9 +438,7 @@
         xpath: //s:cache
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:resource
-    There is no direct mapping for `<s:resource>` in JSF UI controls
+  description: JSF Seam 2 UI control s:resource
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -480,7 +454,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:resource>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:resource>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01011
   when:
     or:
@@ -494,9 +468,7 @@
         xpath: //s:resource
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:download
-    There is no direct mapping for `<s:download>` in JSF UI controls
+  description: JSF Seam 2 UI control s:download
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -512,7 +484,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:download>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:download>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01012
   when:
     or:
@@ -526,9 +498,7 @@
         xpath: //s:download
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:remote
-    There is no direct mapping for `<s:remote>` in JSF UI controls
+  description: JSF Seam 2 UI control s:remote
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -544,7 +514,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:remote>` in JSF UI controls
+  message: "\n There is no direct mapping for `<s:remote>` in JSF UI controls\n "
   ruleID: seam-ui-jsf-01013
   when:
     or:
@@ -558,9 +528,7 @@
         xpath: //s:remote
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:selectItems
-    Seam UI's `<s:selectItems>` should be replaced by `<h:selectItems>`.
+  description: JSF Seam 2 UI control s:selectItems
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -576,7 +544,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:selectItems>` should be replaced by `<h:selectItems>`.
+  message: "\n Seam UI's `<s:selectItems>` should be replaced by `<h:selectItems>`.\n "
   ruleID: seam-ui-jsf-01014
   when:
     or:
@@ -590,9 +558,7 @@
         xpath: //s:selectItems
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:validate
-    Seam UI's `<s:validate>` should be replaced by `<f:validateBean>`.
+  description: JSF Seam 2 UI control s:validate
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -608,7 +574,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:validate>` should be replaced by `<f:validateBean>`.
+  message: "\n Seam UI's `<s:validate>` should be replaced by `<f:validateBean>`.\n "
   ruleID: seam-ui-jsf-01015
   when:
     or:
@@ -622,9 +588,7 @@
         xpath: //s:validate
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:fragment
-    Seam UI's `<s:fragment>` should be replaced by `<ui:fragment>`.
+  description: JSF Seam 2 UI control s:fragment
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -640,7 +604,7 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Seam UI's `<s:fragment>` should be replaced by `<ui:fragment>`.
+  message: "\n Seam UI's `<s:fragment>` should be replaced by `<ui:fragment>`.\n "
   ruleID: seam-ui-jsf-01016
   when:
     or:
@@ -654,9 +618,7 @@
         xpath: //s:fragment
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertEnum
-    There is no direct mapping for `<s:convertEnum>` in JSF UI controls, but JSF 2 has a built-in EnumConverter which can be extended if necessary.
+  description: JSF Seam 2 UI control s:convertEnum
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -674,8 +636,8 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
   - title: Java EE javax.faces.convert.EnumConverter
     url: https://docs.oracle.com/javaee/6/api/javax/faces/convert/EnumConverter.html
-  message: There is no direct mapping for `<s:convertEnum>` in JSF UI controls, but
-    JSF 2 has a built-in EnumConverter which can be extended if necessary.
+  message: "\n There is no direct mapping for `<s:convertEnum>` in JSF UI controls,
+    but JSF 2 has a built-in EnumConverter which can be extended if necessary.\n "
   ruleID: seam-ui-jsf-01017
   when:
     or:
@@ -689,9 +651,7 @@
         xpath: //s:convertEnum
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertAtomicBoolean
-    There is no direct mapping for `<s:convertAtomicBoolean>` in JSF UI controls. Create a custom converter for a replacement.
+  description: JSF Seam 2 UI control s:convertAtomicBoolean
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -709,8 +669,8 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
   - title: Creating and Using a Custom Converter
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnaus.html
-  message: There is no direct mapping for `<s:convertAtomicBoolean>` in JSF UI controls.
-    Create a custom converter for a replacement.
+  message: "\n There is no direct mapping for `<s:convertAtomicBoolean>` in JSF UI
+    controls. Create a custom converter for a replacement.\n "
   ruleID: seam-ui-jsf-01018
   when:
     or:
@@ -724,9 +684,7 @@
         xpath: //s:convertAtomicBoolean
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertAtomicInteger
-    There is no direct mapping for `<s:convertAtomicInteger>` in JSF UI controls. Create a custom converter for a replacement.
+  description: JSF Seam 2 UI control s:convertAtomicInteger
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -744,8 +702,8 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
   - title: Creating and Using a Custom Converter
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnaus.html
-  message: There is no direct mapping for `<s:convertAtomicInteger>` in JSF UI controls.
-    Create a custom converter for a replacement.
+  message: "\n There is no direct mapping for `<s:convertAtomicInteger>` in JSF UI
+    controls. Create a custom converter for a replacement.\n "
   ruleID: seam-ui-jsf-01019
   when:
     or:
@@ -759,9 +717,7 @@
         xpath: //s:convertAtomicInteger
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:convertAtomicLong
-    There is no direct mapping for `<s:convertAtomicLong>` in JSF UI controls. Create a custom converter for a replacement.
+  description: JSF Seam 2 UI control s:convertAtomicLong
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -779,8 +735,8 @@
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
   - title: Creating and Using a Custom Converter
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnaus.html
-  message: There is no direct mapping for `<s:convertAtomicLong>` in JSF UI controls.
-    Create a custom converter for a replacement.
+  message: "\n There is no direct mapping for `<s:convertAtomicLong>` in JSF UI controls.
+    Create a custom converter for a replacement.\n "
   ruleID: seam-ui-jsf-01020
   when:
     or:
@@ -794,9 +750,7 @@
         xpath: //s:convertAtomicLong
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:validateEquality
-    There is no direct mapping for `<s:validateEquality>` in JSF UI controls.. Use respective `<f:validate[constraint]>` like:. * `<f:validateDoubleRange>`,. * `<f:validateLength>`,. * `<f:validateLongRange>`,. * `<f:validateRequired>`.
+  description: JSF Seam 2 UI control s:validateEquality
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -812,9 +766,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:validateEquality>` in JSF UI controls..
-    Use respective `<f:validate[constraint]>` like:. * `<f:validateDoubleRange>`,.
-    * `<f:validateLength>`,. * `<f:validateLongRange>`,. * `<f:validateRequired>`.
+  message: "\n There is no direct mapping for `<s:validateEquality>` in JSF UI controls.\n
+    Use respective `<f:validate[constraint]>` like:\n\n * `<f:validateDoubleRange>`,\n
+    * `<f:validateLength>`,\n * `<f:validateLongRange>`,\n * `<f:validateRequired>`.\n\n "
   ruleID: seam-ui-jsf-01021
   when:
     or:
@@ -828,9 +782,7 @@
         xpath: //s:validateEquality
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:validateAll
-    There is no direct mapping for `<s:validateAll>` in JSF UI controls, but you can achieve a similar effect by using `<f:validateBean>` or [Richfaces](http://richfaces.jboss.org/) `<rich:validator>`.
+  description: JSF Seam 2 UI control s:validateAll
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -846,9 +798,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:validateAll>` in JSF UI controls, but
-    you can achieve a similar effect by using `<f:validateBean>` or [Richfaces](http://richfaces.jboss.org/)
-    `<rich:validator>`.
+  message: "\n There is no direct mapping for `<s:validateAll>` in JSF UI controls,
+    but you can achieve a similar effect by using `<f:validateBean>` or [Richfaces](http://richfaces.jboss.org/)
+    `<rich:validator>`.\n "
   ruleID: seam-ui-jsf-01022
   when:
     or:
@@ -862,9 +814,7 @@
         xpath: //s:validateAll
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:decorate
-    There is no direct mapping for `<s:decorate>` in JSF UI controls, but you can achieve the same functionality by using the UIInputContainer and a composite container, both of which are demonstrated in the [Open18 migration example](https://github.com/seam/migration/blob/develop/open18_java_ee_6). [input.xhtml](https://raw.githubusercontent.com/seam/migration/develop/open18_java_ee_6/src/main/webapp/resources/components/input.xhtml) file.
+  description: JSF Seam 2 UI control s:decorate
   effort: 3
   labels:
   - konveyor.io/source=java-ee
@@ -880,11 +830,11 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:decorate>` in JSF UI controls, but you
-    can achieve the same functionality by using the UIInputContainer and a composite
-    container, both of which are demonstrated in the [Open18 migration example](https://github.com/seam/migration/blob/develop/open18_java_ee_6).
+  message: "\n There is no direct mapping for `<s:decorate>` in JSF UI controls, but
+    you can achieve the same functionality by using the UIInputContainer and a composite
+    container, both of which are demonstrated in the [Open18 migration example](https://github.com/seam/migration/blob/develop/open18_java_ee_6)\n
     [input.xhtml](https://raw.githubusercontent.com/seam/migration/develop/open18_java_ee_6/src/main/webapp/resources/components/input.xhtml)
-    file.
+    file.\n "
   ruleID: seam-ui-jsf-01023
   when:
     or:
@@ -898,9 +848,7 @@
         xpath: //s:decorate
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:div
-    There is no direct mapping for `<s:div>` in JSF UI controls, but it could be done with an `<h:panelGroup layout="block">` or a `<ui:fragment>` containing a div.
+  description: JSF Seam 2 UI control s:div
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -916,9 +864,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:div>` in JSF UI controls, but it could
-    be done with an `<h:panelGroup layout="block">` or a `<ui:fragment>` containing
-    a div.
+  message: "\n There is no direct mapping for `<s:div>` in JSF UI controls, but it
+    could be done with an `<h:panelGroup layout=\"block\">` or a `<ui:fragment>` containing
+    a div.\n "
   ruleID: seam-ui-jsf-01024
   when:
     or:
@@ -932,9 +880,7 @@
         xpath: //s:div
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:span
-    There is no direct mapping for `<s:span>` in JSF UI controls, but you can achieve a similar effect by using `<h:panelGroup>` or a `<ui:fragment>` with a span element.
+  description: JSF Seam 2 UI control s:span
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -950,9 +896,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:span>` in JSF UI controls, but you can
-    achieve a similar effect by using `<h:panelGroup>` or a `<ui:fragment>` with a
-    span element.
+  message: "\n There is no direct mapping for `<s:span>` in JSF UI controls, but you
+    can achieve a similar effect by using `<h:panelGroup>` or a `<ui:fragment>` with
+    a span element.\n "
   ruleID: seam-ui-jsf-01025
   when:
     or:
@@ -966,9 +912,7 @@
         xpath: //s:span
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:label
-    There is no direct mapping for `<s:label>` in JSF UI controls, but `<h:outputLabel>` is similar.
+  description: JSF Seam 2 UI control s:label
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -984,8 +928,8 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:label>` in JSF UI controls, but `<h:outputLabel>`
-    is similar.
+  message: "\n There is no direct mapping for `<s:label>` in JSF UI controls, but
+    `<h:outputLabel>` is similar.\n "
   ruleID: seam-ui-jsf-01026
   when:
     or:
@@ -999,9 +943,7 @@
         xpath: //s:label
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:message
-    Use `<h:message for="name" errorClass="invalid">` or [Richfaces](http://richfaces.jboss.org/) `<rich:message>`.
+  description: JSF Seam 2 UI control s:message
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -1017,8 +959,8 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: Use `<h:message for="name" errorClass="invalid">` or [Richfaces](http://richfaces.jboss.org/)
-    `<rich:message>`.
+  message: "\n Use `<h:message for=\"name\" errorClass=\"invalid\">` or [Richfaces](http://richfaces.jboss.org/)
+    `<rich:message>`.\n "
   ruleID: seam-ui-jsf-01027
   when:
     or:
@@ -1032,9 +974,7 @@
         xpath: //s:message
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:fileUpload
-    There is no direct mapping for `<s:fileUpload>` in JSF UI controls. You can achieve similar functionality by using [Richfaces](http://richfaces.jboss.org/) `<rich:fileUpload>`
+  description: JSF Seam 2 UI control s:fileUpload
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -1050,9 +990,9 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:fileUpload>` in JSF UI controls. You
-    can achieve similar functionality by using [Richfaces](http://richfaces.jboss.org/)
-    `<rich:fileUpload>`
+  message: "\n There is no direct mapping for `<s:fileUpload>` in JSF UI controls.
+    You can achieve similar functionality by using [Richfaces](http://richfaces.jboss.org/)
+    `<rich:fileUpload>`\n "
   ruleID: seam-ui-jsf-01028
   when:
     or:
@@ -1066,9 +1006,7 @@
         xpath: //s:fileUpload
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF Seam 2 UI control s:graphicImage
-    There is no direct mapping for `<s:graphicImage>` in JSF UI controls, but you can use `<h:graphicImage>` as Seam extends that JSF UI control.
+  description: JSF Seam 2 UI control s:graphicImage
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -1084,8 +1022,8 @@
   links:
   - title: Seam 2 UI controls migration to JSF
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Web_Framework_Kit/2.7/html/Seam_Guide/_seam_2_ui_controls_migration_to_jsf.html
-  message: There is no direct mapping for `<s:graphicImage>` in JSF UI controls, but
-    you can use `<h:graphicImage>` as Seam extends that JSF UI control.
+  message: "\n There is no direct mapping for `<s:graphicImage>` in JSF UI controls,
+    but you can use `<h:graphicImage>` as Seam extends that JSF UI control.\n "
   ruleID: seam-ui-jsf-01029
   when:
     or:
diff --git a/default/generated/eap6/31-xml-webservices.windup.yaml b/default/generated/eap6/31-xml-webservices.windup.yaml
index 96619636..c5297944 100644
--- a/default/generated/eap6/31-xml-webservices.windup.yaml
+++ b/default/generated/eap6/31-xml-webservices.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -16,6 +17,7 @@
       namespaces: {}
       xpath: /serviceGroup/service/operation
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -33,6 +35,7 @@
       namespaces: {}
       xpath: /module/InFlow
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -50,6 +53,7 @@
       namespaces: {}
       xpath: /axisconfig
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -68,6 +72,7 @@
         xfire: http://xfire.codehaus.org/config/1.0
       xpath: /xfire:beans
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -88,9 +93,7 @@
       xpath: /*[local-name()='handler-chains']
 - category: optional
   customVariables: []
-  description: |-
-    Use of Web Service Handler2
-    JBoss EAP developer documentation describes JAX-WS Web Services Common API.
+  description: Use of Web Service Handler2
   effort: 0
   labels:
   - konveyor.io/source=java-ee
@@ -120,9 +123,7 @@
       from: webservices
 - category: optional
   customVariables: []
-  description: |-
-    Use of Web Service Handler2
-    JBoss EAP developer documentation about JAX-WS Web Services Endpoints
+  description: Use of Web Service Handler2
   effort: 0
   labels:
   - konveyor.io/source=java-ee
@@ -150,6 +151,7 @@
         xpath: //*[local-name()='service-endpoint-interface']
       from: webservices
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -168,6 +170,7 @@
         cxf: http://cxf.apache.org/bus/extension
       xpath: /extensions
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -186,6 +189,7 @@
         wsp: http://schemas.xmlsoap.org/ws/2004/09/policy
       xpath: //*[local-name()='Policy']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
@@ -204,6 +208,7 @@
         se: http://schemas.xmlsoap.org/soap/envelope/
       xpath: /*[local-name()='Envelope']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=java-ee
   - konveyor.io/target=eap6+
diff --git a/default/generated/eap6/32-eap4-xml-config.windup.yaml b/default/generated/eap6/32-eap4-xml-config.windup.yaml
index dd6acb0d..9a8e5beb 100644
--- a/default/generated/eap6/32-eap4-xml-config.windup.yaml
+++ b/default/generated/eap6/32-eap4-xml-config.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    PostgreSQL JDBC URL
-    This is a JDBC URL, which describes the basic information about. where and how to connect to the database.. This particular URL points to a PostgreSQL database.. In EAP 6, the databases are configured in these steps:. 1. Add the JDBC driver as an EAP 6 module. Download it [here](https://jdbc.postgresql.org/download.html).. 2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS \\. --connection-url=... --driver-name=postgresql \\. --user-name=... --password=.... ```. 3. Use the datasource according to JPA 2.0 standards.
+  description: PostgreSQL JDBC URL
   effort: 5
   labels:
   - konveyor.io/source=eap4
@@ -18,14 +16,14 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Update_the_DataSource_Configuration
   - title: JBoss EAP 6 Datasource Configuration
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#sect-Datasource_Configuration
-  message: This is a JDBC URL, which describes the basic information about. where
-    and how to connect to the database.. This particular URL points to a PostgreSQL
-    database.. In EAP 6, the databases are configured in these steps:. 1. Add the
-    JDBC driver as an EAP 6 module. Download it [here](https://jdbc.postgresql.org/download.html)..
-    2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli
-    --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
-    \\. --connection-url=... --driver-name=postgresql \\. --user-name=... --password=....
-    ```. 3. Use the datasource according to JPA 2.0 standards.
+  message: "\n This is a JDBC URL, which describes the basic information about\n where
+    and how to connect to the database.\n This particular URL points to a PostgreSQL
+    database.\n\n In EAP 6, the databases are configured in these steps:\n\n 1. Add
+    the JDBC driver as an EAP 6 module. Download it [here](https://jdbc.postgresql.org/download.html).\n
+    2. Create a datasource (actual values need to be changed):\n ```\n $ EAP_HOME/bin/jboss-cli
+    --connect\n [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
+    \\\\\n --connection-url=... --driver-name=postgresql \\\\\n --user-name=... --password=...\n
+    ```\n 3. Use the datasource according to JPA 2.0 standards.\n "
   ruleID: eap4-eap6-25000
   when:
     or:
@@ -40,9 +38,7 @@
         xpath: /datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:postgres')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle Database JDBC URL
-    This is a JDBC URL, which describes the basic information about. where and how to connect to the database.. This particular URL points to an Oracle Database.. In EAP 6, the databases are configured in these steps:. 1. Add the JDBC driver as an EAP 6 module. Download it [here](http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html).. 2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS \\. --connection-url=... --driver-name=oracle \\. --user-name=... --password=.... ```. 3. Use the datasource according to JPA 2.0 standards.. ```. @PersistenceContext EntityManager em;. ```
+  description: Oracle Database JDBC URL
   effort: 5
   labels:
   - konveyor.io/source=eap4
@@ -56,15 +52,15 @@
   links:
   - title: JBoss EAP 6 Datasource Configuration
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#sect-Datasource_Configuration
-  message: This is a JDBC URL, which describes the basic information about. where
-    and how to connect to the database.. This particular URL points to an Oracle Database..
-    In EAP 6, the databases are configured in these steps:. 1. Add the JDBC driver
-    as an EAP 6 module. Download it [here](http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html)..
-    2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli
-    --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
-    \\. --connection-url=... --driver-name=oracle \\. --user-name=... --password=....
-    ```. 3. Use the datasource according to JPA 2.0 standards.. ```. @PersistenceContext
-    EntityManager em;. ```
+  message: "\n This is a JDBC URL, which describes the basic information about\n where
+    and how to connect to the database.\n This particular URL points to an Oracle
+    Database.\n\n In EAP 6, the databases are configured in these steps:\n\n 1. Add
+    the JDBC driver as an EAP 6 module. Download it [here](http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html).\n
+    2. Create a datasource (actual values need to be changed):\n ```\n $ EAP_HOME/bin/jboss-cli
+    --connect\n [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
+    \\\\\n --connection-url=... --driver-name=oracle \\\\\n --user-name=... --password=...\n
+    ```\n 3. Use the datasource according to JPA 2.0 standards.\n\n ```\n @PersistenceContext
+    EntityManager em;\n ```\n "
   ruleID: eap4-eap6-26000
   when:
     or:
@@ -79,9 +75,7 @@
         xpath: /datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:oracle')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Microsoft SQL Server JDBC URL
-    This is a JDBC URL, which describes the basic information about. where and how to connect to the database.. This particular URL points to an Microsoft SQL Server.. In EAP 6, the databases are configured in these steps:. 1. Add the JDBC driver as an EAP 6 module. Download it [here](https://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx).. 2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS \\. --connection-url=... --driver-name=mssql \\. --user-name=... --password=.... ```. 3. Use the datasource according to JPA 2.0 standards.. ```. @PersistenceContext EntityManager em;. ```
+  description: Microsoft SQL Server JDBC URL
   effort: 5
   labels:
   - konveyor.io/source=eap4
@@ -94,15 +88,15 @@
   links:
   - title: JBoss EAP 6 Datasource Configuration
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#sect-Datasource_Configuration
-  message: This is a JDBC URL, which describes the basic information about. where
-    and how to connect to the database.. This particular URL points to an Microsoft
-    SQL Server.. In EAP 6, the databases are configured in these steps:. 1. Add the
-    JDBC driver as an EAP 6 module. Download it [here](https://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx)..
-    2. Create a datasource (actual values need to be changed):. ```. $ EAP_HOME/bin/jboss-cli
-    --connect. [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
-    \\. --connection-url=... --driver-name=mssql \\. --user-name=... --password=....
-    ```. 3. Use the datasource according to JPA 2.0 standards.. ```. @PersistenceContext
-    EntityManager em;. ```
+  message: "\n \n This is a JDBC URL, which describes the basic information about\n
+    where and how to connect to the database.\n This particular URL points to an Microsoft
+    SQL Server.\n\n In EAP 6, the databases are configured in these steps:\n\n 1.
+    Add the JDBC driver as an EAP 6 module. Download it [here](https://msdn.microsoft.com/en-us/sqlserver/aa937724.aspx).\n
+    2. Create a datasource (actual values need to be changed):\n ```\n $ EAP_HOME/bin/jboss-cli
+    --connect\n [standalone@localhost:9999 /] data-source add --name=ExampleDS --jndi-name=java:/ExampleDS
+    \\\\\n --connection-url=... --driver-name=mssql \\\\\n --user-name=... --password=...\n
+    ```\n 3. Use the datasource according to JPA 2.0 standards.\n\n ```\n @PersistenceContext
+    EntityManager em;\n ```\n \n "
   ruleID: eap4-eap6-27000
   when:
     or:
@@ -117,9 +111,7 @@
         xpath: /datasources/local-tx-datasource/connection-url[contains(text(),'jdbc:sqlserver')]
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web connector port
-    The `<Connector port="..."/>` attribute specifies the port. on which JBoss Web listens for requests.. In JBoss EAP 6, set the port number using JBoss CLI or a web console:. ```. :read-children-names(child-type=interface). /subsystem=web/connector=http/:read-resource. ## Notice the "socket-binding" => "http". /socket-binding-group=standard-sockets/socket-binding=http/:read-resource. ## Now set the HTTP port to what you need.. /socket-binding-group=standard-sockets/socket-binding=http/:write-attribute(name=port, value=80). ```
+  description: JBoss Web connector port
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -137,12 +129,13 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#sect-Socket_Binding_Groups
   - title: JBoss EAP 6 - Interfaces
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/administration_and_configuration_guide/#sect-Interfaces
-  message: 'The `<Connector port="..."/>` attribute specifies the port. on which JBoss
-    Web listens for requests.. In JBoss EAP 6, set the port number using JBoss CLI
-    or a web console:. ```. :read-children-names(child-type=interface). /subsystem=web/connector=http/:read-resource.
-    ## Notice the "socket-binding" => "http". /socket-binding-group=standard-sockets/socket-binding=http/:read-resource.
-    ## Now set the HTTP port to what you need.. /socket-binding-group=standard-sockets/socket-binding=http/:write-attribute(name=port,
-    value=80). ```'
+  message: "\n \n The `<Connector port=\"...\"/>` attribute specifies the port\n on
+    which JBoss Web listens for requests.\n In JBoss EAP 6, set the port number using
+    JBoss CLI or a web console:\n ```\n :read-children-names(child-type=interface)\n
+    /subsystem=web/connector=http/:read-resource\n ## Notice the \"socket-binding\"
+    => \"http\"\n /socket-binding-group=standard-sockets/socket-binding=http/:read-resource\n
+    ## Now set the HTTP port to what you need.\n /socket-binding-group=standard-sockets/socket-binding=http/:write-attribute(name=port,
+    value=80)\n ```\n \n "
   ruleID: eap4-eap6-28000
   when:
     builtin.xml:
@@ -152,9 +145,7 @@
       xpath: /Server/Service/Connector/@port
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web connector protocol
-    The `<Connector protocol="..."/>` attribute specifies the protocol. of the particular JBoss Web connector.. In JBoss EAP 6, set the protocol using JBoss CLI or a web console:. ```. :read-children-names(child-type=interface). /subsystem=web/connector=http/:read-resource. /subsystem=web/connector=http/:write-attribute(name=protocol, value=HTTP/1.1). ##  To enable NIO protocol:. /subsystem=web/connector=http/:write-attribute(name=protocol, value=org.apache.coyote.http11.Http11NioProtocol). ```
+  description: JBoss Web connector protocol
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -169,12 +160,12 @@
   links:
   - title: Setup a thread pool for an HTTP Connector
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#Define_Thread_Pools_for_HTTP_Connector_in_JBoss_Enterprise_Application_Platform
-  message: 'The `<Connector protocol="..."/>` attribute specifies the protocol. of
-    the particular JBoss Web connector.. In JBoss EAP 6, set the protocol using JBoss
-    CLI or a web console:. ```. :read-children-names(child-type=interface). /subsystem=web/connector=http/:read-resource.
-    /subsystem=web/connector=http/:write-attribute(name=protocol, value=HTTP/1.1).
-    ##  To enable NIO protocol:. /subsystem=web/connector=http/:write-attribute(name=protocol,
-    value=org.apache.coyote.http11.Http11NioProtocol). ```'
+  message: "\n \n The `<Connector protocol=\"...\"/>` attribute specifies the protocol\n
+    of the particular JBoss Web connector.\n In JBoss EAP 6, set the protocol using
+    JBoss CLI or a web console:\n ```\n :read-children-names(child-type=interface)\n
+    /subsystem=web/connector=http/:read-resource\n /subsystem=web/connector=http/:write-attribute(name=protocol,
+    value=HTTP/1.1)\n ## To enable NIO protocol:\n /subsystem=web/connector=http/:write-attribute(name=protocol,
+    value=org.apache.coyote.http11.Http11NioProtocol)\n ```\n \n "
   ruleID: eap4-eap6-29000
   when:
     builtin.xml:
@@ -184,8 +175,7 @@
       xpath: /Server/Service/Connector/@protocol
 - category: mandatory
   customVariables: []
-  description: |
-    JBoss Web connector - maximal number of threads
+  description: JBoss Web connector - maximal number of threads
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -202,18 +192,19 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#Define_Thread_Pools_for_HTTP_Connector_in_JBoss_Enterprise_Application_Platform
   - title: Define Thread Pools for HTTP Connector in JBoss EAP 6
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#Define_Thread_Pools_for_HTTP_Connector_in_JBoss_Enterprise_Application_Platform
-  message: 'The `<Connector maxThreads="..."/>` attribute specifies the. maximum number
-    of JBoss Web Connector threads.. In JBoss EAP 6, the. [connections do not map
-    1:1 to threads](https://access.redhat.com/solutions/389513),. thanks to use of
-    `javax.nio`. There can be more connection. served by less threads.. You can set
-    the maximum number of connections using JBoss CLI or a web console:. ```. /subsystem=web/connector=http/:write-attribute(name=max-connections,
-    value=200). ```. The default is 512 per CPU core.. You can limit the number of
-    threads using JBoss CLI or a web console:. ```. /subsystem=web/connector=http/:read-resource.
-    ##  Define a thread factory. /subsystem=threads/thread-factory=http-connector-factory:add(thread-name-pattern="HTTP-%t",
-    priority="9", group-name="uq-thread-pool"). ##  Create an executor. /subsystem=threads/unbounded-queue-thread-pool=uq-thread-pool:add(thread-factory="http-connector-factory",
-    keepalive-time=\{{time=30, unit="seconds"}}, max-threads=30). ##  Make the HTTP
-    web connector use this thread pool. /subsystem=web/connector=http:write-attribute(name=executor,
-    value="uq-thread-pool"). ```'
+  message: "\n \n The `<Connector maxThreads=\"...\"/>` attribute specifies the\n
+    maximum number of JBoss Web Connector threads.\n In JBoss EAP 6, the\n [connections
+    do not map 1:1 to threads](https://access.redhat.com/solutions/389513),\n thanks
+    to use of `javax.nio`. There can be more connection\n served by less threads.\n\n
+    You can set the maximum number of connections using JBoss CLI or a web console:\n
+    ```\n /subsystem=web/connector=http/:write-attribute(name=max-connections, value=200)\n
+    ```\n The default is 512 per CPU core.\n\n You can limit the number of threads
+    using JBoss CLI or a web console:\n ```\n /subsystem=web/connector=http/:read-resource\n
+    ## Define a thread factory\n /subsystem=threads/thread-factory=http-connector-factory:add(thread-name-pattern=\"HTTP-%t\",
+    priority=\"9\", group-name=\"uq-thread-pool\")\n ## Create an executor\n /subsystem=threads/unbounded-queue-thread-pool=uq-thread-pool:add(thread-factory=\"http-connector-factory\",
+    keepalive-time=\\{{time=30, unit=\"seconds\"}}, max-threads=30)\n ## Make the
+    HTTP web connector use this thread pool\n /subsystem=web/connector=http:write-attribute(name=executor,
+    value=\"uq-thread-pool\")\n ```\n \n "
   ruleID: eap4-eap6-30000
   when:
     builtin.xml:
@@ -223,9 +214,7 @@
       xpath: /Server/Service/Connector/@maxThreads
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web connector connection timeout
-    The `<Connector connectionTimeout="..."/>` attribute specifies the connection timeout. of the particular JBoss Web connector.. In JBoss EAP 6, set the connection timeout using a system property:. ```. /system-property=org.apache.coyote.ajp.DEFAULT_CONNECTION_TIMEOUT/:add(value=600000). /system-property=org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT/:add(value=120000). ```
+  description: JBoss Web connector connection timeout
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -240,11 +229,11 @@
   links:
   - title: Map HTTP/HTTPS/AJP Connector Attributes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#sect-JBoss_Web_Component_Changes
-  message: The `<Connector connectionTimeout="..."/>` attribute specifies the connection
-    timeout. of the particular JBoss Web connector.. In JBoss EAP 6, set the connection
-    timeout using a system property:. ```. /system-property=org.apache.coyote.ajp.DEFAULT_CONNECTION_TIMEOUT/:add(value=600000).
-    /system-property=org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT/:add(value=120000).
-    ```
+  message: "\n \n The `<Connector connectionTimeout=\"...\"/>` attribute specifies
+    the connection timeout\n of the particular JBoss Web connector.\n In JBoss EAP
+    6, set the connection timeout using a system property:\n ```\n /system-property=org.apache.coyote.ajp.DEFAULT_CONNECTION_TIMEOUT/:add(value=600000)\n
+    /system-property=org.apache.coyote.http11.DEFAULT_CONNECTION_TIMEOUT/:add(value=120000)\n
+    ```\n \n "
   ruleID: eap4-eap6-31000
   when:
     builtin.xml:
@@ -254,9 +243,7 @@
       xpath: /Server/Service/Connector/@connectionTimeout
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web HTTP connector - empty path of the session cookie
-    JBoss Web's `emptySessionPath` option sets the path of a session cookie to '/'.. In JBoss EAP 6, the path is set in a web framework, or in `web.xml`:. ```xml. <session-config>. <cookie-config>. <path>/</path>. <http-only>true</http-only>. <secure/>. </cookie-config>. <tracking-mode>COOKIE</tracking-mode>. </session-config>. ```. Not to be confused with Undertow's `path` which sets the session files storage path.
+  description: JBoss Web HTTP connector - empty path of the session cookie
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -271,12 +258,12 @@
   links:
   - title: JBoss EAP 6 Web Subsystem
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#chap-Web_Subsystem
-  message: JBoss Web's `emptySessionPath` option sets the path of a session cookie
-    to '/'.. In JBoss EAP 6, the path is set in a web framework, or in `web.xml`:.
-    ```xml. <session-config>. <cookie-config>. <path>/</path>. <http-only>true</http-only>.
-    <secure/>. </cookie-config>. <tracking-mode>COOKIE</tracking-mode>. </session-config>.
-    ```. Not to be confused with Undertow's `path` which sets the session files storage
-    path.
+  message: "\n \n JBoss Web's `emptySessionPath` option sets the path of a session
+    cookie to '/'.\n In JBoss EAP 6, the path is set in a web framework, or in `web.xml`:\n
+    ```xml\n <session-config>\n <cookie-config>\n <path>/</path>\n <http-only>true</http-only>\n
+    <secure/>\n </cookie-config>\n <tracking-mode>COOKIE</tracking-mode>\n </session-config>\n
+    ```\n Not to be confused with Undertow's `path` which sets the session files storage
+    path.\n \n "
   ruleID: eap4-eap6-32000
   when:
     builtin.xml:
@@ -286,9 +273,7 @@
       xpath: /Server/Service/Connector/@emptySessionPath
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web connector DNS lookups
-    The `<Connector enableLookups="..."/>` attribute. enables DNS lookup through `request.getRemoteHost()`.. Define this setting using JBoss CLI or the web console.. ```. /subsystem=web/connector=http:write-attribute(name=enable-lookups, value=true). ```
+  description: JBoss Web connector DNS lookups
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -305,10 +290,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#sect-JBoss_Web_Component_Changes
   - title: JBoss EAP 6 Web Subsystem
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#chap-Web_Subsystem
-  message: The `<Connector enableLookups="..."/>` attribute. enables DNS lookup through
-    `request.getRemoteHost()`.. Define this setting using JBoss CLI or the web console..
-    ```. /subsystem=web/connector=http:write-attribute(name=enable-lookups, value=true).
-    ```
+  message: "\n \n The `<Connector enableLookups=\"...\"/>` attribute\n enables DNS
+    lookup through `request.getRemoteHost()`.\n Define this setting using JBoss CLI
+    or the web console.\n ```\n /subsystem=web/connector=http:write-attribute(name=enable-lookups,
+    value=true)\n ```\n \n "
   ruleID: eap4-eap6-33000
   when:
     builtin.xml:
@@ -318,9 +303,7 @@
       xpath: /Server/Service/Connector/@enableLookups
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web HTTP connector port for redirections
-    The `<Connector redirectPort="..."/>` attribute. specifies  a port number to be used in cases of redirection; the common ones being redirection to secure (HTTPS) or AJP connector.. Define this setting using JBoss CLI or the web console.. ```. /subsystem=web/connector=http:write-attribute(name=redirect-port, value=8433). ```
+  description: JBoss Web HTTP connector port for redirections
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -335,11 +318,11 @@
   links:
   - title: Map HTTP/HTTPS/AJP Connector Attributes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#sect-JBoss_Web_Component_Changes
-  message: The `<Connector redirectPort="..."/>` attribute. specifies  a port number
-    to be used in cases of redirection; the common ones being redirection to secure
-    (HTTPS) or AJP connector.. Define this setting using JBoss CLI or the web console..
-    ```. /subsystem=web/connector=http:write-attribute(name=redirect-port, value=8433).
-    ```
+  message: "\n \n The `<Connector redirectPort=\"...\"/>` attribute\n specifies a
+    port number to be used in cases of redirection; the common ones being redirection
+    to secure (HTTPS) or AJP connector.\n\n Define this setting using JBoss CLI or
+    the web console.\n ```\n /subsystem=web/connector=http:write-attribute(name=redirect-port,
+    value=8433)\n ```\n \n "
   ruleID: eap4-eap6-34000
   when:
     builtin.xml:
@@ -349,9 +332,7 @@
       xpath: /Server/Service/Connector/@redirectPort
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web connector scheme
-    The `<Connector scheme="..."/>` attribute. specifies the web connector scheme, such as HTTP or HTTPS.. Define this setting using JBoss CLI or the web console.. ```. /subsystem=web/connector=http:write-attribute(name=scheme, value=http). ```
+  description: JBoss Web connector scheme
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -366,10 +347,10 @@
   links:
   - title: Map HTTP/HTTPS/AJP Connector Attributes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#sect-JBoss_Web_Component_Changes
-  message: The `<Connector scheme="..."/>` attribute. specifies the web connector
-    scheme, such as HTTP or HTTPS.. Define this setting using JBoss CLI or the web
-    console.. ```. /subsystem=web/connector=http:write-attribute(name=scheme, value=http).
-    ```
+  message: "\n \n The `<Connector scheme=\"...\"/>` attribute\n specifies the web
+    connector scheme, such as HTTP or HTTPS.\n\n Define this setting using JBoss CLI
+    or the web console.\n ```\n /subsystem=web/connector=http:write-attribute(name=scheme,
+    value=http)\n ```\n \n "
   ruleID: eap4-eap6-35000
   when:
     builtin.xml:
@@ -379,9 +360,7 @@
       xpath: /Server/Service/Connector/@scheme
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web HTTP connector - the secure option
-    The `secure` option tells the browser (or other HTTP clients) to only send the cookie over SSL connections.. This means the cookie will not be available to any part of the site that is not secure.. If you serve both protocols, the non-secure http connection will then use URL re-writing with the long ";jsessionid=XXXXXXX" appended to every URL.. You should set this to true ONLY if you are only serving https content, for mixed content this setting in NOT recomended.. Define this setting using JBoss CLI or the web console.. ```. /subsystem=web/connector=http:write-attribute(name=secure, value=true). ```
+  description: JBoss Web HTTP connector - the secure option
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -396,14 +375,14 @@
   links:
   - title: Map HTTP/HTTPS/AJP Connector Attributes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#sect-JBoss_Web_Component_Changes
-  message: The `secure` option tells the browser (or other HTTP clients) to only send
-    the cookie over SSL connections.. This means the cookie will not be available
-    to any part of the site that is not secure.. If you serve both protocols, the
-    non-secure http connection will then use URL re-writing with the long ";jsessionid=XXXXXXX"
-    appended to every URL.. You should set this to true ONLY if you are only serving
-    https content, for mixed content this setting in NOT recomended.. Define this
-    setting using JBoss CLI or the web console.. ```. /subsystem=web/connector=http:write-attribute(name=secure,
-    value=true). ```
+  message: "\n \n The `secure` option tells the browser (or other HTTP clients) to
+    only send the cookie over SSL connections.\n This means the cookie will not be
+    available to any part of the site that is not secure.\n If you serve both protocols,
+    the non-secure http connection will then use URL re-writing with the long \";jsessionid=XXXXXXX\"
+    appended to every URL.\n\n You should set this to true ONLY if you are only serving
+    https content, for mixed content this setting in NOT recomended.\n\n Define this
+    setting using JBoss CLI or the web console.\n ```\n /subsystem=web/connector=http:write-attribute(name=secure,
+    value=true)\n ```\n \n "
   ruleID: eap4-eap6-36000
   when:
     builtin.xml:
@@ -413,9 +392,7 @@
       xpath: /Server/Service/Connector[@secure='true']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss Web HTTP - jvmRoute
-    In JBoss Web, the `jvmRoute` attribute of the Engine element allows the load balancer to match requests. to the JVM currently responsible for updating the relevant session.. It does this by appending the name of the JVM to the `JSESSIONID` of the request,. and matching this against the worker name provided in `workers.properites`.. In JBoss EAP 6,. the `jvmRoute` is set to the same value as the server name.. If you need to customize it, you can use a command like the following.. Replace or remove the `/profile=ha portion` of the command, depending on which profile you use or. whether you use a standalone server.. Replace the string `CUSTOM_ROUTE_NAME` with your custom jvmRoute name.. ```. /profile=ha/subsystem=web:write-attribute(name="instance-id", value="CUSTOM_ROUTE_NAME"). ```. The default can be overriden by setting the `jvmRoute` system property.
+  description: JBoss Web HTTP - jvmRoute
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -432,17 +409,17 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#Configure_the_Enterprise_Application_Platform_to_Accept_Requests_From_an_External_HTTPD1
   - title: JBoss EAP 6 System properties
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#System_Properties
-  message: In JBoss Web, the `jvmRoute` attribute of the Engine element allows the
-    load balancer to match requests. to the JVM currently responsible for updating
-    the relevant session.. It does this by appending the name of the JVM to the `JSESSIONID`
-    of the request,. and matching this against the worker name provided in `workers.properites`..
-    In JBoss EAP 6,. the `jvmRoute` is set to the same value as the server name..
-    If you need to customize it, you can use a command like the following.. Replace
+  message: "\n \n In JBoss Web, the `jvmRoute` attribute of the Engine element allows
+    the load balancer to match requests\n to the JVM currently responsible for updating
+    the relevant session.\n It does this by appending the name of the JVM to the `JSESSIONID`
+    of the request,\n and matching this against the worker name provided in `workers.properites`.\n\n
+    In JBoss EAP 6,\n the `jvmRoute` is set to the same value as the server name.\n
+    If you need to customize it, you can use a command like the following.\n Replace
     or remove the `/profile=ha portion` of the command, depending on which profile
-    you use or. whether you use a standalone server.. Replace the string `CUSTOM_ROUTE_NAME`
-    with your custom jvmRoute name.. ```. /profile=ha/subsystem=web:write-attribute(name="instance-id",
-    value="CUSTOM_ROUTE_NAME"). ```. The default can be overriden by setting the `jvmRoute`
-    system property.
+    you use or\n whether you use a standalone server.\n Replace the string `CUSTOM_ROUTE_NAME`
+    with your custom jvmRoute name.\n\n ```\n /profile=ha/subsystem=web:write-attribute(name=\"instance-id\",
+    value=\"CUSTOM_ROUTE_NAME\")\n ```\n\n The default can be overriden by setting
+    the `jvmRoute` system property.\n \n "
   ruleID: eap4-eap6-37000
   when:
     builtin.xml:
@@ -452,9 +429,7 @@
       xpath: /Server/Service/Engine/@jvmRoute
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP 4 EJB container configuration
-    JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml` files.. Extending `"Standard Stateless SessionBean"` allows configuring the instance pool.. Bean-specific instance pool can be set with one line in JBoss EAP 6 management CLI.
+  description: JBoss EAP 4 EJB container configuration
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -475,10 +450,10 @@
     url: http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd
   - title: The EJB Container
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#EJBs_on_JBoss-The_EJB_Container
-  message: JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
-    files.. Extending `"Standard Stateless SessionBean"` allows configuring the instance
-    pool.. Bean-specific instance pool can be set with one line in JBoss EAP 6 management
-    CLI.
+  message: "\n \n JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
+    files.\n Extending `\"Standard Stateless SessionBean\"` allows configuring the
+    instance pool.\n Bean-specific instance pool can be set with one line in JBoss
+    EAP 6 management CLI.\n \n "
   ruleID: eap4-eap6-38000
   when:
     builtin.xml:
@@ -489,9 +464,7 @@
         Stateless SessionBean']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP 4 EJB container configuration
-    JBoss EAP 4 allows overriding the container settings in `jboss.xml` files.. Extending `"Clustered Stateless SessionBean"` allows configuring the instance pool.. Bean-specific instance pool can be set with one line in JBoss EAP 6 management CLI.
+  description: JBoss EAP 4 EJB container configuration
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -511,10 +484,10 @@
     url: http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd
   - title: The EJB Container
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#EJBs_on_JBoss-The_EJB_Container
-  message: JBoss EAP 4 allows overriding the container settings in `jboss.xml` files..
-    Extending `"Clustered Stateless SessionBean"` allows configuring the instance
-    pool.. Bean-specific instance pool can be set with one line in JBoss EAP 6 management
-    CLI.
+  message: "\n \n JBoss EAP 4 allows overriding the container settings in `jboss.xml`
+    files.\n Extending `\"Clustered Stateless SessionBean\"` allows configuring the
+    instance pool.\n Bean-specific instance pool can be set with one line in JBoss
+    EAP 6 management CLI.\n \n "
   ruleID: eap4-eap6-39000
   when:
     builtin.xml:
@@ -525,9 +498,7 @@
         Stateless SessionBean']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP 4 EJB container configuration
-    JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml` files.. Extending `"Standard Message Driven Bean"` allows configuring the instance pool.. MDB's bean-specific instance pool can be set with one line in JBoss EAP 6 management CLI.. Use the `bean-instance-pool-ref` CLI node of the respective configuration part.
+  description: JBoss EAP 4 EJB container configuration
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -547,11 +518,11 @@
     url: http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd
   - title: The EJB Container
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#EJBs_on_JBoss-The_EJB_Container
-  message: JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
-    files.. Extending `"Standard Message Driven Bean"` allows configuring the instance
-    pool.. MDB's bean-specific instance pool can be set with one line in JBoss EAP
-    6 management CLI.. Use the `bean-instance-pool-ref` CLI node of the respective
-    configuration part.
+  message: "\n \n JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
+    files.\n Extending `\"Standard Message Driven Bean\"` allows configuring the instance
+    pool.\n MDB's bean-specific instance pool can be set with one line in JBoss EAP
+    6 management CLI.\n Use the `bean-instance-pool-ref` CLI node of the respective
+    configuration part.\n \n "
   ruleID: eap4-eap6-40000
   when:
     builtin.xml:
@@ -562,9 +533,7 @@
         Message Driven Bean']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP 4 EJB container configuration
-    JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml` files.. Extending `"Singleton Message Driven Bean"` allows configuring the instance pool.. Singleton Message Driven Bean's bean-specific bean-specific instance pool can be set with one line in JBoss EAP 6 management CLI.. Use the `bean-instance-pool-ref` CLI node of the respective configuration part.
+  description: JBoss EAP 4 EJB container configuration
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -584,11 +553,11 @@
     url: http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd
   - title: The EJB Container
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#EJBs_on_JBoss-The_EJB_Container
-  message: JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
-    files.. Extending `"Singleton Message Driven Bean"` allows configuring the instance
-    pool.. Singleton Message Driven Bean's bean-specific bean-specific instance pool
-    can be set with one line in JBoss EAP 6 management CLI.. Use the `bean-instance-pool-ref`
-    CLI node of the respective configuration part.
+  message: "\n \n JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
+    files.\n Extending `\"Singleton Message Driven Bean\"` allows configuring the
+    instance pool.\n Singleton Message Driven Bean's bean-specific bean-specific instance
+    pool can be set with one line in JBoss EAP 6 management CLI.\n Use the `bean-instance-pool-ref`
+    CLI node of the respective configuration part.\n \n "
   ruleID: eap4-eap6-41000
   when:
     builtin.xml:
@@ -599,9 +568,7 @@
         Message Driven Bean']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP 4 EJB container configuration
-    JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml` files.. Extending `"Standard Message Inflow Driven Bean"` allows configuring the instance pool.. Standard Message Inflow Driven Bean's bean-specific bean-specific instance pool can be set with one line in JBoss EAP 6 management CLI.. Use the `bean-instance-pool-ref` CLI node of the respective configuration part.
+  description: JBoss EAP 4 EJB container configuration
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -621,11 +588,11 @@
     url: http://www.jboss.org/j2ee/dtd/jboss_5_0.dtd
   - title: The EJB Container
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#EJBs_on_JBoss-The_EJB_Container
-  message: JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
-    files.. Extending `"Standard Message Inflow Driven Bean"` allows configuring the
-    instance pool.. Standard Message Inflow Driven Bean's bean-specific bean-specific
-    instance pool can be set with one line in JBoss EAP 6 management CLI.. Use the
-    `bean-instance-pool-ref` CLI node of the respective configuration part.
+  message: "\n \n JBoss EAP 4 and 5 allow overriding the container settings in `jboss.xml`
+    files.\n Extending `\"Standard Message Inflow Driven Bean\"` allows configuring
+    the instance pool.\n Standard Message Inflow Driven Bean's bean-specific bean-specific
+    instance pool can be set with one line in JBoss EAP 6 management CLI.\n Use the
+    `bean-instance-pool-ref` CLI node of the respective configuration part.\n \n "
   ruleID: eap4-eap6-42000
   when:
     builtin.xml:
diff --git a/default/generated/eap6/33-jboss-eap5-java.windup.yaml b/default/generated/eap6/33-jboss-eap5-java.windup.yaml
index 04cb9a0a..f0bb67e8 100644
--- a/default/generated/eap6/33-jboss-eap5-java.windup.yaml
+++ b/default/generated/eap6/33-jboss-eap5-java.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -18,9 +19,7 @@
       pattern: org.jboss.ejb3.annotation.Management
 - category: optional
   customVariables: []
-  description: |-
-    JMS legacy javax.jms.QueueConnectionFactory
-    `QueueConnectionFactory` was used to obtain connection to JMS queues.. Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.
+  description: JMS legacy javax.jms.QueueConnectionFactory
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -35,8 +34,9 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/sect-Configuration1.html#Configure_the_JMS_Server1
   - title: JavaEE 6 - JMS Interfaces
     url: https://docs.oracle.com/javaee/6/api/javax/jms/package-summary.html#package_description
-  message: '`QueueConnectionFactory` was used to obtain connection to JMS queues..
-    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.'
+  message: "\n \n `QueueConnectionFactory` was used to obtain connection to JMS queues.\n\n
+    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.\n
+    \n "
   ruleID: jboss-eap5-java-02000
   when:
     or:
@@ -51,9 +51,7 @@
   - name: package
     nameOfCaptureGroup: package
     pattern: org.jboss(?P<package>(\.ejb3)?\.annotation(\.ejb)?.)?Service
-  description: |-
-    org.jboss{package}.Service
-    The `@Service` annotation is one of JBoss EJB 3.0 extensions which creates a singleton EJB.. To achieve the singleton nature of the `@Service` annotation, use the EJB3.1 spec `@Singleton` bean
+  description: org.jboss{package}.Service
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -72,9 +70,9 @@
     url: https://docs.jboss.org/ejb3/docs/reference/build/reference/en/html/jboss_extensions.html
   - title: JBoss EJB 3.0 Javadoc
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
-  message: The `@Service` annotation is one of JBoss EJB 3.0 extensions which creates
-    a singleton EJB.. To achieve the singleton nature of the `@Service` annotation,
-    use the EJB3.1 spec `@Singleton` bean
+  message: "\n The `@Service` annotation is one of JBoss EJB 3.0 extensions which
+    creates a singleton EJB.\n To achieve the singleton nature of the `@Service` annotation,
+    use the EJB3.1 spec `@Singleton` bean\n "
   ruleID: jboss-eap5-java-04000
   when:
     java.referenced:
@@ -85,9 +83,7 @@
   - name: package
     nameOfCaptureGroup: package
     pattern: org.jboss(?P<package>(\.ejb3)?\.annotation(\.ejb)?.)?Management
-  description: |-
-    org.jboss{package}.Management
-    The `@Management` annotation is one of JBoss EJB 3.0 extensions which wraps the the bean. as an MBean and install it in the JBoss MBean Server.. To achieve the singleton nature of the `@Service` and `@Management` annotations, use the EJB3.1 spec `@Singleton` bean.
+  description: org.jboss{package}.Management
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -107,10 +103,10 @@
     url: https://docs.jboss.org/ejb3/docs/reference/build/reference/en/html/jboss_extensions.html
   - title: JBoss EJB 3.0 Javadoc
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
-  message: The `@Management` annotation is one of JBoss EJB 3.0 extensions which wraps
-    the the bean. as an MBean and install it in the JBoss MBean Server.. To achieve
-    the singleton nature of the `@Service` and `@Management` annotations, use the
-    EJB3.1 spec `@Singleton` bean.
+  message: "\n The `@Management` annotation is one of JBoss EJB 3.0 extensions which
+    wraps the the bean\n as an MBean and install it in the JBoss MBean Server.\n To
+    achieve the singleton nature of the `@Service` and `@Management` annotations,
+    use the EJB3.1 spec `@Singleton` bean.\n "
   ruleID: jboss-eap5-java-05000
   when:
     java.referenced:
@@ -118,9 +114,7 @@
       pattern: org.jboss(.ejb3)?.annotation(.ejb)?.Management
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.annotation.ejb.LocalBinding
-    The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions. which specifies the local jndi binding for an EJB local interface.. Migrate to `org.jboss.ejb3.annotation.LocalBinding`.
+  description: org.jboss.annotation.ejb.LocalBinding
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -135,8 +129,9 @@
     url: https://docs.jboss.org/ejb3/docs/reference/build/reference/en/html/jboss_extensions.html
   - title: JBoss EJB 3.0 Javadoc
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
-  message: The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions. which
-    specifies the local jndi binding for an EJB local interface.. Migrate to `org.jboss.ejb3.annotation.LocalBinding`.
+  message: "\n The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions\n
+    which specifies the local jndi binding for an EJB local interface.\n Migrate to
+    `org.jboss.ejb3.annotation.LocalBinding`.\n "
   ruleID: jboss-eap5-java-06000
   when:
     java.referenced:
@@ -144,9 +139,7 @@
       pattern: org.jboss.annotation.ejb.LocalBinding
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.annotation.ejb.Depends
-    The `@Depends` annotation is one of JBoss EJB 3.0 extensions. which specifies a deployment dependency for a bean.. Validate that a JBoss EAP 6 Dependency exists.
+  description: org.jboss.annotation.ejb.Depends
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -161,8 +154,9 @@
     url: https://docs.jboss.org/ejb3/docs/reference/build/reference/en/html/jboss_extensions.html
   - title: JBoss EJB 3.0 Javadoc
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
-  message: The `@Depends` annotation is one of JBoss EJB 3.0 extensions. which specifies
-    a deployment dependency for a bean.. Validate that a JBoss EAP 6 Dependency exists.
+  message: "\n The `@Depends` annotation is one of JBoss EJB 3.0 extensions\n which
+    specifies a deployment dependency for a bean.\n Validate that a JBoss EAP 6 Dependency
+    exists.\n "
   ruleID: jboss-eap5-java-07000
   when:
     java.referenced:
@@ -170,9 +164,7 @@
       pattern: org.jboss.annotation.ejb.Depends
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.annotation has been moved to org.jboss.ws.api.annotation
-    This package has been relocated to `org.jboss.ws.api.annotation` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.annotation has been moved to org.jboss.ws.api.annotation
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -186,8 +178,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.annotation` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.annotation` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08000
   when:
     java.referenced:
@@ -195,9 +187,7 @@
       pattern: org.jboss.wsf.spi.annotation*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.binding has been moved to org.jboss.ws.api.binding
-    This package has been relocated to `org.jboss.ws.api.binding` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.binding has been moved to org.jboss.ws.api.binding
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -211,8 +201,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.binding` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.binding` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08100
   when:
     java.referenced:
@@ -220,9 +210,7 @@
       pattern: org.jboss.wsf.spi.binding*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.management.recording has been moved to org.jboss.ws.api.monitoring
-    This package has been relocated to `org.jboss.ws.api.monitoring` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.management.recording has been moved to org.jboss.ws.api.monitoring
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -236,8 +224,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.monitoring` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.monitoring` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08200
   when:
     java.referenced:
@@ -245,9 +233,7 @@
       pattern: org.jboss.wsf.spi.management.recording*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools.ant has been moved to org.jboss.ws.tools.ant
-    This package has been relocated to `org.jboss.ws.tools.ant` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools.ant has been moved to org.jboss.ws.tools.ant
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -261,8 +247,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.tools.ant` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.tools.ant` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08300
   when:
     java.referenced:
@@ -270,9 +256,7 @@
       pattern: org.jboss.wsf.spi.tools.ant*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools.cmd has been moved to org.jboss.ws.tools.cmd
-    This package has been relocated to `org.jboss.ws.tools.cmd` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools.cmd has been moved to org.jboss.ws.tools.cmd
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -286,8 +270,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.tools.cmd` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.tools.cmd` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08400
   when:
     java.referenced:
@@ -295,9 +279,7 @@
       pattern: org.jboss.wsf.spi.tools.cmd*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools has been moved to org.jboss.ws.api.tools
-    This package has been relocated to `org.jboss.ws.api.tools` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools has been moved to org.jboss.ws.api.tools
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -309,8 +291,8 @@
   - ejb
   - jbossws
   links: []
-  message: This package has been relocated to `org.jboss.ws.api.tools` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.tools` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08500
   when:
     java.referenced:
@@ -318,9 +300,7 @@
       pattern: org.jboss.wsf.spi.tools*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.util.ServiceLoader has been moved to org.jboss.ws.api.util.ServiceLoader
-    This class has been relocated to `org.jboss.ws.api.util.ServiceLoader` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.util.ServiceLoader has been moved to org.jboss.ws.api.util.ServiceLoader
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -334,17 +314,15 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
-    as specified in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
+    as specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08600
   when:
     java.referenced:
       pattern: org.jboss.wsf.spi.util.ServiceLoader
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.handler has been moved to org.jboss.ws.api.handler
-    This package has been relocated to `org.jboss.ws.api.handler` as specified in the. migration guide.
+  description: org.jboss.wsf.common.handler has been moved to org.jboss.ws.api.handler
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -358,8 +336,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.handler` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.handler` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08700
   when:
     java.referenced:
@@ -367,9 +345,7 @@
       pattern: org.jboss.wsf.common.handler*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.addressing has been moved to org.jboss.ws.api.addressing
-    This package has been relocated to `org.jboss.ws.api.addressing` as specified in the. migration guide.
+  description: org.jboss.wsf.common.addressing has been moved to org.jboss.ws.api.addressing
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -383,8 +359,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.addressing` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.addressing` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08800
   when:
     java.referenced:
@@ -392,9 +368,7 @@
       pattern: org.jboss.wsf.common.addressing*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.DOMUtils has been moved to org.jboss.ws.api.util.DOMUtils
-    This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified in the. migration guide.
+  description: org.jboss.wsf.common.DOMUtils has been moved to org.jboss.ws.api.util.DOMUtils
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -408,17 +382,15 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified
-    in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-08900
   when:
     java.referenced:
       pattern: org.jboss.wsf.common.DOMUtils
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common has been moved to org.jboss.ws.common
-    This package has been relocated to `org.jboss.ws.common` as specified in the. migration guide.
+  description: org.jboss.wsf.common has been moved to org.jboss.ws.common
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -430,8 +402,8 @@
   - ejb
   - jbossws
   links: []
-  message: This package has been relocated to `org.jboss.ws.common` as specified in
-    the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.common` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-java-09000
   when:
     java.referenced:
@@ -439,9 +411,7 @@
       pattern: org.jboss.wsf.common*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.ws.annotation.EndpointConfig has been moved to org.jboss.ws.api.annotation.EndpointConfig
-    This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig` as specified in the. migration guide.
+  description: org.jboss.ws.annotation.EndpointConfig has been moved to org.jboss.ws.api.annotation.EndpointConfig
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -455,8 +425,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
-    as specified in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
+    as specified in the\n migration guide.\n "
   ruleID: jboss-eap5-java-09100
   when:
     java.referenced:
diff --git a/default/generated/eap6/34-jboss-eap5-xml.windup.yaml b/default/generated/eap6/34-jboss-eap5-xml.windup.yaml
index ebd2885c..4edcf1a4 100644
--- a/default/generated/eap6/34-jboss-eap5-xml.windup.yaml
+++ b/default/generated/eap6/34-jboss-eap5-xml.windup.yaml
@@ -1,7 +1,7 @@
 - customVariables: []
   description: "JBoss Cache\n\n                        JBoss Cache TreeCache is a
     distributed tree-like structure that is replicated across several members.\n                        Updates
-    will be multicast to all group members reliably and in the same order.\n                    \n"
+    will be multicast to all group members reliably and in the same order.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -29,7 +29,7 @@
 - customVariables: []
   description: "JBoss Classloading configuration, typically in jboss-classloading.xml.\n\n
     \                       JBoss EAP 5 allows detailed classloading configuration.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -56,7 +56,7 @@
     frameworks, to configure Seam's built-in functionality, etc.\n                        Seam
     provides two basic approaches to configuring components:\n                        configuration
     via property settings in a properties file or in `web.xml`,\n                        and
-    configuration via `components.xml`.\n                    \n"
+    configuration via `components.xml`.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -80,7 +80,7 @@
       xpath: /sc:components
 - customVariables: []
   description: "JBoss Seam Pages\n\n                        The `pages.xml` file specifies
-    the page flow and other configuration of the Seam Framework.\n                    \n"
+    the page flow and other configuration of the Seam Framework.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -103,6 +103,7 @@
         sp: http://jboss.com/products/seam/pages
       xpath: /sp:pages
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -131,7 +132,7 @@
 - customVariables: []
   description: "JBoss EAR descriptor\n\n                            The `jboss-app.xml`
     file configures a Java EE application deployments specifically for JBoss EAP.\n
-    \                       \n"
+    \                       "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -157,7 +158,7 @@
 - customVariables: []
   description: "JBoss web application descriptor (jboss-web.xml)\n\n                        The
     `jboss-web.xml` file configures a Java EE web application specifically for JBoss
-    EAP.\n                        It is an extension to standard `web.xml`.\n                    \n"
+    EAP.\n                        It is an extension to standard `web.xml`.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -188,7 +189,6 @@
   description: |-
     JBoss 5 classloader configuration (jboss-classloading.xml)
     The `jboss-classloading.xml` file allows customization of classloading in JBoss EAP 5.
-    In JBoss EAP 6, the classloading configuration is not done through `jboss-classloading.xml`.. Since EAP 6 it is of modular nature, based on JBoss Modules.. Learn how to divide your application's dependencies into modules. and what dependencies and APIs are available automatically.
   effort: 5
   labels:
   - konveyor.io/source=eap5
@@ -208,10 +208,10 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/chap-Class_Loading_and_Modules.html
   - title: JBoss EAP 5 Class Loading and Modules
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/5/html/Microcontainer_User_Guide/sect-JBoss_Microcontainer_User_Guide-The_ClassLoading_Layer-ClassLoading.html
-  message: In JBoss EAP 6, the classloading configuration is not done through `jboss-classloading.xml`..
-    Since EAP 6 it is of modular nature, based on JBoss Modules.. Learn how to divide
-    your application's dependencies into modules. and what dependencies and APIs are
-    available automatically.
+  message: "\n In JBoss EAP 6, the classloading configuration is not done through
+    `jboss-classloading.xml`.\n Since EAP 6 it is of modular nature, based on JBoss
+    Modules.\n Learn how to divide your application's dependencies into modules\n
+    and what dependencies and APIs are available automatically.\n "
   ruleID: jboss-eap5-7-xml-10000
   tag:
   - classloading
@@ -225,7 +225,7 @@
   description: "JBoss module and classloading configuration (jboss-deployment-structure.xml)\n\n
     \                       The `jboss-deployment-structure.xml` file allows the creator
     of the deployment to control the dependencies\n                        and classloading
-    of deployments.\n                    \n"
+    of deployments.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -251,7 +251,7 @@
 - customVariables: []
   description: "JBoss EJB 2 CMP Deployment descriptor (jbosscmp-jdbc.xml)\n\n                        The
     `jbosscmp-jdbc.xml` is a deployment decriptor controlling the Container Managed
-    Persistence (CMP).\n                    \n"
+    Persistence (CMP).\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -278,7 +278,7 @@
 - customVariables: []
   description: "JBoss EJB XML deployment descriptor prior to EAP 6\n\n                        The
     `jboss.xml` descriptor in deployments is ignored by JBoss AS 7+ or JBoss EAP 6+.\n
-    \                       Replace it with `jboss-ejb3.xml`.\n                    \n"
+    \                       Replace it with `jboss-ejb3.xml`.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -305,9 +305,7 @@
       xpath: //*[local-name()='jboss']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP security-domain configuration - java:/jaas/
-    `java:/jaas/` is a JBoss EAP `security-domain` URI.. Remove the `java:/jaas/` prefix for `security-domain` elements in AS 7 / EAP 6.
+  description: JBoss EAP security-domain configuration - java:/jaas/
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -322,8 +320,8 @@
   links:
   - title: Java Authentication and Authorization Service (JAAS) Reference Guide
     url: http://docs.oracle.com/javase/7/docs/technotes/guides/security/jaas/JAASRefGuide.html
-  message: '`java:/jaas/` is a JBoss EAP `security-domain` URI.. Remove the `java:/jaas/`
-    prefix for `security-domain` elements in AS 7 / EAP 6.'
+  message: "\n `java:/jaas/` is a JBoss EAP `security-domain` URI.\n Remove the `java:/jaas/`
+    prefix for `security-domain` elements in AS 7 / EAP 6.\n "
   ruleID: jboss-eap5-xml-14000
   when:
     builtin.xml:
@@ -331,9 +329,7 @@
       xpath: //*[local-name()='security-domain' and starts-with(text(), 'java:/jaas/')]
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss security configuration descriptor (login-config.xml)
-    Before JBoss EAP 6, authentication security domains and login modules could be configured in a `login-config.xml` file.. JBoss EAP 6+ does not support the `login-config.xml` descriptor. Security is now configured inside the server configuration. Please refer to the corresponding server security guide.
+  description: JBoss security configuration descriptor (login-config.xml)
   effort: 5
   labels:
   - konveyor.io/source=eap5
@@ -349,10 +345,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/how_to_configure_server_security/
   - title: JBoss EAP 5 - Login Modules
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/security_guide/#idm139921681412720
-  message: Before JBoss EAP 6, authentication security domains and login modules could
-    be configured in a `login-config.xml` file.. JBoss EAP 6+ does not support the
-    `login-config.xml` descriptor. Security is now configured inside the server configuration.
-    Please refer to the corresponding server security guide.
+  message: "Before JBoss EAP 6, authentication security domains and login modules
+    could be configured in a `login-config.xml` file.\n JBoss EAP 6+ does not support
+    the `login-config.xml` descriptor. Security is now configured inside the server
+    configuration. Please refer to the corresponding server security guide.\n "
   ruleID: jboss-eap5-xml-16000
   tag:
   - security
@@ -365,7 +361,7 @@
       xpath: //*[local-name()='policy']
 - customVariables: []
   description: "JBoss EJB 3 deployment descriptor (jboss-ejb3.xml)\n\n                        A
-    JBoss specific EJB 3 configuration allows extensions of Java EE EJB 3.\n                    \n"
+    JBoss specific EJB 3 configuration allows extensions of Java EE EJB 3.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -397,7 +393,7 @@
     descriptor file\n                        is in the `META-INF/` directory. For
     POJO and EJB webservice endpoints bundled in WAR file,\n                        the
     expected location of the `jboss-webservices.xml` file is in the `WEB-INF/` directory.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -423,6 +419,7 @@
       namespaces: {}
       xpath: //*[local-name()='webservices']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
diff --git a/default/generated/eap6/35-resteasy.windup.yaml b/default/generated/eap6/35-resteasy.windup.yaml
index 3c3740a8..624ab816 100644
--- a/default/generated/eap6/35-resteasy.windup.yaml
+++ b/default/generated/eap6/35-resteasy.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class SimpleServerCache in RESTEasy 2
-    Use of `org.jboss.resteasy.plugins.cache.server.SimpleServerCache` is not supported in JBoss EAP 6.
+  description: Deprecated class SimpleServerCache in RESTEasy 2
   effort: 1
   labels:
   - konveyor.io/source=eap5
diff --git a/default/generated/eap6/37-jotm.rhamt.yaml b/default/generated/eap6/37-jotm.rhamt.yaml
index bc41be06..9f0ce90b 100644
--- a/default/generated/eap6/37-jotm.rhamt.yaml
+++ b/default/generated/eap6/37-jotm.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    JTA: JOTM usage
-    The modules required by JOTM's JTA implementation are not loaded by default on EAP6+.. This likely results in a "java.lang.NoClassDefFoundError: sun/rmi/server/UnicastServerRef" exception when it is deployed.. To solve this issue it is highly recommended to use JTA provided by JBoss EAP since JOTM is not maintained anymore.. If you want to stick with JOTM, you can add "sun/rmi/server" as system export in your applications deployment-structure.xml as described in [this knowledge base article](https://access.redhat.com/solutions/1217863).
+  description: 'JTA: JOTM usage'
   effort: 5
   labels:
   - konveyor.io/target=eap6+
@@ -15,12 +13,13 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html/development_guide/java_transaction_api_jta
   - title: Using transaction services by JTOM on EAP 6
     url: https://access.redhat.com/solutions/1217863
-  message: 'The modules required by JOTM''s JTA implementation are not loaded by default
-    on EAP6+.. This likely results in a "java.lang.NoClassDefFoundError: sun/rmi/server/UnicastServerRef"
-    exception when it is deployed.. To solve this issue it is highly recommended to
-    use JTA provided by JBoss EAP since JOTM is not maintained anymore.. If you want
-    to stick with JOTM, you can add "sun/rmi/server" as system export in your applications
-    deployment-structure.xml as described in [this knowledge base article](https://access.redhat.com/solutions/1217863).'
+  message: "\n The modules required by JOTM's JTA implementation are not loaded by
+    default on EAP6+.\n This likely results in a \"java.lang.NoClassDefFoundError:
+    sun/rmi/server/UnicastServerRef\" exception when it is deployed.\n\n To solve
+    this issue it is highly recommended to use JTA provided by JBoss EAP since JOTM
+    is not maintained anymore. \n \n If you want to stick with JOTM, you can add \"sun/rmi/server\"
+    as system export in your applications deployment-structure.xml as described in
+    [this knowledge base article](https://access.redhat.com/solutions/1217863).\n "
   ruleID: jotm-00001
   when:
     java.referenced:
diff --git a/default/generated/eap6/38-jrun-catchall.windup.yaml b/default/generated/eap6/38-jrun-catchall.windup.yaml
index 204ba05a..c4ec72de 100644
--- a/default/generated/eap6/38-jrun-catchall.windup.yaml
+++ b/default/generated/eap6/38-jrun-catchall.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=jrun
   - konveyor.io/target=eap6+
@@ -16,6 +17,7 @@
       location: PACKAGE
       pattern: jrun*
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=jrun
   - konveyor.io/target=eap6+
diff --git a/default/generated/eap6/39-xml-jrun.windup.yaml b/default/generated/eap6/39-xml-jrun.windup.yaml
index b207d3a7..6c6d11ff 100644
--- a/default/generated/eap6/39-xml-jrun.windup.yaml
+++ b/default/generated/eap6/39-xml-jrun.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     JRun Web App descriptor
      JRun web descriptor is a file that is by convention named jrun-web. It is JRun specific configuration file used to configure JRun server. This file is not supported in JBoss EAP 6 and needs to be migrated to web.xml or JBoss-specific jboss-web.xml
   labels:
@@ -21,7 +21,7 @@
         namespaces: {}
         xpath: /jrun-web-app
 - customVariables: []
-  description: |
+  description: |-
     JRun ejb-jar configuration
      JRun ejb configuration file used to configure EJBs, map them to jndi names etc.
   labels:
diff --git a/default/generated/eap6/40-jsp.windup.yaml b/default/generated/eap6/40-jsp.windup.yaml
index ba2a769d..0365b554 100644
--- a/default/generated/eap6/40-jsp.windup.yaml
+++ b/default/generated/eap6/40-jsp.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Empty import definition in a JSP
-    Empty import definition in .jsp or .jspf files would fail in compilation time and needs to be removed.
+  description: Empty import definition in a JSP
   effort: 1
   labels:
   - konveyor.io/target=eap6+
@@ -11,8 +9,8 @@
   - konveyor.io/target=java-ee
   - konveyor.io/source
   links: []
-  message: Empty import definition in .jsp or .jspf files would fail in compilation
-    time and needs to be removed.
+  message: "\n Empty import definition in .jsp or .jspf files would fail in compilation
+    time and needs to be removed.\n "
   ruleID: jsp-01000
   when:
     builtin.filecontent:
diff --git a/default/generated/eap6/41-log4j.windup.yaml b/default/generated/eap6/41-log4j.windup.yaml
index 210e09d8..8957663c 100644
--- a/default/generated/eap6/41-log4j.windup.yaml
+++ b/default/generated/eap6/41-log4j.windup.yaml
@@ -1,6 +1,5 @@
 - customVariables: []
-  description: Deploying log4j.jar can result in non-deterministic ClassLoading issues.
-    It is recommended to use the built-in JBoss EAP Log4j module configured via `jboss-deployment-structure.xml`
+  description: null
   labels:
   - konveyor.io/source=log4j
   - konveyor.io/target=eap6+
@@ -15,6 +14,7 @@
       lowerbound: 0.0.0
       name: log4j.log4j
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=log4j
   - konveyor.io/target=eap6+
@@ -39,8 +39,7 @@
       pattern: .*
 - category: optional
   customVariables: []
-  description: |
-    Log4j ConsoleAppender Configuration - Potential Deadlock
+  description: Log4j ConsoleAppender Configuration - Potential Deadlock
   effort: 1
   labels:
   - konveyor.io/source=log4j
@@ -50,8 +49,10 @@
   links:
   - title: EAP 6 deadlocks when using ConsoleHandler and java.io.PrintStream
     url: https://access.redhat.com/solutions/375273
-  message: Using ConsoleAppender configured in log4j.{{suffix}} can cause a deadlock
-    on JBoss EAP 6.. It is recommended to Remove application level log4j ConsoleAppenders.
+  message: |2-
+
+     Using ConsoleAppender configured in log4j.{{suffix}} can cause a deadlock on JBoss EAP 6.
+     It is recommended to Remove application level log4j ConsoleAppenders.
   ruleID: log4j-03000
   when:
     builtin.filecontent:
diff --git a/default/generated/eap6/42-xml-orion.windup.yaml b/default/generated/eap6/42-xml-orion.windup.yaml
index badbbbbb..b92460df 100644
--- a/default/generated/eap6/42-xml-orion.windup.yaml
+++ b/default/generated/eap6/42-xml-orion.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Oracle Application Platform EJB Descriptor
      Orion specific ejb configuration file used to configure EJBs, map them to jndi names etc.
   labels:
@@ -21,7 +21,7 @@
       namespaces: {}
       xpath: /orion-ejb-jar
 - customVariables: []
-  description: |
+  description: |-
     Oracle Application Platform Web Descriptor
      Oracle Application Platform Web Descriptor configuriation is defined in files by convention named global-web-application.xml and orion-web.xml. It is Orion specific configuration file that besides supporting the standard web.xml features also adds additional support for featuers like buffering, servlet chaining, locales, virtual directories. This file is not supported in JBoss EAP 6 and needs to be migrated to web.xml or JBoss-specific jboss-web.xml
   labels:
@@ -43,7 +43,7 @@
       namespaces: {}
       xpath: /orion-web-app
 - customVariables: []
-  description: |
+  description: |-
     Oracle Application EAR configuration file
      Orion-application file is an orion specific EAR configuration file used to configure default data sources for CMP beans, security user manager, jndi authorization etc. This file may have been generated by Orion.
   labels:
diff --git a/default/generated/eap6/43-xml-resin.windup.yaml b/default/generated/eap6/43-xml-resin.windup.yaml
index 07009e30..49a3150b 100644
--- a/default/generated/eap6/43-xml-resin.windup.yaml
+++ b/default/generated/eap6/43-xml-resin.windup.yaml
@@ -2,7 +2,7 @@
   description: "Resin Web Application Descriptor\nAn Resin specific file defining
     an application configuration. Such a file may define URL paths, internal resin
     ids, root directory path etc.\n                            This is Resin specific
-    and needs to be migrated to web.xml or jboss-web.xml\n                        \n"
+    and needs to be migrated to web.xml or jboss-web.xml\n                        "
   labels:
   - konveyor.io/source=resin
   - konveyor.io/target=eap6+
diff --git a/default/generated/eap6/44-environment-dependent.windup.yaml b/default/generated/eap6/44-environment-dependent.windup.yaml
index 17d824db..9987ec26 100644
--- a/default/generated/eap6/44-environment-dependent.windup.yaml
+++ b/default/generated/eap6/44-environment-dependent.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Dynamic class instantiation
-    The class is dynamically loaded within application. During the migration, multiple classes that are provided on classpath by a different server may not be present anymore.. Please review the class-loading mechanisms and ensure that the dynamically loaded class is available in JBoss EAP.
+  description: Dynamic class instantiation
   effort: 0
   labels:
   - konveyor.io/target=eap6
@@ -19,10 +17,10 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#chap-Class_Loading_and_Modules
   - title: Article about Classloading in JBoss EAP 6
     url: https://access.redhat.com/solutions/361343
-  message: The class is dynamically loaded within application. During the migration,
+  message: "\n \n The class is dynamically loaded within application. During the migration,
     multiple classes that are provided on classpath by a different server may not
-    be present anymore.. Please review the class-loading mechanisms and ensure that
-    the dynamically loaded class is available in JBoss EAP.
+    be present anymore.\n\n Please review the class-loading mechanisms and ensure
+    that the dynamically loaded class is available in JBoss EAP.\n \n "
   ruleID: environment-dependent-calls-01000
   when:
     java.referenced:
@@ -30,9 +28,7 @@
       pattern: java.lang.Class.forName*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of JNDI lookup
-    This method lookups an object using a JNDI String. During the migration process, some entity JNDI bindings may change.. Ensure that the JNDI Name does not need to change for JBoss EAP.. *For Example:*. ```java. (ConnectionFactory)initialContext.lookup("weblogic.jms.ConnectionFactory");. ```. *should become:*. ```java. (ConnectionFactory)initialContext.lookup("/ConnectionFactory");. ```
+  description: Call of JNDI lookup
   effort: 1
   labels:
   - konveyor.io/target=eap6
@@ -43,11 +39,11 @@
   - konveyor.io/source
   - jndi
   links: []
-  message: This method lookups an object using a JNDI String. During the migration
-    process, some entity JNDI bindings may change.. Ensure that the JNDI Name does
-    not need to change for JBoss EAP.. *For Example:*. ```java. (ConnectionFactory)initialContext.lookup("weblogic.jms.ConnectionFactory");.
-    ```. *should become:*. ```java. (ConnectionFactory)initialContext.lookup("/ConnectionFactory");.
-    ```
+  message: "\n \n This method lookups an object using a JNDI String. During the migration
+    process, some entity JNDI bindings may change.\n Ensure that the JNDI Name does
+    not need to change for JBoss EAP.\n\n *For Example:*\n\n ```java\n (ConnectionFactory)initialContext.lookup(\"weblogic.jms.ConnectionFactory\");\n
+    ```\n\n *should become:*\n\n ```java\n (ConnectionFactory)initialContext.lookup(\"/ConnectionFactory\");\n
+    ```\n \n "
   ruleID: environment-dependent-calls-02000
   when:
     as: default
@@ -56,9 +52,7 @@
       pattern: javax.naming.Context.lookup*
 - category: mandatory
   customVariables: []
-  description: |-
-    Proprietary InitialContext initialization
-    In JBoss EAP, the `InitialContext` should be instantiated with no arguments. Once an instance is constructed, look up the service using portable JNDI lookup syntax. Ensure also that in case system properties for `InitialContext` are provided, they do not need to be changed for the JBoss EAP.. ```java. InitialContext context = new InitialContext();. Service service = (Service) context.lookup( "java:app/service/" + ServiceImpl.class.getSimpleName() );. ```
+  description: Proprietary InitialContext initialization
   effort: 1
   labels:
   - konveyor.io/target=eap6
@@ -69,12 +63,12 @@
   - konveyor.io/source
   - jndi
   links: []
-  message: In JBoss EAP, the `InitialContext` should be instantiated with no arguments.
-    Once an instance is constructed, look up the service using portable JNDI lookup
-    syntax. Ensure also that in case system properties for `InitialContext` are provided,
-    they do not need to be changed for the JBoss EAP.. ```java. InitialContext context
-    = new InitialContext();. Service service = (Service) context.lookup( "java:app/service/"
-    + ServiceImpl.class.getSimpleName() );. ```
+  message: "\n \n In JBoss EAP, the `InitialContext` should be instantiated with no
+    arguments. Once an instance is constructed, look up the service using portable
+    JNDI lookup syntax. Ensure also that in case system properties for `InitialContext`
+    are provided, they do not need to be changed for the JBoss EAP.\n\n ```java\n
+    InitialContext context = new InitialContext();\n Service service = (Service) context.lookup(
+    \"java:app/service/\" + ServiceImpl.class.getSimpleName() );\n ```\n \n "
   ruleID: environment-dependent-calls-03000
   when:
     as: default
@@ -87,7 +81,7 @@
     the applications' classpaths.\n                          The JNDI then makes the
     properties from these files available to the service providers.\n\n                          Please
     ensure the property values listed in this file are available to JBoss EAP.\n                          \n
-    \                       \n"
+    \                       "
   labels:
   - konveyor.io/target=eap6
   - konveyor.io/target=eap7
@@ -109,8 +103,7 @@
   - name: suffix
     nameOfCaptureGroup: suffix
     pattern: javax.management.(?P<suffix>(ObjectName))?.*
-  description: |
-    JMX MBean object name (javax.management.{suffix})
+  description: JMX MBean object name (javax.management.{suffix})
   effort: 1
   labels:
   - konveyor.io/target=eap6
@@ -121,9 +114,9 @@
   - konveyor.io/source
   - jmx
   links: []
-  message: After migration, some of the JMX beans provided by the previous server
-    may not be present anymore.. Ensure that the `javax.management.{{suffix}}` does
-    not need to change for JBoss EAP.
+  message: "\n \n After migration, some of the JMX beans provided by the previous
+    server may not be present anymore.\n Ensure that the `javax.management.{{suffix}}`
+    does not need to change for JBoss EAP.\n \n "
   ruleID: environment-dependent-calls-04000
   when:
     as: default
@@ -135,8 +128,7 @@
   - name: suffix
     nameOfCaptureGroup: suffix
     pattern: javax.management.(?P<suffix>(remote.JMXServiceURL))?.*
-  description: |
-    JMX API connector server address (javax.management.{suffix})
+  description: JMX API connector server address (javax.management.{suffix})
   effort: 1
   labels:
   - konveyor.io/target=eap6
@@ -147,9 +139,9 @@
   - konveyor.io/source
   - jmx
   links: []
-  message: After migration, some of the JMX beans provided by the previous server
-    may not be present anymore.. Ensure that the `javax.management.{{suffix}}` does
-    not need to change for JBoss EAP.
+  message: "\n \n After migration, some of the JMX beans provided by the previous
+    server may not be present anymore.\n Ensure that the `javax.management.{{suffix}}`
+    does not need to change for JBoss EAP.\n \n "
   ruleID: environment-dependent-calls-04001
   when:
     as: default
@@ -158,9 +150,7 @@
       pattern: javax.management.(remote.JMXServiceURL)*
 - category: mandatory
   customVariables: []
-  description: |-
-    JMX connection factory parameters
-    After migration, JMX connection String or parameters may be different than the one provided by previous server.. As an example, `javax.management.remote.JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES` will change.. Ensure that any of the parameters does not need to change for JBoss EAP.
+  description: JMX connection factory parameters
   effort: 1
   labels:
   - konveyor.io/target=eap6
@@ -171,10 +161,10 @@
   - konveyor.io/source
   - jmx
   links: []
-  message: After migration, JMX connection String or parameters may be different than
-    the one provided by previous server.. As an example, `javax.management.remote.JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES`
-    will change.. Ensure that any of the parameters does not need to change for JBoss
-    EAP.
+  message: "\n \n After migration, JMX connection String or parameters may be different
+    than the one provided by previous server.\n As an example, `javax.management.remote.JMXConnectorFactory.PROTOCOL_PROVIDER_PACKAGES`
+    will change.\n Ensure that any of the parameters does not need to change for JBoss
+    EAP.\n \n "
   ruleID: environment-dependent-calls-05000
   when:
     as: default
diff --git a/default/generated/eap6/45-generic-catchall.windup.yaml b/default/generated/eap6/45-generic-catchall.windup.yaml
index c42cbb38..d24d9322 100644
--- a/default/generated/eap6/45-generic-catchall.windup.yaml
+++ b/default/generated/eap6/45-generic-catchall.windup.yaml
@@ -3,9 +3,7 @@
   - name: domain
     nameOfCaptureGroup: domain
     pattern: (?P<domain>(edu|EDU).)?oswego.cs.dl.util.concurrent..*
-  description: |-
-    Doug Lea Concurrency util
-    This is an old Doug Lea Concurrency util type and needs to be migrated to a compatible `java.util.concurrent` API.. There is currently no detailed information about this type.
+  description: Doug Lea Concurrency util
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -15,9 +13,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an old Doug Lea Concurrency util type and needs to be migrated
-    to a compatible `java.util.concurrent` API.. There is currently no detailed information
-    about this type.
+  message: "\n This is an old Doug Lea Concurrency util type and needs to be migrated
+    to a compatible `java.util.concurrent` API.\n There is currently no detailed information
+    about this type.\n "
   ruleID: generic-catchall-00000
   when:
     java.referenced:
@@ -25,9 +23,7 @@
       pattern: (edu|EDU).oswego.cs.dl.util.concurrent*
 - category: optional
   customVariables: []
-  description: |-
-    backport-util-concurrent type reference
-    This type is the backport of java.util.concurrent API, introduced in Java 5.0 and further refined in Java 6.0, to older Java platforms.. You should use java.util.concurrent API instead.
+  description: backport-util-concurrent type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -37,9 +33,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This type is the backport of java.util.concurrent API, introduced in Java
-    5.0 and further refined in Java 6.0, to older Java platforms.. You should use
-    java.util.concurrent API instead.
+  message: "\n This type is the backport of java.util.concurrent API, introduced in
+    Java 5.0 and further refined in Java 6.0, to older Java platforms.\n You should
+    use java.util.concurrent API instead.\n "
   ruleID: generic-catchall-00001
   when:
     java.referenced:
@@ -47,14 +43,13 @@
       pattern: edu.emory.mathcs.backport.java.util*
 - category: optional
   customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: org.mule.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
   - name: packageRemainder
     nameOfCaptureGroup: packageRemainder
     pattern: org.mule.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
-    Mule API reference
+  - name: type
+    nameOfCaptureGroup: type
+    pattern: org.mule.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
+  description: Mule API reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -65,8 +60,8 @@
   - catchall
   - mule
   links: []
-  message: Mule API `org.mule.{{packageRemainder}}.{{type}}` was used.. You should
-    convert these types to Apache Camel.
+  message: "\n Mule API `org.mule.{{packageRemainder}}.{{type}}` was used.\n You should
+    convert these types to Apache Camel.\n "
   ruleID: generic-catchall-00002
   when:
     java.referenced:
@@ -80,8 +75,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: mx4j.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
-    MX4J type reference
+  description: MX4J type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -103,8 +97,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.osoa.sca.annotations.(?P<type>[^.]+)
-  description: |
-    Apache Tuscany type reference
+  description: Apache Tuscany type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -124,9 +117,7 @@
       pattern: org.osoa.sca.annotations*
 - category: optional
   customVariables: []
-  description: |-
-    Tibco ActiveMatrix Stub
-    Tibco ActiveMatrix Stub; regenerate the SOAP Client for the class
+  description: Tibco ActiveMatrix Stub
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -151,8 +142,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: com.tibco.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
-    Tibco type reference
+  description: Tibco type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -163,8 +153,8 @@
   - catchall
   - tibco
   links: []
-  message: Tibco `com.tibco.{{packageRemainder}}.{{type}}` reference found.. No specific
-    details available.
+  message: "\n Tibco `com.tibco.{{packageRemainder}}.{{type}}` reference found.\n
+    No specific details available.\n "
   ruleID: generic-catchall-00300
   when:
     java.referenced:
@@ -178,8 +168,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: com.crystaldecisions.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
-    SAP CrystalReports type reference
+  description: SAP CrystalReports type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -190,8 +179,9 @@
   - catchall
   - sap
   links: []
-  message: SAP CrystalReports `com.crystaldecisions.{{packageRemainder}}.{{type}}`
-    reference found.. No specific details available.
+  message: |-
+    SAP CrystalReports `com.crystaldecisions.{{packageRemainder}}.{{type}}` reference found.
+     No specific details available.
   ruleID: generic-catchall-00400
   when:
     java.referenced:
@@ -205,8 +195,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: com.iona.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
-    IONA type reference
+  description: IONA type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -217,8 +206,9 @@
   - catchall
   - iona
   links: []
-  message: IONA `com.iona.{{packageRemainder}}.{{type}}` reference found.. No specific
-    details available.
+  message: |-
+    IONA `com.iona.{{packageRemainder}}.{{type}}` reference found.
+     No specific details available.
   ruleID: generic-catchall-00500
   when:
     java.referenced:
@@ -229,8 +219,7 @@
   - name: subpackage
     nameOfCaptureGroup: subpackage
     pattern: org.apache.(?P<subpackage>(activeio|activemq).)?.*
-  description: |
-    Apache org.apache.{subpackage} type reference
+  description: Apache org.apache.{subpackage} type reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -241,8 +230,9 @@
   - catchall
   - apache
   links: []
-  message: Apache `org.apache.{{subpackage}}` API reference found.. No specific details
-    available.
+  message: |-
+    Apache `org.apache.{{subpackage}}` API reference found.
+     No specific details available.
   ruleID: generic-catchall-00600
   when:
     java.referenced:
@@ -250,17 +240,16 @@
       pattern: org.apache.(activeio|activemq)*
 - category: potential
   customVariables:
-  - name: subpackage
-    nameOfCaptureGroup: subpackage
-    pattern: org.(?P<subpackage>(jboss|jbpm).)?(?P<packageRemainder>([a-z]+\.)*)?(?P<type>[^.()]+)
   - name: packageRemainder
     nameOfCaptureGroup: packageRemainder
     pattern: org.(?P<subpackage>(jboss|jbpm).)?(?P<packageRemainder>([a-z]+\.)*)?(?P<type>[^.()]+)
   - name: type
     nameOfCaptureGroup: type
     pattern: org.(?P<subpackage>(jboss|jbpm).)?(?P<packageRemainder>([a-z]+\.)*)?(?P<type>[^.()]+)
-  description: |
-    JBoss API reference
+  - name: subpackage
+    nameOfCaptureGroup: subpackage
+    pattern: org.(?P<subpackage>(jboss|jbpm).)?(?P<packageRemainder>([a-z]+\.)*)?(?P<type>[^.()]+)
+  description: JBoss API reference
   effort: 0
   labels:
   - konveyor.io/source=java
@@ -280,9 +269,7 @@
       pattern: org.(jboss|jbpm).*
 - category: optional
   customVariables: []
-  description: |-
-    java.sql.DriverManager type reference
-    `java.sql.DriverManager` type reference found. No specific details available.
+  description: java.sql.DriverManager type reference
   effort: 0
   labels:
   - konveyor.io/source=java
diff --git a/default/generated/eap6/48-weblogic-catchall.windup.yaml b/default/generated/eap6/48-weblogic-catchall.windup.yaml
index 2f955193..68b22e28 100644
--- a/default/generated/eap6/48-weblogic-catchall.windup.yaml
+++ b/default/generated/eap6/48-weblogic-catchall.windup.yaml
@@ -1,13 +1,12 @@
 - category: potential
   customVariables:
-  - name: remainder
-    nameOfCaptureGroup: remainder
-    pattern: (?P<prefix>(com\.weblogic[^.]*\.)|(com\.bea[^.]*\.)|(bea\.)|(weblogic\.))?(?P<remainder>.*)
   - name: prefix
     nameOfCaptureGroup: prefix
     pattern: (?P<prefix>(com\.weblogic[^.]*\.)|(com\.bea[^.]*\.)|(bea\.)|(weblogic\.))?(?P<remainder>.*)
-  description: |
-    WebLogic proprietary type reference
+  - name: remainder
+    nameOfCaptureGroup: remainder
+    pattern: (?P<prefix>(com\.weblogic[^.]*\.)|(com\.bea[^.]*\.)|(bea\.)|(weblogic\.))?(?P<remainder>.*)
+  description: WebLogic proprietary type reference
   effort: 0
   labels:
   - konveyor.io/source=weblogic
@@ -16,9 +15,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is a WebLogic proprietary type (`{{prefix}}{{remainder}}`) and needs
-    to be migrated to a compatible API. There is currently no detailed information
-    about this type.
+  message: "\n This is a WebLogic proprietary type (`{{prefix}}{{remainder}}`) and
+    needs to be migrated to a compatible API. There is currently no detailed information
+    about this type.\n "
   ruleID: weblogic-catchall-01000
   when:
     java.referenced:
@@ -29,8 +28,7 @@
   - name: remainder
     nameOfCaptureGroup: remainder
     pattern: oracle.sql.(?P<remainder>.*)
-  description: |
-    Oracle proprietary SQL type reference
+  description: Oracle proprietary SQL type reference
   effort: 0
   labels:
   - konveyor.io/source=weblogic
@@ -39,9 +37,10 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an Oracle proprietary SQL type (`oracle.sql.{{remainder}}`).. It
-    should be migrated to a compatible API either if you consider replacing your Oracle
-    database or if you want to get rid of the Oracle proprietary API usage.
+  message: "\n \n This is an Oracle proprietary SQL type (`oracle.sql.{{remainder}}`).\n\n
+    It should be migrated to a compatible API either if you consider replacing your
+    Oracle database or if you want to get rid of the Oracle proprietary API usage.\n
+    \n "
   ruleID: weblogic-catchall-02000
   when:
     java.referenced:
@@ -55,8 +54,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: com.tangosol(?P<subpackage>(\..*)?.)?(?P<type>[^.]+)
-  description: |
-    Tangosol Proprietary type reference
+  description: Tangosol Proprietary type reference
   effort: 0
   labels:
   - konveyor.io/source=weblogic
@@ -65,9 +63,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an Oracle proprietary type (`com.tangosol{{subpackage}}.{{type}}`)
+  message: "\n This is an Oracle proprietary type (`com.tangosol{{subpackage}}.{{type}}`)
     and needs to be migrated to a compatible API. There is currently no detailed information
-    about this type.
+    about this type.\n "
   ruleID: weblogic-catchall-03000
   when:
     java.referenced:
@@ -84,8 +82,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<com>(com\.)?)?oracle(?P<subpackage>(\..*)?.)?(?P<type>[^.]+)
-  description: |
-    Oracle proprietary type reference
+  description: Oracle proprietary type reference
   effort: 0
   labels:
   - konveyor.io/source=weblogic
@@ -94,9 +91,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an Oracle proprietary type (`{{com}}oracle{{subpackage}}.{{type}}`)
+  message: "\n This is an Oracle proprietary type (`{{com}}oracle{{subpackage}}.{{type}}`)
     and needs to be migrated to a compatible API. There is currently no detailed information
-    about this type.
+    about this type.\n "
   ruleID: weblogic-catchall-06000
   when:
     java.referenced:
@@ -107,8 +104,7 @@
   - name: remainder
     nameOfCaptureGroup: remainder
     pattern: oracle.jdbc.(?P<remainder>.*)
-  description: |
-    Oracle proprietary JDBC type reference
+  description: Oracle proprietary JDBC type reference
   effort: 0
   labels:
   - konveyor.io/source=weblogic
@@ -117,8 +113,8 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an Oracle proprietary JDBC type (`oracle.sql.{{remainder}}`)..
-    It should be replaced by standard Java EE JCA, datasource and JDBC types.
+  message: "\n \n This is an Oracle proprietary JDBC type (`oracle.sql.{{remainder}}`).\n\n
+    It should be replaced by standard Java EE JCA, datasource and JDBC types.\n \n "
   ruleID: weblogic-catchall-06500
   when:
     java.referenced:
diff --git a/default/generated/eap6/49-weblogic-ejb.windup.yaml b/default/generated/eap6/49-weblogic-ejb.windup.yaml
index d2026f11..ae4fafac 100644
--- a/default/generated/eap6/49-weblogic-ejb.windup.yaml
+++ b/default/generated/eap6/49-weblogic-ejb.windup.yaml
@@ -3,9 +3,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: weblogic.(?P<type>(ejb|ejb20|ejbgen)?.)?.*
-  description: |-
-    WebLogic proprietary EJB
-    This application contains WebLogic EJBs probably generated by the WebLogic Server EJB tools.
+  description: WebLogic proprietary EJB
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -14,8 +12,8 @@
   - ejb
   - weblogic
   links: []
-  message: This application contains WebLogic EJBs probably generated by the WebLogic
-    Server EJB tools.
+  message: "\n This application contains WebLogic EJBs probably generated by the WebLogic
+    Server EJB tools.\n "
   ruleID: weblogic-ejb-01000
   when:
     java.referenced:
@@ -23,9 +21,7 @@
       pattern: weblogic.(ejb|ejb20|ejbgen)?*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary timeout for transactions annotation
-    This application contains WebLogic proprietary `weblogic.javaee.TransactionTimeoutSeconds` annotation.
+  description: WebLogic proprietary timeout for transactions annotation
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -42,8 +38,8 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/administration_and_configuration_guide/#Session_Bean_Transaction_Timeout
   - title: How to set EJB transaction timeout in JBoss EAP 6
     url: https://access.redhat.com/solutions/90553
-  message: This application contains WebLogic proprietary `weblogic.javaee.TransactionTimeoutSeconds`
-    annotation.
+  message: "\n This application contains WebLogic proprietary `weblogic.javaee.TransactionTimeoutSeconds`
+    annotation.\n "
   ruleID: weblogic-ejb-02000
   when:
     java.referenced:
@@ -51,9 +47,7 @@
       pattern: weblogic.javaee.TransactionTimeoutSeconds
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary MessageDriven annotation
-    This application contains WebLogic proprietary `weblogic.ejbgen.MessageDriven` annotation.
+  description: WebLogic proprietary MessageDriven annotation
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -66,8 +60,8 @@
     url: https://docs.oracle.com/cd/E13222_01/wls/docs92/ejb/EJBGen_reference.html#wp1070171
   - title: JBoss EAP 7 - Configuring MDBs Using Annotations
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_ejb_applications/#configuring_mdbs_using_annotations
-  message: This application contains WebLogic proprietary `weblogic.ejbgen.MessageDriven`
-    annotation.
+  message: "\n This application contains WebLogic proprietary `weblogic.ejbgen.MessageDriven`
+    annotation.\n "
   ruleID: weblogic-ejb-03000
   when:
     java.referenced:
@@ -78,8 +72,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: weblogic.ejb.(?P<type>(GenericEntityBean|GenericMessageDrivenBean|GenericSessionBean))
-  description: |
-    WebLogic proprietary EJB Bean
+  description: WebLogic proprietary EJB Bean
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -98,7 +91,7 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#chap-Enterprise_JavaBeans
   - title: JBoss EAP 7 - Developing EJB Applications
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_ejb_applications/
-  message: This class extends `weblogic.ejb.{{type}}` that needs to be removed.
+  message: "\n This class extends `weblogic.ejb.{{type}}` that needs to be removed.\n "
   ruleID: weblogic-ejb-04000
   when:
     java.referenced:
diff --git a/default/generated/eap6/51-weblogic-jms.windup.yaml b/default/generated/eap6/51-weblogic-jms.windup.yaml
index 8c8c4b4e..173e40f7 100644
--- a/default/generated/eap6/51-weblogic-jms.windup.yaml
+++ b/default/generated/eap6/51-weblogic-jms.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -21,9 +22,7 @@
       pattern: oracle.jms*
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Session
-    Oracle JMS sessions are used for producing and consuming messaging API objects such as message producers, message. consumers, messages, queue browsers, and temporary queues and topics.. This reference should be replaced with the Java EE. standard API: `javax.jms.Session`.
+  description: Oracle JMS Session
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -34,19 +33,17 @@
   links:
   - title: Java EE JMS Session
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncen
-  message: 'Oracle JMS sessions are used for producing and consuming messaging API
-    objects such as message producers, message. consumers, messages, queue browsers,
-    and temporary queues and topics.. This reference should be replaced with the Java
-    EE. standard API: `javax.jms.Session`.'
+  message: "\n Oracle JMS sessions are used for producing and consuming messaging
+    API objects such as message producers, message\n consumers, messages, queue browsers,
+    and temporary queues and topics.\n\n This reference should be replaced with the
+    Java EE\n standard API: `javax.jms.Session`.\n "
   ruleID: weblogic-jms-01000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsSession
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Queue Browser
-    Oracle JMS queue browsers are used for browsing messages in a JMS queue.. This reference should be replaced with the Java. EE standard API: `javax.jms.QueueBrowser`.
+  description: Oracle JMS Queue Browser
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -57,17 +54,15 @@
   links:
   - title: Java EE JMS Queue Browser
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncey
-  message: 'Oracle JMS queue browsers are used for browsing messages in a JMS queue..
-    This reference should be replaced with the Java. EE standard API: `javax.jms.QueueBrowser`.'
+  message: "\n Oracle JMS queue browsers are used for browsing messages in a JMS queue.\n\n
+    This reference should be replaced with the Java\n EE standard API: `javax.jms.QueueBrowser`.\n "
   ruleID: weblogic-jms-02000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsQueueBrowser
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Producer
-    Oracle JMS producers are used for sending messages to a destination.. This reference should be replaced with the Java. EE. standard API: `javax.jms.MessageProducer`.
+  description: Oracle JMS Producer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -78,17 +73,15 @@
   links:
   - title: Java EE JMS Message Producer
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnceo
-  message: 'Oracle JMS producers are used for sending messages to a destination..
-    This reference should be replaced with the Java. EE. standard API: `javax.jms.MessageProducer`.'
+  message: "\n Oracle JMS producers are used for sending messages to a destination.\n\n
+    This reference should be replaced with the Java\n EE\n standard API: `javax.jms.MessageProducer`.\n "
   ruleID: weblogic-jms-03000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsProducer
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Consumer
-    Oracle JMS consumers are used for receiving messages sent to a destination.. This reference should be replaced with the. Java EE standard API: `javax.jms.MessageConsumer`.
+  description: Oracle JMS Consumer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -99,17 +92,15 @@
   links:
   - title: Java EE JMS Message Consumer
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnceo
-  message: 'Oracle JMS consumers are used for receiving messages sent to a destination..
-    This reference should be replaced with the. Java EE standard API: `javax.jms.MessageConsumer`.'
+  message: "\n Oracle JMS consumers are used for receiving messages sent to a destination.\n\n
+    This reference should be replaced with the\n Java EE standard API: `javax.jms.MessageConsumer`.\n "
   ruleID: weblogic-jms-04000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsConsumer
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Consumer
-    Oracle JMS connections represent virtual connections with a JMS provider.. This reference should be replaced with the. Java. EE standard API: `javax.jms.Connection`.
+  description: Oracle JMS Consumer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -120,8 +111,8 @@
   links:
   - title: Java EE JMS Connections
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncem
-  message: 'Oracle JMS connections represent virtual connections with a JMS provider..
-    This reference should be replaced with the. Java. EE standard API: `javax.jms.Connection`.'
+  message: "\n Oracle JMS connections represent virtual connections with a JMS provider.\n\n
+    This reference should be replaced with the\n Java\n EE standard API: `javax.jms.Connection`.\n "
   ruleID: weblogic-jms-05000
   when:
     java.referenced:
@@ -131,8 +122,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: oracle.jms.AQjms(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: |
-    Oracle JMS {type}Message
+  description: Oracle JMS {type}Message
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -143,18 +133,16 @@
   links:
   - title: Java EE JMS Message API
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnces
-  message: 'Oracle JMS {{type}} messages represent the actual data passed through
-    JMS destinations.. This reference should be replaced. with the. Java. EE standard
-    API: `javax.jms.{{type}}Message`.'
+  message: "\n Oracle JMS {{type}} messages represent the actual data passed through
+    JMS destinations.\n\n This reference should be replaced\n with the\n Java\n EE
+    standard API: `javax.jms.{{type}}Message`.\n "
   ruleID: weblogic-jms-06000
   when:
     java.referenced:
       pattern: oracle.jms.AQjms(Text|Stream|Object|Map|Bytes)?Message
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Destination
-    Oracle JMS destinations are the objects a client uses to specify the target of messages it produces and the source of. messages it consumes.. This reference should be replaced with the. Java. EE standard API: `javax.jms.Destination`.
+  description: Oracle JMS Destination
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -165,9 +153,9 @@
   links:
   - title: Java EE JMS Destinations
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncel
-  message: 'Oracle JMS destinations are the objects a client uses to specify the target
-    of messages it produces and the source of. messages it consumes.. This reference
-    should be replaced with the. Java. EE standard API: `javax.jms.Destination`.'
+  message: "\n Oracle JMS destinations are the objects a client uses to specify the
+    target of messages it produces and the source of\n messages it consumes.\n\n This
+    reference should be replaced with the\n Java\n EE standard API: `javax.jms.Destination`.\n "
   ruleID: weblogic-jms-07000
   when:
     java.referenced:
@@ -177,8 +165,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: oracle.jms.AQjms(?P<type>(Topic|Queue)?)?ConnectionFactory
-  description: |
-    Oracle JMS {type} Connection Factory
+  description: Oracle JMS {type} Connection Factory
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -189,9 +176,9 @@
   links:
   - title: Java EE JMS Connection factories
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncek
-  message: 'Oracle {{type}}ConnectionFactory is an encapsulation of JMS servers to
-    which Connections can be created for message distribution.. This reference should
-    be replaced with the. Java. EE standard API: `javax.jms.{{type}}ConnectionFactory`.'
+  message: "\n Oracle {{type}}ConnectionFactory is an encapsulation of JMS servers
+    to which Connections can be created for message distribution.\n\n This reference
+    should be replaced with the\n Java\n EE standard API: `javax.jms.{{type}}ConnectionFactory`.\n "
   ruleID: weblogic-jms-08000
   when:
     java.referenced:
diff --git a/default/generated/eap6/52-weblogic-services.windup.yaml b/default/generated/eap6/52-weblogic-services.windup.yaml
index 4e57fed1..539fc597 100644
--- a/default/generated/eap6/52-weblogic-services.windup.yaml
+++ b/default/generated/eap6/52-weblogic-services.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Startup Service
-    Replace this class with a class using the EJB 3.1 `@Singleton` and `@Startup` annotations.
+  description: WebLogic Startup Service
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -24,9 +22,7 @@
       pattern: weblogic.common.T3StartupDef
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic T3ServicesDef usage
-    `T3ServicesDef` provides access to core services of the container, such as Timers and Logging facilities.. Replace the services provided by this with a Singleton EJB (using the `@Singleton` annotation) that provides access to the equivalent services from JBoss EAP.
+  description: WebLogic T3ServicesDef usage
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -37,10 +33,10 @@
   links:
   - title: Java EE Tutorial - @Singleton Session Bean
     url: http://docs.oracle.com/javaee/6/tutorial/doc/gipvi.html
-  message: '`T3ServicesDef` provides access to core services of the container, such
-    as Timers and Logging facilities.. Replace the services provided by this with
-    a Singleton EJB (using the `@Singleton` annotation) that provides access to the
-    equivalent services from JBoss EAP.'
+  message: "\n \n `T3ServicesDef` provides access to core services of the container,
+    such as Timers and Logging facilities.\n\n Replace the services provided by this
+    with a Singleton EJB (using the `@Singleton` annotation) that provides access
+    to the equivalent services from JBoss EAP.\n \n "
   ruleID: weblogic-services-02000
   when:
     java.referenced:
@@ -50,9 +46,7 @@
   - name: logger
     nameOfCaptureGroup: logger
     pattern: weblogic.(?P<logger>(i18n.)?logging.[^N])?.*
-  description: |-
-    WebLogic proprietary logging classes
-    Oracle WebLogic logging classes should be replaced with SLF4J, Log4J, or Java Logging.. Please refer to the [JBoss EAP migration guide](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Migration_Guide/chap-Migrate_Your_Application.html#sect-Logging_Changes) for more information on this.
+  description: WebLogic proprietary logging classes
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -63,9 +57,9 @@
   links:
   - title: JBoss EAP 6 - Logging changes
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Migration_Guide/chap-Migrate_Your_Application.html#sect-Logging_Changes
-  message: Oracle WebLogic logging classes should be replaced with SLF4J, Log4J, or
-    Java Logging.. Please refer to the [JBoss EAP migration guide](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Migration_Guide/chap-Migrate_Your_Application.html#sect-Logging_Changes)
-    for more information on this.
+  message: "\n \n Oracle WebLogic logging classes should be replaced with SLF4J, Log4J,
+    or Java Logging.\n\n Please refer to the [JBoss EAP migration guide](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Migration_Guide/chap-Migrate_Your_Application.html#sect-Logging_Changes)
+    for more information on this.\n \n "
   ruleID: weblogic-services-03000
   when:
     java.referenced:
diff --git a/default/generated/eap6/53-weblogic-webapp.windup.yaml b/default/generated/eap6/53-weblogic-webapp.windup.yaml
index 8f42ec03..54dfd5cc 100644
--- a/default/generated/eap6/53-weblogic-webapp.windup.yaml
+++ b/default/generated/eap6/53-weblogic-webapp.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Virtual directory mapping
-    Virtual directories supported in WebLogic are not supported in JBoss EAP.
+  description: WebLogic Virtual directory mapping
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -25,9 +23,7 @@
       xpath: //wl:virtual-directory-mapping
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLServlet` annotation with the Java EE standard `@WebServlet` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -39,9 +35,10 @@
   links:
   - title: WebLogic proprietary servlet annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLServlet` annotation with the Java
-    EE standard `@WebServlet` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLServlet` annotation with the
+    Java EE standard `@WebServlet` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-02000
   when:
     java.referenced:
@@ -49,9 +46,7 @@
       pattern: weblogic.servlet.annotation.WLServlet
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLInitParam` annotation with the Java EE standard `@WebInitParam` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -63,9 +58,10 @@
   links:
   - title: WebLogic proprietary servlet annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLInitParam` annotation with the Java
-    EE standard `@WebInitParam` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLInitParam` annotation with
+    the Java EE standard `@WebInitParam` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-03000
   when:
     java.referenced:
@@ -73,9 +69,7 @@
       pattern: weblogic.servlet.annotation.WLInitParam
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLFilter` annotation with the Java EE standard `@WebFilter` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -87,9 +81,10 @@
   links:
   - title: WebLogic proprietary servlet annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLFilter` annotation with the Java EE
-    standard `@WebFilter` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLFilter` annotation with the
+    Java EE standard `@WebFilter` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/6/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-04000
   when:
     java.referenced:
@@ -97,9 +92,7 @@
       pattern: weblogic.servlet.annotation.WLFilter
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic ApplicationLifecycleEvent
-    WebLogic `ApplicationLifecycleEvent` must be replaced with standard Java EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped` beans or EJB's `@Startup` beans is required in order to propagate a custom event object because `ServletContextEvent` types are not extendible in the standard Java EE programming model.. Use a `javax.servlet.ServletContextListener` with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton` service bean.
+  description: WebLogic ApplicationLifecycleEvent
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -115,13 +108,13 @@
     url: http://docs.oracle.com/javaee/6/api/javax/servlet/ServletContextEvent.html
   - title: WebLogic custom ApplicationLifecycleEvent Documentation
     url: http://docs.oracle.com/cd/E13222_01/wls/docs90/programming/lifecycle.html
-  message: WebLogic `ApplicationLifecycleEvent` must be replaced with standard Java
-    EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped`
+  message: "\n \n WebLogic `ApplicationLifecycleEvent` must be replaced with standard
+    Java EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped`
     beans or EJB's `@Startup` beans is required in order to propagate a custom event
     object because `ServletContextEvent` types are not extendible in the standard
-    Java EE programming model.. Use a `javax.servlet.ServletContextListener` with
+    Java EE programming model.\n\n Use a `javax.servlet.ServletContextListener` with
     `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton`
-    service bean.
+    service bean.\n \n "
   ruleID: weblogic-webapp-05000
   when:
     or:
@@ -136,9 +129,7 @@
         pattern: weblogic.application.ApplicationLifecycleEvent
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic ApplicationLifecycleListener
-    WebLogic `ApplicationLifecycleListener` must be replaced with standard Java EE `ServletContextListener` types. Otherwise, a solution using CDI's `ApplicationScoped` beans or EJB's `@Startup` beans is required.. Use a `javax.servlet.ServletContextListener` with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton` service bean.
+  description: WebLogic ApplicationLifecycleListener
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -155,11 +146,11 @@
     url: http://docs.oracle.com/javaee/6/api/javax/servlet/ServletContextEvent.html
   - title: WebLogic custom ApplicationLifecycleEvent Documentation
     url: http://docs.oracle.com/cd/E13222_01/wls/docs90/programming/lifecycle.html
-  message: WebLogic `ApplicationLifecycleListener` must be replaced with standard
+  message: "\n \n WebLogic `ApplicationLifecycleListener` must be replaced with standard
     Java EE `ServletContextListener` types. Otherwise, a solution using CDI's `ApplicationScoped`
-    beans or EJB's `@Startup` beans is required.. Use a `javax.servlet.ServletContextListener`
+    beans or EJB's `@Startup` beans is required.\n\n Use a `javax.servlet.ServletContextListener`
     with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup`
-    `@javax.ejb.Singleton` service bean.
+    `@javax.ejb.Singleton` service bean.\n \n "
   ruleID: weblogic-webapp-06000
   when:
     or:
@@ -171,9 +162,7 @@
         pattern: weblogic.application.ApplicationLifecycleListener
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary security API
-    The usage of the WebLogic proprietary security API should be replaced by standard Java EE mechanisms or the ones provided by JBoss EAP.
+  description: WebLogic proprietary security API
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -192,9 +181,7 @@
       pattern: weblogic.security*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary security reference to weblogic.security.Security
-    Migrate to JBoss EAP 6: `org.jboss.security.SecurityContextAssociation`.
+  description: WebLogic proprietary security reference to weblogic.security.Security
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -215,9 +202,7 @@
       pattern: weblogic.security.Security
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary ServletAuthentication annotation
-    Oracle WebLogic Server provides a proprietary `ServletAuthentication` class to perform programmatic login.. In Red Hat JBoss EAP 6, you can use the standard Java EE 6 servlet security 3.0 `HttpServletRequest.login()` method or you can define a `<security-constraint>` element in the web.xml file. You must also replace code that uses the Oracle WebLogic Server proprietary `ServletAuthentication` class.
+  description: WebLogic proprietary ServletAuthentication annotation
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -229,12 +214,12 @@
   links:
   - title: Migrate Oracle WebLogic programmatic login to JBoss EAP 6
     url: https://access.redhat.com/articles/1329213
-  message: Oracle WebLogic Server provides a proprietary `ServletAuthentication` class
-    to perform programmatic login.. In Red Hat JBoss EAP 6, you can use the standard
-    Java EE 6 servlet security 3.0 `HttpServletRequest.login()` method or you can
-    define a `<security-constraint>` element in the web.xml file. You must also replace
-    code that uses the Oracle WebLogic Server proprietary `ServletAuthentication`
-    class.
+  message: "\n \n Oracle WebLogic Server provides a proprietary `ServletAuthentication`
+    class to perform programmatic login.\n\n In Red Hat JBoss EAP 6, you can use the
+    standard Java EE 6 servlet security 3.0 `HttpServletRequest.login()` method or
+    you can define a `<security-constraint>` element in the web.xml file. You must
+    also replace code that uses the Oracle WebLogic Server proprietary `ServletAuthentication`
+    class.\n \n "
   ruleID: weblogic-webapp-09000
   when:
     java.referenced:
diff --git a/default/generated/eap6/54-weblogic-webservices.windup.yaml b/default/generated/eap6/54-weblogic-webservices.windup.yaml
index 0f5f7dd2..77c93195 100644
--- a/default/generated/eap6/54-weblogic-webservices.windup.yaml
+++ b/default/generated/eap6/54-weblogic-webservices.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service implementation class
-    This web service stub uses the WebLogic proprietary web service implementation class ("weblogic.wsee.jaxrpc.ServiceImpl").. It might have been generated by a WebLogic proprietary tool.. This should be replaced using the standard Java EE JAX-WS framework. It could be regenerated using the JBoss web services tools.. Please refer to the [JAX-WS web service](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#chap-JAX-WS_Web_Services) guide for more information.
+  description: WebLogic proprietary web service implementation class
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -13,12 +11,12 @@
   links:
   - title: JAX-WS Web Service Clients
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#chap-JAX-WS_Web_Services
-  message: This web service stub uses the WebLogic proprietary web service implementation
-    class ("weblogic.wsee.jaxrpc.ServiceImpl").. It might have been generated by a
-    WebLogic proprietary tool.. This should be replaced using the standard Java EE
-    JAX-WS framework. It could be regenerated using the JBoss web services tools..
-    Please refer to the [JAX-WS web service](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#chap-JAX-WS_Web_Services)
-    guide for more information.
+  message: "\n \n This web service stub uses the WebLogic proprietary web service
+    implementation class (\"weblogic.wsee.jaxrpc.ServiceImpl\").\n It might have been
+    generated by a WebLogic proprietary tool.\n\n This should be replaced using the
+    standard Java EE JAX-WS framework. It could be regenerated using the JBoss web
+    services tools.\n Please refer to the [JAX-WS web service](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#chap-JAX-WS_Web_Services)
+    guide for more information.\n \n "
   ruleID: weblogic-webservices-01000
   when:
     java.referenced:
@@ -26,9 +24,7 @@
       pattern: weblogic.wsee.jaxrpc.ServiceImpl
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic asynchronous web service client
-    The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm) should be replaced using calls to the JAX-WS asynchronous API.. More information is available in the [JBoss EAP documentation](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#Develop_a_JAX-WS_Client_Application).
+  description: WebLogic asynchronous web service client
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -42,18 +38,17 @@
     url: https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm
   - title: Develop a JAX-WS Client Application
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#Develop_a_JAX-WS_Client_Application
-  message: The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm)
-    should be replaced using calls to the JAX-WS asynchronous API.. More information
-    is available in the [JBoss EAP documentation](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#Develop_a_JAX-WS_Client_Application).
+  message: "\n \n The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm)
+    should be replaced using calls to the JAX-WS asynchronous API.\n\n More information
+    is available in the [JBoss EAP documentation](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#Develop_a_JAX-WS_Client_Application).\n
+    \n "
   ruleID: weblogic-webservices-02000
   when:
     java.referenced:
       pattern: weblogic.wsee.async.AsyncPreCallContext
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service authentication
-    Replace proprietary web-service authentication with JAX-WS standard calls. To attach authentication with JBoss EAP, simply use the following code:. ```java. URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL();. QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService");. Service service = Service.create(wsdlURL, qname);. port = (TestEndpoint)service.getPort(TestEndpoint.class);. BindingProvider bp = (BindingProvider)port;. bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "jsmith");. bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "PaSSw0rd");. ```
+  description: WebLogic proprietary web service authentication
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -65,14 +60,14 @@
   links:
   - title: JBoss EAP 5 CXF User Guide
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/5/html/Web_Services_CXF_User_Guide/sect-Authentication.html
-  message: Replace proprietary web-service authentication with JAX-WS standard calls.
-    To attach authentication with JBoss EAP, simply use the following code:. ```java.
-    URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL();.
-    QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService");.
-    Service service = Service.create(wsdlURL, qname);. port = (TestEndpoint)service.getPort(TestEndpoint.class);.
-    BindingProvider bp = (BindingProvider)port;. bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
-    "jsmith");. bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "PaSSw0rd");.
-    ```
+  message: "\n \n Replace proprietary web-service authentication with JAX-WS standard
+    calls. To attach authentication with JBoss EAP, simply use the following code:\n\n
+    ```java\n URL wsdlURL = new File(\"resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl\").toURL();\n
+    QName qname = new QName(\"http://org.jboss.ws/jaxws/context\", \"TestEndpointService\");\n
+    Service service = Service.create(wsdlURL, qname);\n port = (TestEndpoint)service.getPort(TestEndpoint.class);\n\n
+    BindingProvider bp = (BindingProvider)port;\n bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
+    \"jsmith\");\n bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, \"PaSSw0rd\");\n
+    ```\n \n "
   ruleID: weblogic-webservices-03000
   when:
     java.referenced:
@@ -80,9 +75,7 @@
       pattern: weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services API - weblogic.wsee.context.WebServiceContext
-    This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`. This usage will need to be replaced with the Java Enterprise Edition standard `javax.xml.WebServiceContext` interface.. Example code:. ```java. @Resource. private WebServiceContext webServiceContext;. ```
+  description: WebLogic proprietary web services API - weblogic.wsee.context.WebServiceContext
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -94,19 +87,17 @@
   links:
   - title: javax.xml.WebServiceContext Documentation
     url: http://docs.oracle.com/javaee/6/api/javax/xml/ws/WebServiceContext.html
-  message: This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`.
+  message: "\n \n This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`.
     This usage will need to be replaced with the Java Enterprise Edition standard
-    `javax.xml.WebServiceContext` interface.. Example code:. ```java. @Resource. private
-    WebServiceContext webServiceContext;. ```
+    `javax.xml.WebServiceContext` interface.\n\n Example code:\n\n ```java\n @Resource\n
+    private WebServiceContext webServiceContext;\n ```\n \n "
   ruleID: weblogic-webservices-04000
   when:
     java.referenced:
       pattern: weblogic.wsee.context.WebServiceContext
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services API - ContextNotFoundException
-    This exception (`weblogic.wsee.context.ContextNotFoundException`) is WebLogic specific and can be removed.
+  description: WebLogic proprietary web services API - ContextNotFoundException
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -116,17 +107,15 @@
   - weblogic
   - context
   links: []
-  message: This exception (`weblogic.wsee.context.ContextNotFoundException`) is WebLogic
-    specific and can be removed.
+  message: "\n This exception (`weblogic.wsee.context.ContextNotFoundException`) is
+    WebLogic specific and can be removed.\n "
   ruleID: weblogic-webservices-05000
   when:
     java.referenced:
       pattern: weblogic.wsee.context.ContextNotFoundException
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services generated client classes
-    This class has been generated by a WebLogic web service client generator (ClientGen).. It could be replaced by an equivalent standard Java EE technology using for example the EAP 6 wsconsume tool, the wsgen tool or the CXF tools.
+  description: WebLogic proprietary web services generated client classes
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -144,9 +133,10 @@
     url: https://jax-ws.java.net/nonav/2.2.6/docs/ch04.html#tools-wsgen
   - title: Apache CXF tools
     url: https://cxf.apache.org/docs/tools.html
-  message: This class has been generated by a WebLogic web service client generator
-    (ClientGen).. It could be replaced by an equivalent standard Java EE technology
-    using for example the EAP 6 wsconsume tool, the wsgen tool or the CXF tools.
+  message: "\n \n This class has been generated by a WebLogic web service client generator
+    (ClientGen).\n\n It could be replaced by an equivalent standard Java EE technology
+    using for example the EAP 6 wsconsume tool, the wsgen tool or the CXF tools.\n
+    \n "
   ruleID: weblogic-webservices-06000
   when:
     or:
@@ -158,9 +148,7 @@
         pattern: weblogic.webservice*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service annotation @Transactional
-    Replace WebLogic proprietary web-service annotation `@Transactional` by the standard Java EE annotation `@TransactionAttribute`.
+  description: WebLogic proprietary web service annotation @Transactional
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -173,8 +161,8 @@
     url: https://docs.oracle.com/middleware/11119/wls/WSREF/annotations.htm#i1058163
   - title: JBoss EAP 6 - API TransactionAttribute
     url: https://access.redhat.com/webassets/avalon/d/JBoss_Enterprise_Application_Platform-6-API_Documentation-en-US/files/javadoc/javax/ejb/TransactionAttribute.html
-  message: Replace WebLogic proprietary web-service annotation `@Transactional` by
-    the standard Java EE annotation `@TransactionAttribute`.
+  message: "\n \n Replace WebLogic proprietary web-service annotation `@Transactional`
+    by the standard Java EE annotation `@TransactionAttribute`.\n \n "
   ruleID: weblogic-webservices-07000
   when:
     java.referenced:
diff --git a/default/generated/eap6/55-weblogic-xml-descriptors.windup.yaml b/default/generated/eap6/55-weblogic-xml-descriptors.windup.yaml
index c6426b82..8423ae28 100644
--- a/default/generated/eap6/55-weblogic-xml-descriptors.windup.yaml
+++ b/default/generated/eap6/55-weblogic-xml-descriptors.windup.yaml
@@ -4,7 +4,7 @@
     is used to describe Oracle WebLogic Server EAR archives. Oracle WebLogic Server
     EAR configures some application settings through the `application-param` element.\n
     \                     These settings could be replaced with `context-param` elements
-    in Java EE Servlet `web.xml` descriptor.\n                    \n"
+    in Java EE Servlet `web.xml` descriptor.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -27,7 +27,7 @@
       namespaces: {}
       xpath: /*[local-name()='weblogic-application']
 - customVariables: []
-  description: |
+  description: |-
     WebLogic Entity EJB configuration
     WebLogic Entity EJB Configuration are used for RDBMS based persistence services.
   labels:
@@ -53,9 +53,7 @@
       xpath: /*[local-name()='weblogic-rdbms-jar']
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml) delay-updates-until-end-of-tx
-    The WebLogic `<delay-updates-until-end-of-tx>` configuration element, which defaults to `true`, is used for performance reasons to delay updates to the persistent store of all beans until the end of the transaction. When set to `false`, updates are sent to the database after each method invocation, but are not committed until the end of the transaction. This allows other processes to access the persisted data while the transaction is waiting to be completed.. In JBoss EAP 6+, you can achieve the same behavior by specifying the `<sync-on-commit-only>` in the jbosscmp-jdbc.xml file.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml) delay-updates-until-end-of-tx
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -70,14 +68,14 @@
   - title: Map delay-updates-until-end-of-tx element from weblogic-ejb-jar.xml Elements
       to the JBoss Enterprise Application Platform Equivalent
     url: https://access.redhat.com/articles/1326823
-  message: The WebLogic `<delay-updates-until-end-of-tx>` configuration element, which
-    defaults to `true`, is used for performance reasons to delay updates to the persistent
-    store of all beans until the end of the transaction. When set to `false`, updates
-    are sent to the database after each method invocation, but are not committed until
-    the end of the transaction. This allows other processes to access the persisted
-    data while the transaction is waiting to be completed.. In JBoss EAP 6+, you can
-    achieve the same behavior by specifying the `<sync-on-commit-only>` in the jbosscmp-jdbc.xml
-    file.
+  message: "\n \n The WebLogic `<delay-updates-until-end-of-tx>` configuration element,
+    which defaults to `true`, is used for performance reasons to delay updates to
+    the persistent store of all beans until the end of the transaction. When set to
+    `false`, updates are sent to the database after each method invocation, but are
+    not committed until the end of the transaction. This allows other processes to
+    access the persisted data while the transaction is waiting to be completed.\n\n
+    In JBoss EAP 6+, you can achieve the same behavior by specifying the `<sync-on-commit-only>`
+    in the jbosscmp-jdbc.xml file.\n \n "
   ruleID: weblogic-xml-descriptor-03000
   when:
     builtin.xml:
@@ -85,9 +83,7 @@
       xpath: //*[local-name()='delay-updates-until-end-of-tx']/text()
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml)
-    The elements of proprietary `weblogic-ejb-jar.xml` descriptor need to be mapped to the `jboss-ejb3.xml` one according to the attached knowledge article.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml)
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -122,9 +118,7 @@
         xpath: /wls:weblogic-ejb-jar
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Stateful Session Bean (SFSB)
-    Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`.. The equivalent usage is `@AccessTimeout(value= -1)`
+  description: WebLogic Stateful Session Bean (SFSB)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -137,8 +131,9 @@
   links:
   - title: Java EE 6 annotation @AccessTimeout
     url: http://docs.oracle.com/javaee/6/api/javax/ejb/AccessTimeout.html
-  message: Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`..
-    The equivalent usage is `@AccessTimeout(value= -1)`
+  message: |-
+    Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`.
+     The equivalent usage is `@AccessTimeout(value= -1)`
   ruleID: weblogic-xml-descriptor-06001
   when:
     builtin.xml:
@@ -147,6 +142,7 @@
       xpath: //*[local-name() = 'allow-concurrent-calls' and translate(text(),'TRUE','true')
         = 'true' ]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -165,6 +161,7 @@
         wl10: http://www.bea.com/ns/weblogic/weblogic-wsee-standaloneclient
       xpath: /weblogic-wsee-standaloneclient |/wl10:weblogic-wsee-standaloneclient
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -183,6 +180,7 @@
         jee: http://java.sun.com/xml/ns/j2ee
       xpath: /java-wsdl-mapping
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -203,9 +201,7 @@
       xpath: /webservice-policy-ref | /wl:webservice-policy-ref | /wl9:webservice-policy-ref
 - category: optional
   customVariables: []
-  description: |-
-    Webservice Type
-    WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor or to a Java EE standard Annotation based configuration. Reference the JBoss EAP product documentation for more information.
+  description: Webservice Type
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -214,9 +210,9 @@
   - weblogic
   - descriptor
   links: []
-  message: WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor
+  message: "WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor
     or to a Java EE standard Annotation based configuration. Reference the JBoss EAP
-    product documentation for more information.
+    product documentation for more information.\n "
   ruleID: weblogic-xml-descriptor-10000
   when:
     or:
@@ -240,7 +236,7 @@
     may be configured in the application deployment or JBoss server configuration
     files.\n\n                        For information on how to configure JBoss EAP
     JMS, please refer to the Administration and Configuration Guide for JBoss Enterprise
-    Application Platform 6.\n                    \n"
+    Application Platform 6.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -268,7 +264,7 @@
     may be configured in the application deployment or JBoss server configuration
     files.\n\n                        For more information on how to configure JBoss
     EAP, please refer to the Administration and Configuration Guide for JBoss Enterprise
-    Application Platform 6.\n                    \n"
+    Application Platform 6.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -297,6 +293,7 @@
       xpath: /bea:weblogic-web-app | /wlso:weblogic-web-app | /wls:weblogic-web-app
         | /weblogic-web-app
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -315,7 +312,7 @@
         wsdd: http://www.bea.com/servers/wls70
       xpath: /wsdd:type-mapping
 - customVariables: []
-  description: |
+  description: |-
     WebLogic services configuration
     WebLogic specific configuration of web services runtime parameters
   labels:
@@ -337,6 +334,7 @@
         wlw: http://www.bea.com/2003/03/wlw/config/
       xpath: /wlw:wlw-config
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -360,7 +358,7 @@
 - customVariables: []
   description: "WebLogic annotation manifest\n\n                        In this file,
     the value set for a property by a metadata annotation can be overridden. (It does
-    not override the values set by a setter method.)\n                    \n"
+    not override the values set by a setter method.)\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -381,7 +379,7 @@
 - customVariables: []
   description: "WebLogic plan.xml deployment descriptor\n\n                        WebLogic
     `plan.xml` deployment descriptor file provides a way to target the application
-    deployment for a specific environment.\n                    \n"
+    deployment for a specific environment.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap6
@@ -403,9 +401,7 @@
       xpath: /wls:deployment-plan
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml) trans-timeout-seconds
-    The WebLogic `<trans-timeout-seconds>` configuration element sets the maximum duration for an EJB's container-initiated transactions, in seconds, after which the transaction is rolled back.. In JBoss EAP 6+, you can achieve the same behavior by using the `TransactionTimeout` annotation.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml) trans-timeout-seconds
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -422,10 +418,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/administration_and_configuration_guide/#Session_Bean_Transaction_Timeout
   - title: How to set EJB transaction timeout in JBoss EAP 6
     url: https://access.redhat.com/solutions/90553
-  message: The WebLogic `<trans-timeout-seconds>` configuration element sets the maximum
-    duration for an EJB's container-initiated transactions, in seconds, after which
-    the transaction is rolled back.. In JBoss EAP 6+, you can achieve the same behavior
-    by using the `TransactionTimeout` annotation.
+  message: "\n \n The WebLogic `<trans-timeout-seconds>` configuration element sets
+    the maximum duration for an EJB's container-initiated transactions, in seconds,
+    after which the transaction is rolled back. \n\n In JBoss EAP 6+, you can achieve
+    the same behavior by using the `TransactionTimeout` annotation.\n \n "
   ruleID: weblogic-xml-descriptor-19000
   when:
     builtin.xml:
diff --git a/default/generated/eap6/56-weblogic.windup.yaml b/default/generated/eap6/56-weblogic.windup.yaml
index efc7e2c3..a226d34f 100644
--- a/default/generated/eap6/56-weblogic.windup.yaml
+++ b/default/generated/eap6/56-weblogic.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Scheduled Job
-    WebLogic scheduled jobs should be migrated to use the standard EJB `javax.ejb.TimerService`.
+  description: WebLogic Scheduled Job
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -17,7 +15,8 @@
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnboy.html
   - title: EJB Timer Service
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnboy.html
-  message: WebLogic scheduled jobs should be migrated to use the standard EJB `javax.ejb.TimerService`.
+  message: "\n \n WebLogic scheduled jobs should be migrated to use the standard EJB
+    `javax.ejb.TimerService`.\n \n "
   ruleID: weblogic-01000
   tag:
   - scheduler
@@ -31,9 +30,7 @@
       pattern: weblogic.time.common.Triggerable
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic StringUtils usage
-    Replace with the `StringUtils` class from Apache Commons.
+  description: WebLogic StringUtils usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -51,9 +48,7 @@
       pattern: weblogic.utils.StringUtils*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic specific Apache XML package
-    Code using this package should be replaced with code using the org.apache.xml package from [Apache Xerces](http://xerces.apache.org/).
+  description: WebLogic specific Apache XML package
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -61,8 +56,8 @@
   - konveyor.io/target=eap
   - weblogic
   links: []
-  message: Code using this package should be replaced with code using the org.apache.xml
-    package from [Apache Xerces](http://xerces.apache.org/).
+  message: "\n Code using this package should be replaced with code using the org.apache.xml
+    package from [Apache Xerces](http://xerces.apache.org/).\n "
   ruleID: weblogic-03000
   when:
     java.referenced:
@@ -73,9 +68,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: weblogic.transaction.(?P<classname>(Client)*TransactionManager)
-  description: |-
-    WebLogic TransactionManager usage
-    Replace with the Java EE standard [javax.transaction.TransactionManager](http://docs.oracle.com/javaee/7/api/javax/transaction/TransactionManager.html)
+  description: WebLogic TransactionManager usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -95,9 +88,7 @@
       pattern: weblogic.transaction.(Client)*TransactionManager
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TransactionManager usage of resume method
-    Replace with the Java EE standard method `javax.transaction.TransactionManager.resume(Transaction tx)`.
+  description: WebLogic TransactionManager usage of resume method
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -125,9 +116,7 @@
         pattern: weblogic.transaction.ClientTransactionManager.forceResume*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TransactionManager usage of suspend method
-    Replace with the Java EE standard `javax.transaction.TransactionManager.suspend()`
+  description: WebLogic TransactionManager usage of suspend method
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -154,9 +143,7 @@
         pattern: weblogic.transaction.ClientTransactionManager.forceSuspend*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TxHelper usage
-    Remove the `weblogic.transaction.TxHelper` import statement.
+  description: WebLogic TxHelper usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -175,9 +162,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: weblogic.transaction.(?P<classname>(Client)*TxHelper.)?getTransactionManager\(\)
-  description: |-
-    WebLogic ClientTxHelper
-    Look up the Java Enterprise Edition `javax.transaction.TransactionManager` in JBoss EAP using the following code:. ```java. InitialContext context = new InitialContext();. TransactionManager transactionManager =. (TransactionManager)context.lookup("java:jboss/TransactionManager");. ```
+  description: WebLogic ClientTxHelper
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -186,10 +171,10 @@
   - weblogic
   - transactions
   links: []
-  message: Look up the Java Enterprise Edition `javax.transaction.TransactionManager`
-    in JBoss EAP using the following code:. ```java. InitialContext context = new
-    InitialContext();. TransactionManager transactionManager =. (TransactionManager)context.lookup("java:jboss/TransactionManager");.
-    ```
+  message: "\n \n Look up the Java Enterprise Edition `javax.transaction.TransactionManager`
+    in JBoss EAP using the following code:\n\n ```java\n InitialContext context =
+    new InitialContext();\n TransactionManager transactionManager =\n (TransactionManager)context.lookup(\"java:jboss/TransactionManager\");\n
+    ```\n \n "
   ruleID: weblogic-08000
   when:
     java.referenced:
@@ -197,9 +182,7 @@
       pattern: weblogic.transaction.(Client)*TxHelper.getTransactionManager*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary Clob JDBC object (OracleThinClob)
-    This Oracle and WebLogic proprietary code (`OracleThinClob`) should be replaced with the use of the java.sql.Clob interface.
+  description: WebLogic proprietary Clob JDBC object (OracleThinClob)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -212,17 +195,15 @@
     url: https://docs.oracle.com/database/121/JAJDB/oracle/jdbc/class-use/OracleClob.html
   - title: java.sql.Clob interface
     url: http://docs.oracle.com/javase/7/docs/api/java/sql/Clob.html
-  message: This Oracle and WebLogic proprietary code (`OracleThinClob`) should be
-    replaced with the use of the java.sql.Clob interface.
+  message: "\n This Oracle and WebLogic proprietary code (`OracleThinClob`) should
+    be replaced with the use of the java.sql.Clob interface.\n "
   ruleID: weblogic-09000
   when:
     java.referenced:
       pattern: weblogic.jdbc.vendor.oracle.OracleThinClob
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic JDBC code
-    This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`
+  description: WebLogic JDBC code
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -235,7 +216,7 @@
     url: https://docs.oracle.com/database/121/JAJDB/oracle/jdbc/class-use/OracleClob.html
   - title: java.sql.Clob interface
     url: http://docs.oracle.com/javase/7/docs/api/java/sql/Clob.html
-  message: This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`
+  message: "\n This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`\n "
   ruleID: weblogic-10000
   when:
     java.referenced:
@@ -243,9 +224,7 @@
       pattern: weblogic.jdbc.vendor.oracle.OracleThinClob.getCharacterOutputStream*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary logger (NonCatalogLogger)
-    The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and should be migrated to a supported logging framework,. such as the JDK Logger or JBoss Logging:. ```java. import java.util.logging.Logger;. Logger LOG = Logger.getLogger("MyLogger");. ```
+  description: WebLogic proprietary logger (NonCatalogLogger)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -258,10 +237,10 @@
     url: https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html
   - title: Logging with JBoss EAP
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/configuration_guide/logging_with_jboss_eap
-  message: The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and should
-    be migrated to a supported logging framework,. such as the JDK Logger or JBoss
-    Logging:. ```java. import java.util.logging.Logger;. Logger LOG = Logger.getLogger("MyLogger");.
-    ```
+  message: "\n \n The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and
+    should be migrated to a supported logging framework,\n such as the JDK Logger
+    or JBoss Logging:\n\n ```java\n import java.util.logging.Logger;\n Logger LOG
+    = Logger.getLogger(\"MyLogger\");\n ```\n \n "
   ruleID: weblogic-11000
   when:
     or:
@@ -273,9 +252,7 @@
         pattern: weblogic.i18n.logging.NonCatalogLogger*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Oracle FCF JDBC property
-    Oracle Fast Connection Failover is specific property supported only by Oracle JDBC driver which provides support for their vendor's special features transparently to the application server in which they are deployed.. For example, one can supply a URL like this to the Oracle JDBC driver and the driver will provide transparent load-balancing and fail-over:. ```. <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>. ```
+  description: WebLogic Oracle FCF JDBC property
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -286,12 +263,12 @@
   links:
   - title: Implement Oracle Fast Connection Failover (FCF) in EAP 6
     url: https://access.redhat.com/articles/1329233
-  message: Oracle Fast Connection Failover is specific property supported only by
-    Oracle JDBC driver which provides support for their vendor's special features
-    transparently to the application server in which they are deployed.. For example,
+  message: "\n \n Oracle Fast Connection Failover is specific property supported only
+    by Oracle JDBC driver which provides support for their vendor's special features
+    transparently to the application server in which they are deployed.\n\n For example,
     one can supply a URL like this to the Oracle JDBC driver and the driver will provide
-    transparent load-balancing and fail-over:. ```. <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>.
-    ```
+    transparent load-balancing and fail-over:\n ```\n <xa-datasource-property name=\"URL\">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>\n
+    ```\n \n "
   ruleID: weblogic-12000
   when:
     builtin.xml:
@@ -299,9 +276,7 @@
       xpath: /jdbc-data-source/jdbc-driver-params/property/name[text()='FastConnectionFailoverEnabled']
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic side-by-side redeployment configuration
-    Oracle WebLogic Server includes a proprietary side-by-side production redeployment feature. For applications that meet certain requirements and restrictions, the new version of the application is deployed while the older version is still running.. The old and new applications must be running on the same server or cluster. The new version of the application accepts new web session requests while the older version finishes processing requests already in process. Upon completion of the existing session requests, the older version of the application is then undeployed.. In JBoss EAP, you can either deploy the new application to a secondary server group or cluster, or deploy the new application serially to the same clustered domain.
+  description: WebLogic side-by-side redeployment configuration
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -311,16 +286,16 @@
   links:
   - title: Replace WebLogic side-by-side production redeployment in EAP 6
     url: https://access.redhat.com/articles/1329253
-  message: Oracle WebLogic Server includes a proprietary side-by-side production redeployment
-    feature. For applications that meet certain requirements and restrictions, the
-    new version of the application is deployed while the older version is still running..
-    The old and new applications must be running on the same server or cluster. The
-    new version of the application accepts new web session requests while the older
-    version finishes processing requests already in process. Upon completion of the
-    existing session requests, the older version of the application is then undeployed..
-    In JBoss EAP, you can either deploy the new application to a secondary server
-    group or cluster, or deploy the new application serially to the same clustered
-    domain.
+  message: "\n \n Oracle WebLogic Server includes a proprietary side-by-side production
+    redeployment feature. For applications that meet certain requirements and restrictions,
+    the new version of the application is deployed while the older version is still
+    running.\n The old and new applications must be running on the same server or
+    cluster. The new version of the application accepts new web session requests while
+    the older version finishes processing requests already in process. Upon completion
+    of the existing session requests, the older version of the application is then
+    undeployed.\n\n In JBoss EAP, you can either deploy the new application to a secondary
+    server group or cluster, or deploy the new application serially to the same clustered
+    domain.\n \n "
   ruleID: weblogic-13000
   when:
     builtin.filecontent:
@@ -328,9 +303,7 @@
       pattern: 'Weblogic-Application-Version:'
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Oracle Wallet
-    WebLogic administrators use wallets created by Oracle Wallet Manager to manage public key security credentials on application clients and servers.. These wallets must first be converted to standard Java KeyStore (JKS) entries that can then be used to configure the credentials in JBoss EAP 6.
+  description: WebLogic Oracle Wallet
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -340,10 +313,10 @@
   links:
   - title: Replace WebLogic Oracle Wallets When Migrating to EAP 6
     url: https://access.redhat.com/articles/1329073
-  message: WebLogic administrators use wallets created by Oracle Wallet Manager to
-    manage public key security credentials on application clients and servers.. These
-    wallets must first be converted to standard Java KeyStore (JKS) entries that can
-    then be used to configure the credentials in JBoss EAP 6.
+  message: "\n \n WebLogic administrators use wallets created by Oracle Wallet Manager
+    to manage public key security credentials on application clients and servers.\n\n
+    These wallets must first be converted to standard Java KeyStore (JKS) entries
+    that can then be used to configure the credentials in JBoss EAP 6.\n \n "
   ruleID: weblogic-15000
   when:
     builtin.filecontent:
@@ -351,9 +324,7 @@
       pattern: oracle.net.wallet_location
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic InitialContextFactory
-    `weblogic.jndi.WLInitialContextFactory` is an implementation of `InitialContextFactory` used to get object instances from JNDI.. The equivalent functionality needs to be configured on JBoss EAP 6 using `org.jboss.naming.remote.client.InitialContextFactory`. Then the context could be instanticated as follows: `InitialContext ctx = new InitialContext();`.
+  description: WebLogic InitialContextFactory
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -366,11 +337,11 @@
     url: https://access.redhat.com/solutions/161543
   - title: How to configure an EJB client in JBoss EAP 6
     url: https://access.redhat.com/solutions/396853
-  message: '`weblogic.jndi.WLInitialContextFactory` is an implementation of `InitialContextFactory`
-    used to get object instances from JNDI.. The equivalent functionality needs to
-    be configured on JBoss EAP 6 using `org.jboss.naming.remote.client.InitialContextFactory`.
+  message: "\n \n `weblogic.jndi.WLInitialContextFactory` is an implementation of
+    `InitialContextFactory` used to get object instances from JNDI.\n\n The equivalent
+    functionality needs to be configured on JBoss EAP 6 using `org.jboss.naming.remote.client.InitialContextFactory`.
     Then the context could be instanticated as follows: `InitialContext ctx = new
-    InitialContext();`.'
+    InitialContext();`.\n \n "
   ruleID: weblogic-016000
   when:
     builtin.filecontent:
@@ -378,9 +349,7 @@
       pattern: weblogic.jndi.WLInitialContextFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary T3 JNDI binding
-    Weblogic’s implementation of the RMI specification uses a proprietary protocol known as T3. T3S is the version of the protocol over SSL.. `t3://` and `t3s://` URLs are used to configure a JNDI InitialContext within WebLogic.. The equivalent functionality needs to be configured in JBoss EAP 6.. This could be done either by using standard Java EE JNDI names or by using a WebLogic proprietary library if the connectivity to WebLogic server is still required.
+  description: WebLogic proprietary T3 JNDI binding
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -393,12 +362,12 @@
     url: https://docs.oracle.com/cd/E24329_01/web.1211/e24389/rmi_t3.htm#WLRMI143
   - title: Invoking EJBs deployed on WebLogic from EAP6
     url: https://access.redhat.com/solutions/1230143
-  message: Weblogic’s implementation of the RMI specification uses a proprietary protocol
-    known as T3. T3S is the version of the protocol over SSL.. `t3://` and `t3s://`
-    URLs are used to configure a JNDI InitialContext within WebLogic.. The equivalent
-    functionality needs to be configured in JBoss EAP 6.. This could be done either
-    by using standard Java EE JNDI names or by using a WebLogic proprietary library
-    if the connectivity to WebLogic server is still required.
+  message: "\n \n Weblogic’s implementation of the RMI specification uses a proprietary
+    protocol known as T3. T3S is the version of the protocol over SSL.\n `t3://` and
+    `t3s://` URLs are used to configure a JNDI InitialContext within WebLogic.\n\n
+    The equivalent functionality needs to be configured in JBoss EAP 6.\n This could
+    be done either by using standard Java EE JNDI names or by using a WebLogic proprietary
+    library if the connectivity to WebLogic server is still required.\n \n "
   ruleID: weblogic-017000
   when:
     builtin.filecontent:
diff --git a/default/generated/eap6/57-websphere-catchall.windup.yaml b/default/generated/eap6/57-websphere-catchall.windup.yaml
index f18b3ff5..33c16808 100644
--- a/default/generated/eap6/57-websphere-catchall.windup.yaml
+++ b/default/generated/eap6/57-websphere-catchall.windup.yaml
@@ -3,8 +3,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: com.ibm.db2.jcc.(?P<type>[^.]+)
-  description: |
-    IBM DB2 driver type reference
+  description: IBM DB2 driver type reference
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -12,9 +11,9 @@
   - konveyor.io/target=eap7
   - konveyor.io/target=eap
   links: []
-  message: This is a reference to the IBM DB2 driver type (`com.ibm.db2.jcc.{{type}}`).
+  message: "\n This is a reference to the IBM DB2 driver type (`com.ibm.db2.jcc.{{type}}`).
     It probably does not need to be migrated. However the IBM DB2 driver should be
-    configured properly.
+    configured properly.\n "
   ruleID: websphere-catchall-db2-00000
   when:
     java.referenced:
@@ -28,8 +27,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>(com\.)?(websphere|ibm)(\..*)?.)?(?P<type>[^.]+)
-  description: |
-    IBM proprietary type reference
+  description: IBM proprietary type reference
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -38,9 +36,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an IBM proprietary type (`{{package}}.{{type}}`) and needs to be
-    migrated to a compatible API. There is currently no detailed. information about
-    this type.
+  message: "\n This is an IBM proprietary type (`{{package}}.{{type}}`) and needs
+    to be migrated to a compatible API. There is currently no detailed\n information
+    about this type.\n "
   ruleID: websphere-catchall-00000
   when:
     java.referenced:
@@ -54,8 +52,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: ilog.(?P<subpackage>.*.)?(?P<type>[^.]+)
-  description: |
-    IBM ILog proprietary type reference
+  description: IBM ILog proprietary type reference
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -64,9 +61,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: This is an IBM ILog proprietary type (`ilog.{{subpackage}}.{{type}}`) and
-    needs to be migrated to a compatible API. There is currently no detailed. information
-    about this type.
+  message: "\n This is an IBM ILog proprietary type (`ilog.{{subpackage}}.{{type}}`)
+    and needs to be migrated to a compatible API. There is currently no detailed\n
+    information about this type.\n "
   ruleID: websphere-catchall-00001
   when:
     java.referenced:
diff --git a/default/generated/eap6/59-websphere-jms.windup.yaml b/default/generated/eap6/59-websphere-jms.windup.yaml
index 68786f11..f395f5a8 100644
--- a/default/generated/eap6/59-websphere-jms.windup.yaml
+++ b/default/generated/eap6/59-websphere-jms.windup.yaml
@@ -1,14 +1,14 @@
 - customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<type>[^.]+)
   - name: package
     nameOfCaptureGroup: package
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<type>[^.]+)
+  - name: type
+    nameOfCaptureGroup: type
+    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<type>[^.]+)
   description: "IBM JMS Client\nWebSphere MQ client API is used to communicate with
     the MQ server from client-side applications.\n                        For JBoss
     EAP 6, this needs to be replaced with standard Java EE 6 JMS API, or with HornetQ
-    client API.\n                    \n"
+    client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
@@ -44,8 +44,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\.[^.]*)*\.jms.)?(?P<prefix>(Jms|MQeJNDI|MQe|MQ)?)?(?P<type>[^.]*?)?ConnectionFactory
-  description: |
-    IBM {prefix}{type}ConnectionFactory reference
+  description: IBM {prefix}{type}ConnectionFactory reference
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -58,9 +57,9 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  message: 'IBM {{prefix}}{{type}}ConnectionFactory is a proprietary encapsulation
-    of JMS servers to which Connections can be created for. message distribution.
-    This reference should be replaced with the Java EE standard API: `javax.jms.{{type}}ConnectionFactory`.'
+  message: "\n IBM {{prefix}}{{type}}ConnectionFactory is a proprietary encapsulation
+    of JMS servers to which Connections can be created for\n message distribution.
+    This reference should be replaced with the Java EE standard API: `javax.jms.{{type}}ConnectionFactory`.\n "
   ruleID: websphere-jms-01000
   when:
     java.referenced:
@@ -73,8 +72,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?JmsMsg(?P<type>(Producer|Consumer))
-  description: |
-    IBM JMS topic/queue message
+  description: IBM JMS topic/queue message
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -87,17 +85,16 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  message: IBM JMS message `{{package}}.JmsMsg{{type}}` are used for sending/reading
-    messages to/from a topic or queue. This reference should be. replaced with the
-    Java EE standard API `javax.jms.Message{{type}}`.
+  message: "\n IBM JMS message `{{package}}.JmsMsg{{type}}` are used for sending/reading
+    messages to/from a topic or queue. This reference should be\n replaced with the
+    Java EE standard API `javax.jms.Message{{type}}`.\n "
   ruleID: websphere-jms-02000
   when:
     java.referenced:
       pattern: com.ibm.*jms.JmsMsg(Producer|Consumer)
 - category: mandatory
   customVariables: []
-  description: |
-    WebSphere implementation MQe{type}Queue of JMS Queue
+  description: WebSphere implementation MQe{type}Queue of JMS Queue
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -110,8 +107,8 @@
   links:
   - title: Java EE 6 JMS Tutorial
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  message: '`MQe{{type}}Queue` is a WebSphere implementation of a JMS `Queue` and
-    should be migrated to. the Java EE 6 JMS standard interface `javax.jms.Queue`.'
+  message: "\n `MQe{{type}}Queue` is a WebSphere implementation of a JMS `Queue` and
+    should be migrated to\n the Java EE 6 JMS standard interface `javax.jms.Queue`.\n "
   ruleID: websphere-jms-02500
   when:
     java.referenced:
@@ -127,8 +124,7 @@
   - name: package
     nameOfCaptureGroup: package
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: |
-    IBM JMS destination message
+  description: IBM JMS destination message
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -139,26 +135,25 @@
   - jms
   - websphere
   links: []
-  message: JMS `{{package}}.{{prefix}}{{type}}Message` messages represent the actual
-    data passed through JMS destinations. This reference should be. replaced with
-    the Java EE standard API `javax.jms.{{type}}Message`.
+  message: "\n JMS `{{package}}.{{prefix}}{{type}}Message` messages represent the
+    actual data passed through JMS destinations. This reference should be\n replaced
+    with the Java EE standard API `javax.jms.{{type}}Message`.\n "
   ruleID: websphere-jms-03000
   when:
     java.referenced:
       pattern: com.ibm.*jms.(JMS|MQe|MQ)(Text|Stream|Object|Map|Bytes)?Message
 - category: mandatory
   customVariables:
+  - name: package
+    nameOfCaptureGroup: package
+    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
   - name: prefix
     nameOfCaptureGroup: prefix
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
-  description: |
-    IBM JMS interface
+  description: IBM JMS interface
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -169,8 +164,8 @@
   - jms
   - websphere
   links: []
-  message: '{{package}}.{{prefix}}{{type}} is an IBM proprietary interface and needs
-    to be migrated to the Java EE standard API `javax.jms.{{type}}`.'
+  message: "\n {{package}}.{{prefix}}{{type}} is an IBM proprietary interface and
+    needs to be migrated to the Java EE standard API `javax.jms.{{type}}`.\n "
   ruleID: websphere-jms-04000
   when:
     java.referenced:
diff --git a/default/generated/eap6/60-websphere-mq.windup.yaml b/default/generated/eap6/60-websphere-mq.windup.yaml
index 14c22b13..18117419 100644
--- a/default/generated/eap6/60-websphere-mq.windup.yaml
+++ b/default/generated/eap6/60-websphere-mq.windup.yaml
@@ -8,7 +8,7 @@
   description: "IBM MQ client API\nWebSphere MQ client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 6, this needs to be replaced with standard Java EE 6 JMS API, or with
-    HornetQ client API.\n                    \n"
+    HornetQ client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
@@ -36,11 +36,7 @@
   description: "IBM MQ Configuration\nThe WebSphere MQ client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 6, this needs to be replaced with standard Java EE 6 JMS API, or with
-    HornetQ client API.\n                    \n`WMQInitialContextFactory` is an implementation
-    of `InitialContextFactory`. used to get object instances from JNDI. The. equivalent
-    functionality needs to be configured on JBoss EAP 6 using HornetQ.. `InitialContextFactory`
-    is provided. by EAP and you only need to instantiate `InitialContext ctx = new
-    InitialContext();`."
+    HornetQ client API.\n                    "
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -57,10 +53,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Migrate_Your_Application_to_Use_HornetQ_as_the_JMS_Provider
   - title: Java EE 6 JMS Tutorial
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  message: '`WMQInitialContextFactory` is an implementation of `InitialContextFactory`.
-    used to get object instances from JNDI. The. equivalent functionality needs to
-    be configured on JBoss EAP 6 using HornetQ.. `InitialContextFactory` is provided.
-    by EAP and you only need to instantiate `InitialContext ctx = new InitialContext();`.'
+  message: "`WMQInitialContextFactory` is an implementation of `InitialContextFactory`\n
+    used to get object instances from JNDI. The\n equivalent functionality needs to
+    be configured on JBoss EAP 6 using HornetQ.\n `InitialContextFactory` is provided\n
+    by EAP and you only need to instantiate `InitialContext ctx = new InitialContext();`.\n "
   ruleID: websphere-mq-01000
   tag:
   - IBM MQ Configuration
@@ -70,9 +66,7 @@
       pattern: com.ibm.mq.jms.context.WMQInitialContextFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    IBM WebSphere .scp file
-    WebSphere `.scp` files contain scripts for the `jmsadmin` program which is used. to configure the WebSphere MQ destinations. and routing. To configure messaging in JBoss EAP 6 with HornetQ, use either the Management Console or Management CLI with it's. scripting feature.
+  description: IBM WebSphere .scp file
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -89,10 +83,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Configure_Messaging_with_HornetQ2
   - title: Java EE 6 JMS Tutorial
     url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  message: WebSphere `.scp` files contain scripts for the `jmsadmin` program which
-    is used. to configure the WebSphere MQ destinations. and routing. To configure
+  message: "\n WebSphere `.scp` files contain scripts for the `jmsadmin` program which
+    is used\n to configure the WebSphere MQ destinations\n and routing. To configure
     messaging in JBoss EAP 6 with HornetQ, use either the Management Console or Management
-    CLI with it's. scripting feature.
+    CLI with it's\n scripting feature.\n "
   ruleID: websphere-mq-02000
   tag:
   - IBM MQ Configuration
diff --git a/default/generated/eap6/61-websphere-mqe.windup.yaml b/default/generated/eap6/61-websphere-mqe.windup.yaml
index b2334a84..8cf2916a 100644
--- a/default/generated/eap6/61-websphere-mqe.windup.yaml
+++ b/default/generated/eap6/61-websphere-mqe.windup.yaml
@@ -8,7 +8,7 @@
   description: "IBM MQe client API\nWebSphere MQe client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 6, this needs to be replaced with standard Java EE 6 JMS API, or with
-    HornetQ client API.\n                    \n"
+    HornetQ client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
@@ -33,8 +33,7 @@
       pattern: com.ibm.*(mqe)*
 - category: mandatory
   customVariables: []
-  description: |
-    IBM MQe com.ibm.mqe.adapters.MQe{type}Adapter
+  description: IBM MQe com.ibm.mqe.adapters.MQe{type}Adapter
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -51,8 +50,8 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/Deploy_the_WebSphere_MQ_Resource_Adapter.html
   - title: MQe Adapter Javadoc
     url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/com/ibm/mqe/adapters/package-summary.html
-  message: IBM MQe {{type}} adapter provides plug-in communications adapters or data
-    storage adapters for queue managers. These can. be deployed to JBoss EAP.
+  message: "\n IBM MQe {{type}} adapter provides plug-in communications adapters or
+    data storage adapters for queue managers. These can\n be deployed to JBoss EAP.\n "
   ruleID: websphere-mqe-01000
   when:
     java.referenced:
@@ -60,8 +59,7 @@
       pattern: com.ibm.mqe.adapters.MQe{type}Adapter
 - category: mandatory
   customVariables: []
-  description: |
-    IBM MQe com.ibm.mqe.administration.MQe{type}AdminMsg
+  description: IBM MQe com.ibm.mqe.administration.MQe{type}AdminMsg
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -77,9 +75,9 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#Configure_the_JMS_Server1
   - title: IBM MQe Admin API Javadoc
     url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/com/ibm/mqe/administration/package-summary.html
-  message: IBM MQe {{type}} administration API provides classes used to administer
-    and monitor a WebSphere MQ Everyplace queue manager. In. JBoss EAP 6, the JMS
-    destinations can be configured with the JBoss Admin CLI.
+  message: "IBM MQe {{type}} administration API provides classes used to administer
+    and monitor a WebSphere MQ Everyplace queue manager. In\n JBoss EAP 6, the JMS
+    destinations can be configured with the JBoss Admin CLI.\n "
   ruleID: websphere-mqe-02000
   when:
     java.referenced:
@@ -87,9 +85,7 @@
       pattern: com.ibm.mqe.administration.MQe{type}AdminMsg
 - category: mandatory
   customVariables: []
-  description: |-
-    IBM MQe com.ibm.mqe.jms.MQeJMSAuthenticator
-    `MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication API.. To migrate to JBoss EAP 6, replace with Java EE 6 JAAS for JMS authentication.
+  description: IBM MQe com.ibm.mqe.jms.MQeJMSAuthenticator
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -103,17 +99,15 @@
   links:
   - title: Configure JBoss EAP Security Domain
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Development_Guide/index.html#About_Security_Domains
-  message: '`MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication API..
-    To migrate to JBoss EAP 6, replace with Java EE 6 JAAS for JMS authentication.'
+  message: "\n `MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication
+    API.\n To migrate to JBoss EAP 6, replace with Java EE 6 JAAS for JMS authentication.\n "
   ruleID: websphere-mqe-03000
   when:
     java.referenced:
       pattern: com.ibm.mqe.jms.MQeJMSAuthenticator
 - category: optional
   customVariables: []
-  description: |-
-    IBM MQe com.ibm.mqe.jms.MQeJMSMsgFieldNames
-    IBM MQe constants are used to name fields when a JMS message is mapped to an `MQeMsgObject`. These are provided to. enable WebSphere MQ Everyplace applications to interpret messages sent by JMS or to construct messages that a JMS application. will understand.. These settings can be discarded when migrating to JBoss EAP 6 with HornetQ.
+  description: IBM MQe com.ibm.mqe.jms.MQeJMSMsgFieldNames
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -125,11 +119,11 @@
   - websphere
   - messaging
   links: []
-  message: IBM MQe constants are used to name fields when a JMS message is mapped
-    to an `MQeMsgObject`. These are provided to. enable WebSphere MQ Everyplace applications
-    to interpret messages sent by JMS or to construct messages that a JMS application.
-    will understand.. These settings can be discarded when migrating to JBoss EAP
-    6 with HornetQ.
+  message: "\n IBM MQe constants are used to name fields when a JMS message is mapped
+    to an `MQeMsgObject`. These are provided to\n enable WebSphere MQ Everyplace applications
+    to interpret messages sent by JMS or to construct messages that a JMS application\n
+    will understand.\n\n These settings can be discarded when migrating to JBoss EAP
+    6 with HornetQ.\n "
   ruleID: websphere-mqe-04000
   when:
     java.referenced:
diff --git a/default/generated/eap6/62-websphere-other.windup.yaml b/default/generated/eap6/62-websphere-other.windup.yaml
index 490c6aef..33313049 100644
--- a/default/generated/eap6/62-websphere-other.windup.yaml
+++ b/default/generated/eap6/62-websphere-other.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere Work Manager
-    WebSphere Asynchronous Work is a Work Manager, whose purpose is to allow the user utilizing threads while letting the container manage them.. For migration to JBoss EAP 6, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/Configure_the_Java_Connector_Architecture_JCA_Subsystem.html).
+  description: WebSphere Work Manager
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -19,9 +17,10 @@
     url: http://www.javaworld.com/article/2077671/build-ci-sdlc/the-wise-work-manager-for-context-based-scoping.html
   - title: 'JSR 237: Work Manager for Application Servers'
     url: https://jcp.org/en/jsr/detail?id=237
-  message: WebSphere Asynchronous Work is a Work Manager, whose purpose is to allow
-    the user utilizing threads while letting the container manage them.. For migration
-    to JBoss EAP 6, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/Configure_the_Java_Connector_Architecture_JCA_Subsystem.html).
+  message: "\n \n WebSphere Asynchronous Work is a Work Manager, whose purpose is
+    to allow the user utilizing threads while letting the container manage them.\n\n
+    For migration to JBoss EAP 6, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Administration_and_Configuration_Guide/Configure_the_Java_Connector_Architecture_JCA_Subsystem.html).\n
+    \n "
   ruleID: websphere-other-01000
   when:
     java.referenced:
@@ -29,9 +28,7 @@
       pattern: com.ibm.websphere.asynchbeans.Work
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere Startup Service
-    WebSphere Startup Service serves as a callback to be invoked when the server or application starts.. When migrating to JBoss EAP 6, this has to be replaced with standard EJB 3.1 Startup Bean, using `@Startup @Singleton` class and `@PostConstruct` method.
+  description: WebSphere Startup Service
   effort: 4
   labels:
   - konveyor.io/source=websphere
@@ -46,10 +43,10 @@
     url: http://docs.oracle.com/javaee/6/api/javax/ejb/Singleton.html
   - title: EJB 3.1 Startup Bean
     url: http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html
-  message: WebSphere Startup Service serves as a callback to be invoked when the server
-    or application starts.. When migrating to JBoss EAP 6, this has to be replaced
-    with standard EJB 3.1 Startup Bean, using `@Startup @Singleton` class and `@PostConstruct`
-    method.
+  message: "\n \n WebSphere Startup Service serves as a callback to be invoked when
+    the server or application starts.\n\n When migrating to JBoss EAP 6, this has
+    to be replaced with standard EJB 3.1 Startup Bean, using `@Startup @Singleton`
+    class and `@PostConstruct` method.\n \n "
   ruleID: websphere-other-02000
   when:
     java.referenced:
diff --git a/default/generated/eap6/63-websphere-xml.windup.yaml b/default/generated/eap6/63-websphere-xml.windup.yaml
index 4c3c3fa9..40fc4596 100644
--- a/default/generated/eap6/63-websphere-xml.windup.yaml
+++ b/default/generated/eap6/63-websphere-xml.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     IBM Process Server Rules 6.0
     WBI is a WebSphere proprietary business integration solution. This needs to be migrated to JBoss Drools or JBPM/BRMS.
   labels:
@@ -24,7 +24,6 @@
   description: |-
     WebSphere EAR Application Binding
     This WebSphere application binding is an IBM proprietary method for binding user roles for authorization and needs to be migrated to JAAS or KeyCloak.
-    This file contains a specific IBM WebSphere Application binding configuration.. To migrate to EAP 6.x, configure EAP 6.x accordingly using the CLI interface or web console.
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -37,9 +36,9 @@
     url: https://access.redhat.com/articles/1330673
   - title: Enabling Role-Based Access Control in JBoss EAP 6
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Security_Guide/Enabling_Role-Based_Access_Control.html
-  message: This file contains a specific IBM WebSphere Application binding configuration..
-    To migrate to EAP 6.x, configure EAP 6.x accordingly using the CLI interface or
-    web console.
+  message: "\n \n This file contains a specific IBM WebSphere Application binding
+    configuration.\n\n To migrate to EAP 6.x, configure EAP 6.x accordingly using
+    the CLI interface or web console.\n \n "
   ruleID: websphere-xml-02000
   tag:
   - security
@@ -52,9 +51,7 @@
       xpath: /applicationbnd:ApplicationBinding
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere JSP engine configuration (ibm-web-ext)
-    This file contains WebSphere proprietary JSP engine configuration.. To migrate to EAP 6, configure it accordingly using the CLI or the web console.
+  description: WebSphere JSP engine configuration (ibm-web-ext)
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -62,8 +59,9 @@
   - konveyor.io/target=eap
   - websphere
   links: []
-  message: This file contains WebSphere proprietary JSP engine configuration.. To
-    migrate to EAP 6, configure it accordingly using the CLI or the web console.
+  message: "\n \n This file contains WebSphere proprietary JSP engine configuration.\n\n
+    To migrate to EAP 6, configure it accordingly using the CLI or the web console.\n
+    \n "
   ruleID: websphere-xml-03500
   when:
     or:
@@ -83,9 +81,7 @@
         pattern: ibm-web-ext\.xml|xmi
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere web application binding (ibm-web-bnd)
-    This file contains WebSphere proprietary binding configuration.. To migrate to EAP 6.x, configure EAP 6.x accordingly using the CLI interface or web console.
+  description: WebSphere web application binding (ibm-web-bnd)
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -98,8 +94,9 @@
   - title: Migrate IBM WebSphere Application Server Web Application Extension or Binding
       Files
     url: https://access.redhat.com/articles/1330673
-  message: This file contains WebSphere proprietary binding configuration.. To migrate
-    to EAP 6.x, configure EAP 6.x accordingly using the CLI interface or web console.
+  message: "\n \n This file contains WebSphere proprietary binding configuration.\n\n
+    To migrate to EAP 6.x, configure EAP 6.x accordingly using the CLI interface or
+    web console.\n \n "
   ruleID: websphere-xml-06000
   when:
     or:
@@ -117,7 +114,7 @@
     extension that needs to be migrated to JBossWS.\n                    JBossWS implements
     the latest JAX-WS specification, which users can reference for any vendor-agnostic
     web service usage need.\n                    You can migrate deployment descriptors
-    following the links below.\n                    \n                    \n"
+    following the links below.\n                    \n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
@@ -142,7 +139,7 @@
     binding that needs to be migrated to JBossWS.\n                    JBossWS implements
     the latest JAX-WS specification, which users can reference for any vendor-agnostic
     web service usage need.\n                    You can get more information about
-    developing web services in the links below.\n                    \n                    \n"
+    developing web services in the links below.\n                    \n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
@@ -168,7 +165,7 @@
     XML schema documentation can be found within the WebSphere Application Server
     7.0 directory under `/web/configDocs/packages/appdeployment/Deployment.html`.\n
     \                       It should be safe to delete this file, unless it was created
-    manually.\n                    \n"
+    manually.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap6
diff --git a/default/generated/eap6/ruleset.yaml b/default/generated/eap6/ruleset.yaml
index d61b86cd..47829f37 100644
--- a/default/generated/eap6/ruleset.yaml
+++ b/default/generated/eap6/ruleset.yaml
@@ -1,3 +1,2 @@
-name: eap6/resin
-description: This ruleset provides analysis of Resin proprietary xml files that may
-  require individual attention when migrating to JBoss EAP 6+.
+name: eap6/java-ee
+description: This ruleset provides generic migration knowledge for the Java EE specification
diff --git a/default/generated/eap7/100-websphere-jms.windup.yaml b/default/generated/eap7/100-websphere-jms.windup.yaml
index 8124014d..b29d5135 100644
--- a/default/generated/eap7/100-websphere-jms.windup.yaml
+++ b/default/generated/eap7/100-websphere-jms.windup.yaml
@@ -8,7 +8,7 @@
   description: "IBM JMS Client\nWebSphere MQ client API is used to communicate with
     the MQ server from client-side applications.\n                        For JBoss
     EAP 7, this needs to be replaced with standard Java EE 7 JMS API, or with ActiveMQ
-    Artemis client API.\n                    \n"
+    Artemis client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7+
@@ -35,17 +35,16 @@
       pattern: com.ibm.*jms*
 - category: mandatory
   customVariables:
+  - name: package
+    nameOfCaptureGroup: package
+    pattern: (?P<package>com.ibm(\.[^.]*)*\.jms.)?(?P<prefix>(Jms|MQeJNDI|MQe|MQ)?)?(?P<type>[^.]*?)?ConnectionFactory
   - name: prefix
     nameOfCaptureGroup: prefix
     pattern: (?P<package>com.ibm(\.[^.]*)*\.jms.)?(?P<prefix>(Jms|MQeJNDI|MQe|MQ)?)?(?P<type>[^.]*?)?ConnectionFactory
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\.[^.]*)*\.jms.)?(?P<prefix>(Jms|MQeJNDI|MQe|MQ)?)?(?P<type>[^.]*?)?ConnectionFactory
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\.[^.]*)*\.jms.)?(?P<prefix>(Jms|MQeJNDI|MQe|MQ)?)?(?P<type>[^.]*?)?ConnectionFactory
-  description: |
-    IBM {prefix}{type}ConnectionFactory reference
+  description: IBM {prefix}{type}ConnectionFactory reference
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -58,9 +57,9 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  message: 'IBM {{prefix}}{{type}}ConnectionFactory is a proprietary encapsulation
-    of JMS servers to which Connections can be created for. message distribution.
-    This reference should be replaced with the Java EE standard API: `javax.jms.{{type}}ConnectionFactory`.'
+  message: "\n IBM {{prefix}}{{type}}ConnectionFactory is a proprietary encapsulation
+    of JMS servers to which Connections can be created for\n message distribution.
+    This reference should be replaced with the Java EE standard API: `javax.jms.{{type}}ConnectionFactory`.\n "
   ruleID: websphere-jms-eap7-01000
   when:
     java.referenced:
@@ -73,8 +72,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?JmsMsg(?P<type>(Producer|Consumer))
-  description: |
-    IBM JMS topic/queue message
+  description: IBM JMS topic/queue message
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -87,16 +85,16 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  message: IBM JMS API {{type}}s are used for sending/reading messages to/from a topic
-    or queue. This reference should be. replaced with the Java EE standard API `javax.jms.Message{{type}}`.
+  message: "\n IBM JMS API {{type}}s are used for sending/reading messages to/from
+    a topic or queue. This reference should be\n replaced with the Java EE standard
+    API `javax.jms.Message{{type}}`.\n "
   ruleID: websphere-jms-eap7-02000
   when:
     java.referenced:
       pattern: com.ibm.*jms.JmsMsg(Producer|Consumer)
 - category: mandatory
   customVariables: []
-  description: |
-    WebSphere implementation MQe{type}Queue of JMS Queue
+  description: WebSphere implementation MQe{type}Queue of JMS Queue
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -109,25 +107,24 @@
   links:
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  message: '`MQe{{type}}Queue` is a WebSphere implementation of a JMS `Queue` and
-    should be migrated to. the Java EE 6 JMS standard interface `javax.jms.Queue`.'
+  message: "\n `MQe{{type}}Queue` is a WebSphere implementation of a JMS `Queue` and
+    should be migrated to\n the Java EE 6 JMS standard interface `javax.jms.Queue`.\n "
   ruleID: websphere-jms-eap7-02500
   when:
     java.referenced:
       pattern: com.ibm.mqe.jms.{type}Queue
 - category: mandatory
   customVariables:
+  - name: package
+    nameOfCaptureGroup: package
+    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
   - name: type
     nameOfCaptureGroup: type
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
   - name: prefix
     nameOfCaptureGroup: prefix
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: |
-    IBM JMS destination message
+  description: IBM JMS destination message
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -138,26 +135,25 @@
   - jms
   - websphere
   links: []
-  message: JMS `{{package}}.{{prefix}}{{type}}Message` messages represent the actual
-    data passed through JMS destinations. This reference should be. replaced with
-    the Java EE standard API `javax.jms.{{type}}Message`.
+  message: "\n JMS `{{package}}.{{prefix}}{{type}}Message` messages represent the
+    actual data passed through JMS destinations. This reference should be\n replaced
+    with the Java EE standard API `javax.jms.{{type}}Message`.\n "
   ruleID: websphere-jms-eap7-03000
   when:
     java.referenced:
       pattern: com.ibm.*jms.(JMS|MQe|MQ)(Text|Stream|Object|Map|Bytes)?Message
 - category: mandatory
   customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
   - name: package
     nameOfCaptureGroup: package
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
   - name: prefix
     nameOfCaptureGroup: prefix
     pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
-  description: |
-    IBM JMS interface
+  - name: type
+    nameOfCaptureGroup: type
+    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(Jms|MQe|MQ))?(?P<type>[^.]+)
+  description: IBM JMS interface
   effort: 1
   labels:
   - konveyor.io/source=websphere
diff --git a/default/generated/eap7/101-websphere-mq.windup.yaml b/default/generated/eap7/101-websphere-mq.windup.yaml
index 5a0b1f19..fb8eea2d 100644
--- a/default/generated/eap7/101-websphere-mq.windup.yaml
+++ b/default/generated/eap7/101-websphere-mq.windup.yaml
@@ -8,7 +8,7 @@
   description: "IBM MQ client API\nWebSphere MQ client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 7, this needs to be replaced with standard Java EE 6 JMS API, or with
-    ActiveMQ Artemis client API.\n                    \n"
+    ActiveMQ Artemis client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7+
@@ -37,11 +37,7 @@
   description: "IBM MQ Configuration\nThe WebSphere MQ client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 7, this needs to be replaced with standard Java EE 7 JMS API, or with
-    ActiveMQ Artemis client API.\n                    \n`WMQInitialContextFactory`
-    is an implementation of `InitialContextFactory`. used to get object instances
-    from JNDI. The. equivalent functionality needs to be configured on JBoss EAP 7
-    using ActiveMQ Artemis.. `InitialContextFactory` is provided. by EAP and you only
-    need to instantiate `InitialContext ctx = new InitialContext();`."
+    ActiveMQ Artemis client API.\n                    "
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -58,11 +54,11 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuring_messaging/#the_integrated_activemq_artemis_messaging_broker
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  message: '`WMQInitialContextFactory` is an implementation of `InitialContextFactory`.
-    used to get object instances from JNDI. The. equivalent functionality needs to
-    be configured on JBoss EAP 7 using ActiveMQ Artemis.. `InitialContextFactory`
-    is provided. by EAP and you only need to instantiate `InitialContext ctx = new
-    InitialContext();`.'
+  message: "`WMQInitialContextFactory` is an implementation of `InitialContextFactory`\n
+    used to get object instances from JNDI. The\n equivalent functionality needs to
+    be configured on JBoss EAP 7 using ActiveMQ Artemis.\n `InitialContextFactory`
+    is provided\n by EAP and you only need to instantiate `InitialContext ctx = new
+    InitialContext();`.\n "
   ruleID: websphere-mq-eap7-01000
   tag:
   - IBM MQ Configuration
@@ -72,9 +68,7 @@
       pattern: com.ibm.mq.jms.context.WMQInitialContextFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    IBM WebSphere .scp file
-    WebSphere `.scp` files contain scripts for the `jmsadmin` program which is used. to configure the WebSphere MQ destinations. and routing. To configure messaging in JBoss EAP 7 with ActiveMQ Artemis, use either the Management Console or Management CLI with it's. scripting feature.
+  description: IBM WebSphere .scp file
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -91,10 +85,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuring_messaging/#basic_configuration
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  message: WebSphere `.scp` files contain scripts for the `jmsadmin` program which
-    is used. to configure the WebSphere MQ destinations. and routing. To configure
+  message: "\n WebSphere `.scp` files contain scripts for the `jmsadmin` program which
+    is used\n to configure the WebSphere MQ destinations\n and routing. To configure
     messaging in JBoss EAP 7 with ActiveMQ Artemis, use either the Management Console
-    or Management CLI with it's. scripting feature.
+    or Management CLI with it's\n scripting feature.\n "
   ruleID: websphere-mq-eap7-02000
   tag:
   - IBM MQ Configuration
diff --git a/default/generated/eap7/102-websphere-mqe.windup.yaml b/default/generated/eap7/102-websphere-mqe.windup.yaml
index 8e13ea04..3c929630 100644
--- a/default/generated/eap7/102-websphere-mqe.windup.yaml
+++ b/default/generated/eap7/102-websphere-mqe.windup.yaml
@@ -8,7 +8,7 @@
   description: "IBM MQe client API\nWebSphere MQe client API is used to communicate
     with the MQ server from client-side applications.\n                        For
     JBoss EAP 7, this needs to be replaced with standard Java EE 6 JMS API, or with
-    ActiveMQ Artemis client API.\n                    \n"
+    ActiveMQ Artemis client API.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
@@ -34,8 +34,7 @@
       pattern: com.ibm.*(mqe)*
 - category: mandatory
   customVariables: []
-  description: |
-    IBM MQe com.ibm.mqe.adapters.MQe{type}Adapter
+  description: IBM MQe com.ibm.mqe.adapters.MQe{type}Adapter
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -51,8 +50,8 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuring_messaging/#deploy_the_websphere_mq_resource_adapter
   - title: MQe Adapter Javadoc
     url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/com/ibm/mqe/adapters/package-summary.html
-  message: IBM MQe {{type}} adapter provides plug-in communications adapters or data
-    storage adapters for queue managers. These can. be deployed to JBoss EAP.
+  message: "\n IBM MQe {{type}} adapter provides plug-in communications adapters or
+    data storage adapters for queue managers. These can\n be deployed to JBoss EAP.\n "
   ruleID: websphere-mqe-eap7-01000
   when:
     java.referenced:
@@ -60,8 +59,7 @@
       pattern: com.ibm.mqe.adapters.MQe{type}Adapter
 - category: mandatory
   customVariables: []
-  description: |
-    IBM MQe com.ibm.mqe.administration.MQe{type}AdminMsg
+  description: IBM MQe com.ibm.mqe.administration.MQe{type}AdminMsg
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -77,9 +75,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuring_messaging/#configure_destinations_artemis
   - title: IBM MQe Admin API Javadoc
     url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/com/ibm/mqe/administration/package-summary.html
-  message: IBM MQe {{type}} administration API provides classes used to administer
-    and monitor a WebSphere MQ Everyplace queue manager. In. JBoss EAP 7, the JMS
-    destinations can be configured with the JBoss Admin CLI.
+  message: "IBM MQe {{type}} administration API provides classes used to administer
+    and monitor a WebSphere MQ Everyplace queue manager. In\n JBoss EAP 7, the JMS
+    destinations can be configured with the JBoss Admin CLI.\n "
   ruleID: websphere-mqe-eap7-02000
   when:
     java.referenced:
@@ -87,9 +85,7 @@
       pattern: com.ibm.mqe.administration.MQe{type}AdminMsg
 - category: mandatory
   customVariables: []
-  description: |-
-    IBM MQe com.ibm.mqe.jms.MQeJMSAuthenticator
-    `MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication API.. To migrate to JBoss EAP 7, replace with Java EE 6 JAAS for JMS authentication.
+  description: IBM MQe com.ibm.mqe.jms.MQeJMSAuthenticator
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -103,17 +99,15 @@
   links:
   - title: 'JBoss EAP 7 Configuring Messaging: Configuring Security'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuring_messaging/#configuring_messaging_security
-  message: '`MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication API..
-    To migrate to JBoss EAP 7, replace with Java EE 6 JAAS for JMS authentication.'
+  message: "\n `MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication
+    API.\n To migrate to JBoss EAP 7, replace with Java EE 6 JAAS for JMS authentication.\n "
   ruleID: websphere-mqe-eap7-03000
   when:
     java.referenced:
       pattern: com.ibm.mqe.jms.MQeJMSAuthenticator
 - category: optional
   customVariables: []
-  description: |-
-    IBM MQe com.ibm.mqe.jms.MQeJMSMsgFieldNames
-    IBM MQe constants are used to name fields when a JMS message is mapped to an `MQeMsgObject`. These are provided to. enable WebSphere MQ Everyplace applications to interpret messages sent by JMS or to construct messages that a JMS application. will understand.. These settings can be discarded when migrating to JBoss EAP 7 with ActiveMQ Artemis.
+  description: IBM MQe com.ibm.mqe.jms.MQeJMSMsgFieldNames
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -125,11 +119,11 @@
   - messaging
   - websphere
   links: []
-  message: IBM MQe constants are used to name fields when a JMS message is mapped
-    to an `MQeMsgObject`. These are provided to. enable WebSphere MQ Everyplace applications
-    to interpret messages sent by JMS or to construct messages that a JMS application.
-    will understand.. These settings can be discarded when migrating to JBoss EAP
-    7 with ActiveMQ Artemis.
+  message: "\n IBM MQe constants are used to name fields when a JMS message is mapped
+    to an `MQeMsgObject`. These are provided to\n enable WebSphere MQ Everyplace applications
+    to interpret messages sent by JMS or to construct messages that a JMS application\n
+    will understand.\n\n These settings can be discarded when migrating to JBoss EAP
+    7 with ActiveMQ Artemis.\n "
   ruleID: websphere-mqe-eap7-04000
   when:
     java.referenced:
diff --git a/default/generated/eap7/103-websphere-other.windup.yaml b/default/generated/eap7/103-websphere-other.windup.yaml
index 25737433..06ea9660 100644
--- a/default/generated/eap7/103-websphere-other.windup.yaml
+++ b/default/generated/eap7/103-websphere-other.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere Work Manager
-    WebSphere Asynchronous Work is a Work Manager, whose purpose is to allow the user utilizing threads while letting the container manage them.. For migration to JBoss EAP 7, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuration_guide/#jca_management).
+  description: WebSphere Work Manager
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -19,9 +17,10 @@
     url: http://www.javaworld.com/article/2077671/build-ci-sdlc/the-wise-work-manager-for-context-based-scoping.html
   - title: 'JSR 237: Work Manager for Application Servers'
     url: https://jcp.org/en/jsr/detail?id=237
-  message: WebSphere Asynchronous Work is a Work Manager, whose purpose is to allow
-    the user utilizing threads while letting the container manage them.. For migration
-    to JBoss EAP 7, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuration_guide/#jca_management).
+  message: "\n \n WebSphere Asynchronous Work is a Work Manager, whose purpose is
+    to allow the user utilizing threads while letting the container manage them.\n\n
+    For migration to JBoss EAP 7, [replace with JCA Work Manager](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/configuration_guide/#jca_management).\n
+    \n "
   ruleID: websphere-other-eap7-01000
   when:
     java.referenced:
@@ -29,9 +28,7 @@
       pattern: com.ibm.websphere.asynchbeans.Work
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere Startup Service
-    WebSphere Startup Service serves as a callback to be invoked when the server or application starts.. When migrating to JBoss EAP 7, this has to be replaced with standard EJB 3.1 Startup Bean, using `@Startup @Singleton` class and `@PostConstruct` method.
+  description: WebSphere Startup Service
   effort: 4
   labels:
   - konveyor.io/source=websphere
@@ -46,10 +43,10 @@
     url: http://docs.oracle.com/javaee/7/api/javax/ejb/Singleton.html
   - title: EJB 3.1 Startup Bean
     url: http://docs.oracle.com/javaee/7/api/javax/ejb/Startup.html
-  message: WebSphere Startup Service serves as a callback to be invoked when the server
-    or application starts.. When migrating to JBoss EAP 7, this has to be replaced
-    with standard EJB 3.1 Startup Bean, using `@Startup @Singleton` class and `@PostConstruct`
-    method.
+  message: "\n \n WebSphere Startup Service serves as a callback to be invoked when
+    the server or application starts.\n\n When migrating to JBoss EAP 7, this has
+    to be replaced with standard EJB 3.1 Startup Bean, using `@Startup @Singleton`
+    class and `@PostConstruct` method.\n \n "
   ruleID: websphere-other-eap7-02000
   when:
     java.referenced:
diff --git a/default/generated/eap7/104-websphere-xml.windup.yaml b/default/generated/eap7/104-websphere-xml.windup.yaml
index 3c470cfb..732751eb 100644
--- a/default/generated/eap7/104-websphere-xml.windup.yaml
+++ b/default/generated/eap7/104-websphere-xml.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     IBM Process Server Rules 6.0
     WBI is a WebSphere proprietary business integration solution. This needs to be migrated to JBoss Drools or JBPM/BRMS.
   labels:
@@ -25,7 +25,6 @@
   description: |-
     WebSphere EAR Application Binding
     This WebSphere application binding is an IBM proprietary method for binding user roles for authorization and needs to be migrated to JAAS or KeyCloak.
-    This file contains a specific IBM WebSphere Application binding configuration.. To migrate to EAP 7+, configure EAP 7+ accordingly using the CLI interface or web console.
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -39,9 +38,9 @@
     url: https://access.redhat.com/articles/1330673
   - title: Enabling Role-Based Access Control in JBoss EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/how_to_configure_server_security/#enabling_role_based_access_control
-  message: This file contains a specific IBM WebSphere Application binding configuration..
-    To migrate to EAP 7+, configure EAP 7+ accordingly using the CLI interface or
-    web console.
+  message: "\n \n This file contains a specific IBM WebSphere Application binding
+    configuration.\n\n To migrate to EAP 7+, configure EAP 7+ accordingly using the
+    CLI interface or web console.\n \n "
   ruleID: eap7-websphere-xml-02000
   tag:
   - security
@@ -54,9 +53,7 @@
       xpath: /applicationbnd:ApplicationBinding
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere JSP engine configuration (ibm-web-ext)
-    This file contains WebSphere proprietary JSP engine configuration.. To migrate to EAP 7, configure it accordingly using the CLI or the web console.
+  description: WebSphere JSP engine configuration (ibm-web-ext)
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -65,8 +62,9 @@
   - websphere
   - configuration
   links: []
-  message: This file contains WebSphere proprietary JSP engine configuration.. To
-    migrate to EAP 7, configure it accordingly using the CLI or the web console.
+  message: "\n \n This file contains WebSphere proprietary JSP engine configuration.\n\n
+    To migrate to EAP 7, configure it accordingly using the CLI or the web console.\n
+    \n "
   ruleID: eap7-websphere-xml-03500
   when:
     or:
@@ -86,9 +84,7 @@
         pattern: ibm-web-ext\.xml|xmi
 - category: mandatory
   customVariables: []
-  description: |-
-    WebSphere web application binding (ibm-web-bnd)
-    This file contains WebSphere proprietary binding configuration.. To migrate to EAP 7+, configure EAP 7+ accordingly using the CLI interface or web console.
+  description: WebSphere web application binding (ibm-web-bnd)
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -104,8 +100,9 @@
   - title: Migrate IBM WebSphere Application Server Web Application Extension or Binding
       Files
     url: https://access.redhat.com/articles/1330673
-  message: This file contains WebSphere proprietary binding configuration.. To migrate
-    to EAP 7+, configure EAP 7+ accordingly using the CLI interface or web console.
+  message: "\n \n This file contains WebSphere proprietary binding configuration.\n\n
+    To migrate to EAP 7+, configure EAP 7+ accordingly using the CLI interface or
+    web console.\n \n "
   ruleID: eap7-websphere-xml-06000
   when:
     or:
@@ -123,7 +120,7 @@
     extension that needs to be migrated to JBossWS.\n                    JBossWS implements
     the latest JAX-WS specification, which users can reference for any vendor-agnostic
     web service usage need.\n                    You can migrate deployment descriptors
-    following the links below.\n                    \n                    \n"
+    following the links below.\n                    \n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
@@ -151,7 +148,7 @@
     binding that needs to be migrated to JBossWS.\n                    JBossWS implements
     the latest JAX-WS specification, which users can reference for any vendor-agnostic
     web service usage need.\n                    You can get more information about
-    developing web services in the links below.\n                    \n                    \n"
+    developing web services in the links below.\n                    \n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
@@ -178,7 +175,7 @@
     XML schema documentation can be found within the WebSphere Application Server
     7.0 directory under `/web/configDocs/packages/appdeployment/Deployment.html`.\n
     \                       It should be safe to delete this file, unless it was created
-    manually.\n                    \n"
+    manually.\n                    "
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/64-jboss-eap4and5to6and7-java.windup.yaml b/default/generated/eap7/64-jboss-eap4and5to6and7-java.windup.yaml
index 026aa9c5..823da82f 100644
--- a/default/generated/eap7/64-jboss-eap4and5to6and7-java.windup.yaml
+++ b/default/generated/eap7/64-jboss-eap4and5to6and7-java.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace org.jboss.security.annotation.SecurityDomain annotation
-    Annotation `org.jboss.security.annotation.SecurityDomain` should be replaced by `org.jboss.ejb3.annotation.SecurityDomain`.
+  description: Replace org.jboss.security.annotation.SecurityDomain annotation
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -16,8 +14,8 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#Use_a_Security_Domain_in_Your_Application
   - title: How to configure EJB3 Domain Security in JBoss EAP 6
     url: https://access.redhat.com/solutions/236113
-  message: Annotation `org.jboss.security.annotation.SecurityDomain` should be replaced
-    by `org.jboss.ejb3.annotation.SecurityDomain`.
+  message: "\n \n Annotation `org.jboss.security.annotation.SecurityDomain` should
+    be replaced by `org.jboss.ejb3.annotation.SecurityDomain`.\n \n "
   ruleID: jboss-eap4and5to6and7-java-01000
   when:
     java.referenced:
@@ -25,9 +23,7 @@
       pattern: org.jboss.security.annotation.SecurityDomain
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace org.jboss.mx.util.MBeanProxyExt class
-    In JBoss EAP 4 and 5 a lot of the mbean-related components were JBoss specific.. In JBoss EAP 6+ these mbean-related components (i.e., `org.jboss.mx.*`) have been removed in an effort to make the container more Java EE 6 specification compliant.. One will need to find an equivalent replacement: for class `MBeanProxyExt.create()` one can use `JMX.newMBeanProxy()`.
+  description: Replace org.jboss.mx.util.MBeanProxyExt class
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -41,11 +37,11 @@
     url: https://access.redhat.com/solutions/410503
   - title: Java EE 6 - Class JMX
     url: https://docs.oracle.com/javase/6/docs/api/javax/management/JMX.html
-  message: 'In JBoss EAP 4 and 5 a lot of the mbean-related components were JBoss
-    specific.. In JBoss EAP 6+ these mbean-related components (i.e., `org.jboss.mx.*`)
+  message: "\n \n In JBoss EAP 4 and 5 a lot of the mbean-related components were
+    JBoss specific. \n In JBoss EAP 6+ these mbean-related components (i.e., `org.jboss.mx.*`)
     have been removed in an effort to make the container more Java EE 6 specification
-    compliant.. One will need to find an equivalent replacement: for class `MBeanProxyExt.create()`
-    one can use `JMX.newMBeanProxy()`.'
+    compliant. \n One will need to find an equivalent replacement: for class `MBeanProxyExt.create()`
+    one can use `JMX.newMBeanProxy()`.\n \n "
   ruleID: jboss-eap4and5to6and7-java-02000
   when:
     java.referenced:
@@ -56,9 +52,7 @@
   - name: classes
     nameOfCaptureGroup: classes
     pattern: org.jboss.system.(?P<classes>(ServiceMBean|ServiceMBeanSupport))
-  description: |-
-    Replace ServiceMBean and ServiceMBeanSupport
-    JMX / MBeans is still fully supported as it is in the JDK specification.. If your MBeans were extending the old JBoss EAP MBean support classes such as `org.jboss.system.ServiceMBean` and `org.jboss.system.ServiceMBeanSupport`, these do not exist in JBoss EAP 6+.. These classes were hooked into the kernel in previous versions of JBoss EAP where everything was basically turned into an MBean.
+  description: Replace ServiceMBean and ServiceMBeanSupport
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -70,11 +64,12 @@
   links:
   - title: How to implement MBeans in JBoss EAP 6
     url: https://access.redhat.com/solutions/121823
-  message: JMX / MBeans is still fully supported as it is in the JDK specification..
-    If your MBeans were extending the old JBoss EAP MBean support classes such as
-    `org.jboss.system.ServiceMBean` and `org.jboss.system.ServiceMBeanSupport`, these
-    do not exist in JBoss EAP 6+.. These classes were hooked into the kernel in previous
-    versions of JBoss EAP where everything was basically turned into an MBean.
+  message: "\n \n JMX / MBeans is still fully supported as it is in the JDK specification.
+    \n If your MBeans were extending the old JBoss EAP MBean support classes such
+    as `org.jboss.system.ServiceMBean` and `org.jboss.system.ServiceMBeanSupport`,
+    these do not exist in JBoss EAP 6+. \n These classes were hooked into the kernel
+    in previous versions of JBoss EAP where everything was basically turned into an
+    MBean. \n \n "
   ruleID: jboss-eap4and5to6and7-java-03000
   when:
     java.referenced:
diff --git a/default/generated/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml b/default/generated/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml
index 94818f19..c629e392 100644
--- a/default/generated/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml
+++ b/default/generated/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Replace service-style deployments
-    MBeans were part of the core architecture in previous versions of Red Hat JBoss Enterprise Application Platform.. JBoss Service Archive (SAR) deployments using the JBoss specific `jboss-service.xml` and `jboss-beans.xml` service-style descriptors were used by the application server to create MBeans based on JBoss Beans.. The internal architecture has changed in JBoss EAP 6+ and is no longer based on an MBean JMX architecture.
+  description: Replace service-style deployments
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -22,21 +20,19 @@
     url: https://access.redhat.com/solutions/374333
   - title: jboss:service=Naming in JBoss EAP 6
     url: https://access.redhat.com/solutions/1212103
-  message: MBeans were part of the core architecture in previous versions of Red Hat
-    JBoss Enterprise Application Platform.. JBoss Service Archive (SAR) deployments
-    using the JBoss specific `jboss-service.xml` and `jboss-beans.xml` service-style
-    descriptors were used by the application server to create MBeans based on JBoss
-    Beans.. The internal architecture has changed in JBoss EAP 6+ and is no longer
-    based on an MBean JMX architecture.
+  message: "\n \n MBeans were part of the core architecture in previous versions of
+    Red Hat JBoss Enterprise Application Platform. \n JBoss Service Archive (SAR)
+    deployments using the JBoss specific `jboss-service.xml` and `jboss-beans.xml`
+    service-style descriptors were used by the application server to create MBeans
+    based on JBoss Beans. \n The internal architecture has changed in JBoss EAP 6+
+    and is no longer based on an MBean JMX architecture.\n \n "
   ruleID: jboss-eap4and5to6and7-xml-01000
   when:
     builtin.file:
       pattern: jboss-(service|beans)\.xml
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace BarrierController service
-    `BarrierController` service is no longer available in JBoss EAP 6+.. In JBoss EAP 4.x the JBoss 'kernel' layer was an extension of JMX which is why everything was an MBean, though most of the MBean functionality still worked in JBoss EAP 5.. JBoss EAP 6 is no longer based on Mbeans, and the Mbeans which are seen in jconsole are actually just facades over the JBoss management API, so declaring Mbean dependencies on any other Mbeans that appear to be JBoss Mbeans does not work since they are not real Mbeans.
+  description: Replace BarrierController service
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -52,13 +48,13 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#Review_The_List_of_Deprecated_and_Unsupported_Features
   - title: JBoss EAP 5 - HASingleton Deployment Options
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/administration_and_configuration_guide/index#idm139776751035360
-  message: '`BarrierController` service is no longer available in JBoss EAP 6+.. In
-    JBoss EAP 4.x the JBoss ''kernel'' layer was an extension of JMX which is why
-    everything was an MBean, though most of the MBean functionality still worked in
-    JBoss EAP 5.. JBoss EAP 6 is no longer based on Mbeans, and the Mbeans which are
-    seen in jconsole are actually just facades over the JBoss management API, so declaring
-    Mbean dependencies on any other Mbeans that appear to be JBoss Mbeans does not
-    work since they are not real Mbeans.'
+  message: "\n \n `BarrierController` service is no longer available in JBoss EAP
+    6+. \n In JBoss EAP 4.x the JBoss 'kernel' layer was an extension of JMX which
+    is why everything was an MBean, though most of the MBean functionality still worked
+    in JBoss EAP 5. \n JBoss EAP 6 is no longer based on Mbeans, and the Mbeans which
+    are seen in jconsole are actually just facades over the JBoss management API,
+    so declaring Mbean dependencies on any other Mbeans that appear to be JBoss Mbeans
+    does not work since they are not real Mbeans. \n \n "
   ruleID: jboss-eap4and5to6and7-xml-02000
   when:
     builtin.xml:
@@ -68,9 +64,7 @@
       xpath: //mbean[@code='org.jboss.system.BarrierController']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace CompressingMarshaller marshaller
-    `CompressingMarshaller` marshaller is no longer available in JBoss EAP 6+.. In JBoss EAP 6.3.0 and later, data compression hints can be specified via the JBoss annotation `org.jboss.ejb.client.annotation.CompressionHint`
+  description: Replace CompressingMarshaller marshaller
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -82,9 +76,9 @@
   links:
   - title: How to compress remote EJB communication in JBoss EAP 6
     url: https://access.redhat.com/solutions/322953
-  message: '`CompressingMarshaller` marshaller is no longer available in JBoss EAP
-    6+.. In JBoss EAP 6.3.0 and later, data compression hints can be specified via
-    the JBoss annotation `org.jboss.ejb.client.annotation.CompressionHint`'
+  message: "\n \n `CompressingMarshaller` marshaller is no longer available in JBoss
+    EAP 6+. \n In JBoss EAP 6.3.0 and later, data compression hints can be specified
+    via the JBoss annotation `org.jboss.ejb.client.annotation.CompressionHint`\n \n "
   ruleID: jboss-eap4and5to6and7-xml-03000
   when:
     or:
@@ -101,9 +95,7 @@
         xpath: //value[text()='org.jboss.remoting.marshal.compress.CompressingMarshaller']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Login Module definition
-    In JBoss EAP 6+, Security is configured in the `<security-domain>` element in the server configuration file.
+  description: Replace Login Module definition
   effort: 5
   labels:
   - konveyor.io/source=eap4
@@ -117,8 +109,8 @@
     url: https://access.redhat.com/solutions/219933
   - title: JBoss EAP 6 - Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Configuration_File_Changes
-  message: In JBoss EAP 6+, Security is configured in the `<security-domain>` element
-    in the server configuration file.
+  message: "\n \n In JBoss EAP 6+, Security is configured in the `<security-domain>`
+    element in the server configuration file.\n \n "
   ruleID: jboss-eap4and5to6and7-xml-04000
   when:
     builtin.xml:
@@ -126,9 +118,7 @@
       xpath: //authentication/login-module
 - category: mandatory
   customVariables: []
-  description: |-
-    Remove class-loading definition
-    The `class-loading` and `loader-repository` configuration in `jboss.xml`, `jboss-web.xml` and `jboss-service.xml` were JBoss EAP 4.x & 5.x configuration options for specifying classloader isolation on a deployment.. In JBoss EAP 6+, it uses JBoss Modules for its classloader implementation so all deployments are isolated in their own classloader / JBoss Module and the `loader-repository` is no longer valid.. The `jboss-deployment-structure.xml` can be used to specify classloader / module dependencies if needed.
+  description: Remove class-loading definition
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -147,13 +137,13 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/development_guide/#jboss-deployment-structurexml
   - title: JBoss EAP 7 - jboss-deployment-structure.xml
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/development_guide/#jboss_deployment_structure_xml
-  message: The `class-loading` and `loader-repository` configuration in `jboss.xml`,
+  message: "\n \n The `class-loading` and `loader-repository` configuration in `jboss.xml`,
     `jboss-web.xml` and `jboss-service.xml` were JBoss EAP 4.x & 5.x configuration
-    options for specifying classloader isolation on a deployment.. In JBoss EAP 6+,
-    it uses JBoss Modules for its classloader implementation so all deployments are
-    isolated in their own classloader / JBoss Module and the `loader-repository` is
-    no longer valid.. The `jboss-deployment-structure.xml` can be used to specify
-    classloader / module dependencies if needed.
+    options for specifying classloader isolation on a deployment. \n In JBoss EAP
+    6+, it uses JBoss Modules for its classloader implementation so all deployments
+    are isolated in their own classloader / JBoss Module and the `loader-repository`
+    is no longer valid. \n The `jboss-deployment-structure.xml` can be used to specify
+    classloader / module dependencies if needed.\n \n "
   ruleID: jboss-eap4and5to6and7-xml-05000
   when:
     builtin.xml:
@@ -164,8 +154,7 @@
       xpath: //class-loading/loader-repository
 - category: mandatory
   customVariables: []
-  description: |
-    Create org.jboss.naming.NamingAlias class
+  description: Create org.jboss.naming.NamingAlias class
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -175,10 +164,11 @@
   - konveyor.io/target=eap7
   - konveyor.io/target=eap
   links: []
-  message: JBoss EAP 6 supports deploying SAR files, however JBoss EAP 5 and 6 do
-    not share a lot of the internals.. The class your `jboss-{{types}}.xml` file is
-    trying to instantiate (`org.jboss.naming.NamingAlias`) was an implementation detail
-    of JBoss EAP 5's naming components that does not exist in JBoss EAP 6.
+  message: "\n \n JBoss EAP 6 supports deploying SAR files, however JBoss EAP 5 and
+    6 do not share a lot of the internals. \n The class your `jboss-{{types}}.xml`
+    file is trying to instantiate (`org.jboss.naming.NamingAlias`) was an implementation
+    detail of JBoss EAP 5's naming components that does not exist in JBoss EAP 6.\n
+    \n "
   ruleID: jboss-eap4and5to6and7-xml-06000
   when:
     builtin.xml:
@@ -188,9 +178,7 @@
       xpath: //mbean[@code='org.jboss.naming.NamingAlias']
 - category: mandatory
   customVariables: []
-  description: "Set authentication cache timeout \nIn JBoss EAP 6 and 7 you can set
-    the JAAS cache timeout, changing the `cache-type` to `infinispan` which uses Infinispan
-    cache which has an expiration capability."
+  description: 'Set authentication cache timeout '
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -204,8 +192,9 @@
     url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/security_guide/#Custom_Callback_Handlers
   - title: How to set authentication cache timeout in JBoss EAP6/7
     url: https://access.redhat.com/solutions/259693
-  message: In JBoss EAP 6 and 7 you can set the JAAS cache timeout, changing the `cache-type`
-    to `infinispan` which uses Infinispan cache which has an expiration capability.
+  message: "\n \n In JBoss EAP 6 and 7 you can set the JAAS cache timeout, changing
+    the `cache-type` to `infinispan` which uses Infinispan cache which has an expiration
+    capability.\n \n "
   ruleID: jboss-eap4and5to6and7-xml-07000
   when:
     builtin.xml:
diff --git a/default/generated/eap7/66-base64.windup.yaml b/default/generated/eap7/66-base64.windup.yaml
index a72668d7..fcdf5de6 100644
--- a/default/generated/eap7/66-base64.windup.yaml
+++ b/default/generated/eap7/66-base64.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The class org.jboss.util.Base64 has been moved
-    This API is not considered a public API for EAP. For JDK 8+, the recommended solution is to migrate to. [java.util.Base64](https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html).. For JDK 7, it is recommended to migrate to another Base 64 library, for example. [Apache Commons Codec](https://commons.apache.org/proper/commons-codec/).
+  description: The class org.jboss.util.Base64 has been moved
   effort: 1
   labels:
   - konveyor.io/source=java-ee
@@ -14,10 +12,10 @@
   links:
   - title: Can application use the JBoss EAP org.jboss.util.Base64 built in class?
     url: https://access.redhat.com/solutions/403703
-  message: This API is not considered a public API for EAP. For JDK 8+, the recommended
-    solution is to migrate to. [java.util.Base64](https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html)..
-    For JDK 7, it is recommended to migrate to another Base 64 library, for example.
-    [Apache Commons Codec](https://commons.apache.org/proper/commons-codec/).
+  message: "\n This API is not considered a public API for EAP. For JDK 8+, the recommended
+    solution is to migrate to\n [java.util.Base64](https://docs.oracle.com/javase/8/docs/api/java/util/Base64.html).\n\n
+    For JDK 7, it is recommended to migrate to another Base 64 library, for example\n
+    [Apache Commons Codec](https://commons.apache.org/proper/commons-codec/).\n "
   ruleID: base64-01000
   when:
     java.referenced:
diff --git a/default/generated/eap7/67-jaxrpc.windup.yaml b/default/generated/eap7/67-jaxrpc.windup.yaml
index 24e67f17..23a3bd4b 100644
--- a/default/generated/eap7/67-jaxrpc.windup.yaml
+++ b/default/generated/eap7/67-jaxrpc.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    JAX-RPC Generic Handler not supported
-    JAX-RPC is no longer supported on JBoss EAP 7. JAX-WS is successor and offers a more accurate and complete solution.
+  description: JAX-RPC Generic Handler not supported
   effort: 5
   labels:
   - konveyor.io/source=java-ee
diff --git a/default/generated/eap7/68-jboss-eap5-7-java.windup.yaml b/default/generated/eap7/68-jboss-eap5-7-java.windup.yaml
index 00ac5849..249e429c 100644
--- a/default/generated/eap7/68-jboss-eap5-7-java.windup.yaml
+++ b/default/generated/eap7/68-jboss-eap5-7-java.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    JMS legacy javax.jms.QueueConnectionFactory
-    `QueueConnectionFactory` was used to obtain connection to JMS queues.. Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.
+  description: JMS legacy javax.jms.QueueConnectionFactory
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -20,8 +18,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html/configuring_messaging/configuring_messaging_connection_factories
   - title: JavaEE 7 - JMS APIs
     url: https://docs.oracle.com/javaee/7/api/javax/jms/package-summary.html#package.description
-  message: '`QueueConnectionFactory` was used to obtain connection to JMS queues..
-    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.'
+  message: "\n \n `QueueConnectionFactory` was used to obtain connection to JMS queues.\n\n
+    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.\n
+    \n "
   ruleID: jboss-eap5-7-java-02000
   when:
     or:
@@ -33,9 +32,7 @@
         pattern: javax.jms.QueueConnectionFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EJB @Service annotation
-    The purpose of `@Service` annotation was to achieve @Singleton like behavior.. It was deprecated with the release of JBoss AS 6 and removed from JBoss EAP 6.. Use the Java EE 6 `javax.ejb.Singleton` annotation instead.
+  description: JBoss EJB @Service annotation
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -57,9 +54,9 @@
     url: https://access.redhat.com/solutions/199863
   - title: How to use @Service and @Management annotations in JBoss EAP
     url: https://access.redhat.com/solutions/196713
-  message: The purpose of `@Service` annotation was to achieve @Singleton like behavior..
-    It was deprecated with the release of JBoss AS 6 and removed from JBoss EAP 6..
-    Use the Java EE 6 `javax.ejb.Singleton` annotation instead.
+  message: "\n The purpose of `@Service` annotation was to achieve @Singleton like
+    behavior.\n It was deprecated with the release of JBoss AS 6 and removed from
+    JBoss EAP 6.\n\n Use the Java EE 6 `javax.ejb.Singleton` annotation instead.\n "
   ruleID: jboss-eap5-7-java-03000
   when:
     java.referenced:
@@ -67,9 +64,7 @@
       pattern: org.jboss.annotation.ejb.Service
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EJB @Management annotation
-    The `@Management` annotation is one of JBoss EJB 3.0 extension which wraps the bean. as an MBean and registers it in the JBoss MBean Server automatically.. JBoss EAP 6+ no longer supports the @Management annotations.. The Solution is to create a simple MBean using the Java EE 6 `@Singleton` and `@Startup` to register itself in JMX Server.. Create your `@Singleton` MBean implementation which implements your service interface. Use `@PostConstruct` to have your Singleton register itself in the JMX MBean Server and then use `@PreDestroy` to unregister your MBean from the JMX Server.
+  description: JBoss EJB @Management annotation
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -91,14 +86,14 @@
     url: https://access.redhat.com/solutions/199863
   - title: Java API - Annotation Type Startup
     url: http://docs.oracle.com/javaee/7/api/javax/ejb/Startup.html
-  message: The `@Management` annotation is one of JBoss EJB 3.0 extension which wraps
-    the bean. as an MBean and registers it in the JBoss MBean Server automatically..
-    JBoss EAP 6+ no longer supports the @Management annotations.. The Solution is
-    to create a simple MBean using the Java EE 6 `@Singleton` and `@Startup` to register
-    itself in JMX Server.. Create your `@Singleton` MBean implementation which implements
-    your service interface. Use `@PostConstruct` to have your Singleton register itself
-    in the JMX MBean Server and then use `@PreDestroy` to unregister your MBean from
-    the JMX Server.
+  message: "\n The `@Management` annotation is one of JBoss EJB 3.0 extension which
+    wraps the bean\n as an MBean and registers it in the JBoss MBean Server automatically.\n
+    JBoss EAP 6+ no longer supports the @Management annotations.\n\n The Solution
+    is to create a simple MBean using the Java EE 6 `@Singleton` and `@Startup` to
+    register itself in JMX Server.\n\n Create your `@Singleton` MBean implementation
+    which implements your service interface. Use `@PostConstruct` to have your Singleton
+    register itself in the JMX MBean Server and then use `@PreDestroy` to unregister
+    your MBean from the JMX Server.\n "
   ruleID: jboss-eap5-7-java-05000
   when:
     or:
@@ -110,9 +105,7 @@
         pattern: org.jboss.ejb3.annotation.Management
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.annotation.ejb.LocalBinding
-    The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions. which specifies the local jndi binding for an EJB local interface.. Use `@EJB(lookup="your_jndi")` instead.
+  description: org.jboss.annotation.ejb.LocalBinding
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -130,9 +123,9 @@
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
   - title: EJB annotation with lookup
     url: https://docs.oracle.com/javaee/7/api/javax/ejb/EJB.html#lookup--
-  message: The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions. which
-    specifies the local jndi binding for an EJB local interface.. Use `@EJB(lookup="your_jndi")`
-    instead.
+  message: "\n The `@LocalBinding` annotation is one of JBoss EJB 3.0 extensions\n
+    which specifies the local jndi binding for an EJB local interface.\n Use `@EJB(lookup=\"your_jndi\")`
+    instead.\n "
   ruleID: jboss-eap5-7-java-06000
   when:
     or:
@@ -144,9 +137,7 @@
         pattern: org.jboss.annotation.ejb.LocalBinding
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.annotation.ejb.Depends
-    The `@Depends` annotation is one of JBoss EJB 3.0 extensions. which specifies a deployment dependency for a bean.. Validate that a JBoss EAP 6 Dependency exists.
+  description: org.jboss.annotation.ejb.Depends
   effort: 3
   labels:
   - konveyor.io/source=eap4
@@ -162,8 +153,9 @@
     url: https://docs.jboss.org/ejb3/docs/reference/build/reference/en/html/jboss_extensions.html
   - title: JBoss EJB 3.0 Javadoc
     url: https://docs.jboss.org/ejb3/embedded/api/org/jboss/annotation/ejb/package-summary.html
-  message: The `@Depends` annotation is one of JBoss EJB 3.0 extensions. which specifies
-    a deployment dependency for a bean.. Validate that a JBoss EAP 6 Dependency exists.
+  message: "\n The `@Depends` annotation is one of JBoss EJB 3.0 extensions\n which
+    specifies a deployment dependency for a bean.\n Validate that a JBoss EAP 6 Dependency
+    exists.\n "
   ruleID: jboss-eap5-7-java-07000
   when:
     java.referenced:
@@ -171,9 +163,7 @@
       pattern: org.jboss.annotation.ejb.Depends
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.annotation has been moved to org.jboss.ws.api.annotation
-    This package has been relocated to `org.jboss.ws.api.annotation` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.annotation has been moved to org.jboss.ws.api.annotation
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -188,8 +178,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.annotation` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.annotation` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08000
   when:
     java.referenced:
@@ -197,9 +187,7 @@
       pattern: org.jboss.wsf.spi.annotation*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.binding has been moved to org.jboss.ws.api.binding
-    This package has been relocated to `org.jboss.ws.api.binding` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.binding has been moved to org.jboss.ws.api.binding
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -214,8 +202,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.binding` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.binding` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08100
   when:
     java.referenced:
@@ -223,9 +211,7 @@
       pattern: org.jboss.wsf.spi.binding*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.management.recording has been moved to org.jboss.ws.api.monitoring
-    This package has been relocated to `org.jboss.ws.api.monitoring` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.management.recording has been moved to org.jboss.ws.api.monitoring
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -240,8 +226,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.monitoring` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.monitoring` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08200
   when:
     java.referenced:
@@ -249,9 +235,7 @@
       pattern: org.jboss.wsf.spi.management.recording*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools.ant has been moved to org.jboss.ws.tools.ant
-    This package has been relocated to `org.jboss.ws.tools.ant` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools.ant has been moved to org.jboss.ws.tools.ant
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -266,8 +250,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.tools.ant` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.tools.ant` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08300
   when:
     java.referenced:
@@ -275,9 +259,7 @@
       pattern: org.jboss.wsf.spi.tools.ant*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools.cmd has been moved to org.jboss.ws.tools.cmd
-    This package has been relocated to `org.jboss.ws.tools.cmd` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools.cmd has been moved to org.jboss.ws.tools.cmd
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -292,8 +274,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.tools.cmd` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.tools.cmd` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08400
   when:
     java.referenced:
@@ -301,9 +283,7 @@
       pattern: org.jboss.wsf.spi.tools.cmd*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.tools has been moved to org.jboss.ws.api.tools
-    This package has been relocated to `org.jboss.ws.api.tools` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.tools has been moved to org.jboss.ws.api.tools
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -316,8 +296,8 @@
   - ejb
   - jbossws
   links: []
-  message: This package has been relocated to `org.jboss.ws.api.tools` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.tools` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08500
   when:
     java.referenced:
@@ -325,9 +305,7 @@
       pattern: org.jboss.wsf.spi.tools*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.spi.util.ServiceLoader has been moved to org.jboss.ws.api.util.ServiceLoader
-    This class has been relocated to `org.jboss.ws.api.util.ServiceLoader` as specified in the. migration guide.
+  description: org.jboss.wsf.spi.util.ServiceLoader has been moved to org.jboss.ws.api.util.ServiceLoader
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -342,17 +320,15 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
-    as specified in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
+    as specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08600
   when:
     java.referenced:
       pattern: org.jboss.wsf.spi.util.ServiceLoader
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.handler has been moved to org.jboss.ws.api.handler
-    This package has been relocated to `org.jboss.ws.api.handler` as specified in the. migration guide.
+  description: org.jboss.wsf.common.handler has been moved to org.jboss.ws.api.handler
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -367,8 +343,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.handler` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.handler` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08700
   when:
     java.referenced:
@@ -376,9 +352,7 @@
       pattern: org.jboss.wsf.common.handler*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.addressing has been moved to org.jboss.ws.api.addressing
-    This package has been relocated to `org.jboss.ws.api.addressing` as specified in the. migration guide.
+  description: org.jboss.wsf.common.addressing has been moved to org.jboss.ws.api.addressing
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -393,8 +367,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This package has been relocated to `org.jboss.ws.api.addressing` as specified
-    in the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.api.addressing` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08800
   when:
     java.referenced:
@@ -402,9 +376,7 @@
       pattern: org.jboss.wsf.common.addressing*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common.DOMUtils has been moved to org.jboss.ws.api.util.DOMUtils
-    This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified in the. migration guide.
+  description: org.jboss.wsf.common.DOMUtils has been moved to org.jboss.ws.api.util.DOMUtils
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -419,17 +391,15 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified
-    in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as
+    specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-08900
   when:
     java.referenced:
       pattern: org.jboss.wsf.common.DOMUtils
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.wsf.common has been moved to org.jboss.ws.common
-    This package has been relocated to `org.jboss.ws.common` as specified in the. migration guide.
+  description: org.jboss.wsf.common has been moved to org.jboss.ws.common
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -442,8 +412,8 @@
   - ejb
   - jbossws
   links: []
-  message: This package has been relocated to `org.jboss.ws.common` as specified in
-    the. migration guide.
+  message: "\n This package has been relocated to `org.jboss.ws.common` as specified
+    in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-09000
   when:
     java.referenced:
@@ -451,9 +421,7 @@
       pattern: org.jboss.wsf.common*
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.ws.annotation.EndpointConfig has been moved to org.jboss.ws.api.annotation.EndpointConfig
-    This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig` as specified in the. migration guide.
+  description: org.jboss.ws.annotation.EndpointConfig has been moved to org.jboss.ws.api.annotation.EndpointConfig
   effort: 1
   labels:
   - konveyor.io/source=eap4
@@ -468,8 +436,8 @@
   links:
   - title: EAP 6 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/#sect-Web_Services_Changes
-  message: This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
-    as specified in the. migration guide.
+  message: "\n This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
+    as specified in the\n migration guide.\n "
   ruleID: jboss-eap5-7-java-09100
   when:
     java.referenced:
diff --git a/default/generated/eap7/69-jboss-eap5-7-xml.windup.yaml b/default/generated/eap7/69-jboss-eap5-7-xml.windup.yaml
index c2be67cc..6491b6fc 100644
--- a/default/generated/eap7/69-jboss-eap5-7-xml.windup.yaml
+++ b/default/generated/eap7/69-jboss-eap5-7-xml.windup.yaml
@@ -1,7 +1,7 @@
 - customVariables: []
   description: "JBoss Cache\n\n                        JBoss Cache was renamed and
     reimplemented in Infinispan project see its TreeCache API which is a distributed
-    tree-like structure that is replicated across several members.\n                    \n"
+    tree-like structure that is replicated across several members.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -31,7 +31,6 @@
   description: |-
     JBoss EAP 5 classloader configuration (jboss-classloading.xml)
     The `jboss-classloading.xml` file allows customization of classloading in JBoss EAP 5.
-    In JBoss EAP 6+, the classloading configuration is not done through `jboss-classloading.xml`.. Since EAP 6 is of modular nature, based on JBoss Modules.. Learn how to divide your application's dependencies into modules. and what dependencies and APIs are available automatically.
   effort: 5
   labels:
   - konveyor.io/source=eap5
@@ -49,10 +48,10 @@
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/5/html/Microcontainer_User_Guide/sect-JBoss_Microcontainer_User_Guide-The_ClassLoading_Layer-ClassLoading.html
   - title: JBoss EAP 7 Class Loading and Modules
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#class_loading_and_modules
-  message: In JBoss EAP 6+, the classloading configuration is not done through `jboss-classloading.xml`..
-    Since EAP 6 is of modular nature, based on JBoss Modules.. Learn how to divide
-    your application's dependencies into modules. and what dependencies and APIs are
-    available automatically.
+  message: "\n In JBoss EAP 6+, the classloading configuration is not done through
+    `jboss-classloading.xml`.\n Since EAP 6 is of modular nature, based on JBoss Modules.\n
+    Learn how to divide your application's dependencies into modules\n and what dependencies
+    and APIs are available automatically.\n "
   ruleID: jboss-eap5-7-xml-10000
   tag:
   - classloading
@@ -65,7 +64,7 @@
 - customVariables: []
   description: "JBoss legacy EJB XML (jboss.xml)\n\n                        The `jboss.xml`
     descriptor in deployments is ignored by JBoss AS 7+ or JBoss EAP 6+.\n                        Replace
-    it with `jboss-ejb3.xml`.\n                    \n"
+    it with `jboss-ejb3.xml`.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap
@@ -96,9 +95,7 @@
       xpath: //*[local-name()='jboss']
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss EAP security-domain configuration - java:/jaas/
-    `java:/jaas/` is a JBoss EAP `security-domain` URI.. Remove the `java:/jaas/` prefix for `security-domain` elements in EAP 7/6.
+  description: JBoss EAP security-domain configuration - java:/jaas/
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -117,8 +114,8 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#java_authorization_contract_for_containers_jacc
   - title: Java Authentication SPI for Containers (JASPI)
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#java_authentication_spi_for_containers_jaspi
-  message: '`java:/jaas/` is a JBoss EAP `security-domain` URI.. Remove the `java:/jaas/`
-    prefix for `security-domain` elements in EAP 7/6.'
+  message: "\n `java:/jaas/` is a JBoss EAP `security-domain` URI.\n Remove the `java:/jaas/`
+    prefix for `security-domain` elements in EAP 7/6.\n "
   ruleID: jboss-eap5-7-xml-14000
   when:
     builtin.xml:
@@ -126,9 +123,7 @@
       xpath: //*[local-name()='security-domain' and starts-with(text(), 'java:/jaas/')]
 - category: mandatory
   customVariables: []
-  description: |-
-    JBoss security configuration descriptor (login-config.xml)
-    Before JBoss EAP 6, authentication security domains and login modules could be configured in a `login-config.xml` file.. JBoss EAP 6+ does not support the `login-config.xml` descriptor. Security is now configured inside the server configuration. Please refer to the corresponding server security guide.
+  description: JBoss security configuration descriptor (login-config.xml)
   effort: 5
   labels:
   - konveyor.io/source=eap5
@@ -144,10 +139,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/how_to_configure_server_security/
   - title: JBoss Login Modules
     url: http://docs.jboss.org/jbosssecurity/docs/6.0/security_guide/html/Login_Modules.html
-  message: Before JBoss EAP 6, authentication security domains and login modules could
-    be configured in a `login-config.xml` file.. JBoss EAP 6+ does not support the
-    `login-config.xml` descriptor. Security is now configured inside the server configuration.
-    Please refer to the corresponding server security guide.
+  message: "Before JBoss EAP 6, authentication security domains and login modules
+    could be configured in a `login-config.xml` file.\n JBoss EAP 6+ does not support
+    the `login-config.xml` descriptor. Security is now configured inside the server
+    configuration. Please refer to the corresponding server security guide.\n "
   ruleID: jboss-eap5-7-xml-16000
   tag:
   - JBoss security configuration descriptor (login-config.xml)
diff --git a/default/generated/eap7/70-jboss-eap5and6to7-java.windup.yaml b/default/generated/eap7/70-jboss-eap5and6to7-java.windup.yaml
index 52b20a98..0153cc98 100644
--- a/default/generated/eap7/70-jboss-eap5and6to7-java.windup.yaml
+++ b/default/generated/eap7/70-jboss-eap5and6to7-java.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Dependency entries in MANIFEST.MF
     Verify in advance that all the modules this application depends on still exist.
   labels:
@@ -23,7 +23,7 @@
   description: "Apache CFX integration with JBoss \nMigrate all functionality specified
     in such XML descriptor. It is mostly already supported by the JAX-WS specification,
     included in Java EE 7. For specific functionality consult the Apache CFX documentation
-    link provided.\n"
+    link provided."
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -45,9 +45,7 @@
       pattern: jbossws-cxf\.xml
 - category: mandatory
   customVariables: []
-  description: |-
-    Entity EJB
-    Entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by Entity beans.. This entity needs to be migrated using JPA persistence.xml or using JPA annotations.
+  description: Entity EJB
   effort: 5
   labels:
   - konveyor.io/source=eap5
@@ -60,9 +58,9 @@
   - cmp
   - jpa
   links: []
-  message: Entity beans are no longer supported in JBoss EAP 7. User is requested
-    to use JPA entities that fully replaced the functionality provided by Entity beans..
-    This entity needs to be migrated using JPA persistence.xml or using JPA annotations.
+  message: |-
+    Entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by Entity beans.
+     This entity needs to be migrated using JPA persistence.xml or using JPA annotations.
   ruleID: jboss-eap5and6to7-java-03000
   when:
     or:
@@ -73,7 +71,7 @@
         location: INHERITANCE
         pattern: javax.ejb.EntityBean
 - customVariables: []
-  description: |
+  description: |-
     JBoss Web Valve
     JBoss Web was replaced by Undertow, which does not contain support for the Valve functionality. It may be needed to migrate to Undertow handlers.
   labels:
@@ -100,9 +98,7 @@
         pattern: org.apache.catalina.valves.ValveBase
 - category: mandatory
   customVariables: []
-  description: |-
-    JSR 88 deployment plan not supported
-    This class is using JSR 88 specific classes. Rely instead on proprietary functionality to automate deployments. Please consult EAP 7 admin documentation to learn about such functionality
+  description: JSR 88 deployment plan not supported
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -126,9 +122,7 @@
         pattern: javax.enterprise.deploy*
 - category: mandatory
   customVariables: []
-  description: |-
-    Outdated HA Singleton
-    EAP 7 includes a new API for building Singleton services, which significantly simplifies the process, and solves the issues found in the legacy solution.
+  description: Outdated HA Singleton
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -149,9 +143,7 @@
       pattern: org.jboss.as.clustering.singleton.SingletonService
 - category: optional
   customVariables: []
-  description: |-
-    Stateful Session EJB Clustering changes in EAP 7
-    The `@Clustered` annotation is ignored in EAP 7 and is not useful. In case the application is started using HA profile, the replication will be done automatically.
+  description: Stateful Session EJB Clustering changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -166,8 +158,9 @@
   links:
   - title: Stateful Session EJB Clustering Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_stateful_session_ejb_clustering_changes
-  message: The `@Clustered` annotation is ignored in EAP 7 and is not useful. In case
-    the application is started using HA profile, the replication will be done automatically.
+  message: "\n The `@Clustered` annotation is ignored in EAP 7 and is not useful.
+    In case the application is started using HA profile, the replication will be done
+    automatically.\n "
   ruleID: jboss-eap5and6to7-java-07000
   when:
     or:
@@ -178,7 +171,7 @@
         location: IMPORT
         pattern: org.jboss.ejb3.annotation.Clustered
 - customVariables: []
-  description: |
+  description: |-
     HornetQ was removed in EAP 7
     HornetQ was replaced by ActiveMQ Artemis in EAP 7. You should replace all references to `org.hornetq.*` with JMS API or ActiveMQ Artemis API.
   labels:
@@ -208,9 +201,7 @@
   - name: annotation
     nameOfCaptureGroup: annotation
     pattern: org.jboss.logging.(?P<annotation>(Cause|Field|FormatWith|LoggingClass|LogMessage|Message|MessageBundle|MessageLogger|Param|Property))
-  description: |-
-    JBoss deprecated logging annotations
-    JBoss Logging annotations in package `org.jboss.logging` are deprecated. You should replace them by the corresponding annotations from package `org.jboss.logging.annotations`. Note that using the `org.jboss.logging.annotations` package requires adding a new dependency: `org.jboss.logging:jboss-logging-annotations`.
+  description: JBoss deprecated logging annotations
   effort: 1
   labels:
   - konveyor.io/source=eap5
diff --git a/default/generated/eap7/71-jboss-eap5and6to7-xml.windup.yaml b/default/generated/eap7/71-jboss-eap5and6to7-xml.windup.yaml
index 6ff24ec2..a6c4319b 100644
--- a/default/generated/eap7/71-jboss-eap5and6to7-xml.windup.yaml
+++ b/default/generated/eap7/71-jboss-eap5and6to7-xml.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Stateful Session EJB Clustering configuration changes in EAP 7
-    The `clustered` element is ignored in EAP 7 and is not useful. In case the application is started using HA profile, the replication will be done automatically.
+  description: Stateful Session EJB Clustering configuration changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -16,8 +14,8 @@
   - cluster
   - configuration
   links: []
-  message: The `clustered` element is ignored in EAP 7 and is not useful. In case
-    the application is started using HA profile, the replication will be done automatically.
+  message: "\n The `clustered` element is ignored in EAP 7 and is not useful. In case
+    the application is started using HA profile, the replication will be done automatically.\n "
   ruleID: jboss-eap5and6to7-xml-37000
   when:
     builtin.xml:
@@ -26,7 +24,7 @@
       namespaces: {}
       xpath: /*[local-name()='ejb-jar']/*[local-name()='assembly-descriptor']/*[local-name()='clustering']/*[local-name()='clustered']
 - customVariables: []
-  description: |
+  description: |-
     JBoss Seam Components (components.xml)
     You should migrate from Seam 2 Framework to Context Dependency Injection technology.
   labels:
@@ -57,7 +55,7 @@
   description: "JBoss Seam Pages (pages.xml)\nYou should migrate from Seam 2 Framework
     to Context Dependency Injection technology.\n                        The most
     features from `pages.xml` file where it is specified a page flow and other configuration
-    of the Seam Framework is achievable through JSF Flow.\n                    \n"
+    of the Seam Framework is achievable through JSF Flow.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -83,6 +81,7 @@
         sp: http://jboss.com/products/seam/pages
       xpath: /sp:pages
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -112,7 +111,7 @@
 - customVariables: []
   description: "JBoss web application descriptor (jboss-web.xml)\n\n                        The
     `jboss-web.xml` file configures a Java EE web application specifically for JBoss
-    EAP.\n                        It is an extension to standard `web.xml`.\n                    \n"
+    EAP.\n                        It is an extension to standard `web.xml`.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -145,7 +144,7 @@
     Persistence (CMP).\n\n                        Support for EJB Entity Beans is
     optional in Java EE 7 and they are not supported in JBoss EAP 7.\n                        This
     means CMP entity beans must be rewritten to use Java Persistence API (JPA) entities.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -175,7 +174,7 @@
       xpath: //*[local-name()='jbosscmp-jdbc']
 - customVariables: []
   description: "JBoss EJB 3 deployment descriptor (jboss-ejb3.xml)\n\n                        A
-    JBoss specific EJB 3 configuration allows extensions of Java EE EJB 3.\n                    \n"
+    JBoss specific EJB 3 configuration allows extensions of Java EE EJB 3.\n                    "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -208,7 +207,7 @@
     descriptor file\n                        is in the `META-INF/` directory. For
     POJO and EJB webservice endpoints bundled in WAR file,\n                        the
     expected location of the `jboss-webservices.xml` file is in the `WEB-INF/` directory.\n
-    \                   \n"
+    \                   "
   labels:
   - konveyor.io/source=eap5
   - konveyor.io/source=eap6
@@ -236,9 +235,7 @@
       xpath: //*[local-name()='webservices']
 - category: mandatory
   customVariables: []
-  description: |-
-    CMP Entity EJB configuration
-    CMP entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by CMP beans.. CMP configuration provided in this ejb-jar.xml should be configured using JPA persistence.xml or using JPA annotations.
+  description: CMP Entity EJB configuration
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -252,10 +249,9 @@
   - jpa
   - cmp
   links: []
-  message: CMP entity beans are no longer supported in JBoss EAP 7. User is requested
-    to use JPA entities that fully replaced the functionality provided by CMP beans..
-    CMP configuration provided in this ejb-jar.xml should be configured using JPA
-    persistence.xml or using JPA annotations.
+  message: |-
+    CMP entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by CMP beans.
+     CMP configuration provided in this ejb-jar.xml should be configured using JPA persistence.xml or using JPA annotations.
   ruleID: jboss-eap5and6to7-xml-31000
   when:
     builtin.xml:
@@ -271,9 +267,7 @@
         = 'Container']
 - category: mandatory
   customVariables: []
-  description: |-
-    EJB 2.x BMP Entity Beans configuration
-    BMP entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by BMP beans.. BMP configuration provided in this ejb-jar.xml should be configured using JPA persistence.xml or using JPA annotations.
+  description: EJB 2.x BMP Entity Beans configuration
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -287,10 +281,9 @@
   - jpa
   - bmp
   links: []
-  message: BMP entity beans are no longer supported in JBoss EAP 7. User is requested
-    to use JPA entities that fully replaced the functionality provided by BMP beans..
-    BMP configuration provided in this ejb-jar.xml should be configured using JPA
-    persistence.xml or using JPA annotations.
+  message: |-
+    BMP entity beans are no longer supported in JBoss EAP 7. User is requested to use JPA entities that fully replaced the functionality provided by BMP beans.
+     BMP configuration provided in this ejb-jar.xml should be configured using JPA persistence.xml or using JPA annotations.
   ruleID: jboss-eap5and6to7-xml-31500
   when:
     builtin.xml:
@@ -306,9 +299,7 @@
         = 'Bean']
 - category: mandatory
   customVariables: []
-  description: |-
-    Valve is not supported in JBoss EAP 7
-    JBoss Web was replaced by Undertow, which does not contain support for the Valve functionality. It may be needed to migrate to Undertow handlers.
+  description: Valve is not supported in JBoss EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -333,9 +324,7 @@
       xpath: /jboss-web/valve | /jboss:jboss-web/jboss:valve
 - category: mandatory
   customVariables: []
-  description: |-
-    JAX-RPC specific configuration
-    JAX-RPC support was removed in JBoss EAP 7. All the RPC calls will need to be migrated to JAX-WS.
+  description: JAX-RPC specific configuration
   effort: 3
   labels:
   - konveyor.io/source=eap5
@@ -379,7 +368,7 @@
         xpath: /java-wsdl-mapping | /jee:java-wsdl-mapping | /jcp:java-wsdl-mapping
           | /j2ee:java-wsdl-mapping
 - customVariables: []
-  description: |
+  description: |-
     JSR-88 deployment plans are no more supported by JBoss EAP7
     This file should be removed and instead rely on proprietary functionality to automate deployments. Please consult EAP 7 admin documentation to learn about such functionality.
   labels:
@@ -403,9 +392,7 @@
       pattern: deployment-plan\.xml
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config replication-trigger changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `replication-trigger` element in `jboss-web.xml` file descriptor.
+  description: Web Session Clustering config replication-trigger changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -422,8 +409,8 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `replication-trigger`
-    element in `jboss-web.xml` file descriptor.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `replication-trigger`
+    element in `jboss-web.xml` file descriptor.\n "
   ruleID: jboss-eap5and6to7-xml-38000
   when:
     builtin.xml:
@@ -433,9 +420,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='replication-trigger']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config replication-mode changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates element `replication-mode` element without replacement in `jboss-web.xml` file descriptor.
+  description: Web Session Clustering config replication-mode changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -452,8 +437,8 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates element `replication-mode`
-    element without replacement in `jboss-web.xml` file descriptor.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates element `replication-mode`
+    element without replacement in `jboss-web.xml` file descriptor.\n "
   ruleID: jboss-eap5and6to7-xml-38001
   when:
     builtin.xml:
@@ -463,9 +448,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='replication-mode']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config backups changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `backups` element without replacement in `jboss-web.xml` file descriptor.
+  description: Web Session Clustering config backups changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -482,8 +465,8 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `backups` element
-    without replacement in `jboss-web.xml` file descriptor.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `backups`
+    element without replacement in `jboss-web.xml` file descriptor.\n "
   ruleID: jboss-eap5and6to7-xml-38002
   when:
     builtin.xml:
@@ -493,9 +476,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='backups']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config use-jk changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `use-jk` element without replacement in `jboss-web.xml` file descriptor.. Previously by specifying `use-jk` element, the instance-id of the node handling a given request was appended to the jsessionid (foruse by load balancers such as mod_jk, mod_proxy_balancer, mod_cluster, etc.) depending on the value specified for `use-jk`.. In the new implementation, the instance-id, if defined, is always appended to the jsessionid.
+  description: Web Session Clustering config use-jk changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -512,12 +493,12 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `use-jk` element
-    without replacement in `jboss-web.xml` file descriptor.. Previously by specifying
-    `use-jk` element, the instance-id of the node handling a given request was appended
-    to the jsessionid (foruse by load balancers such as mod_jk, mod_proxy_balancer,
-    mod_cluster, etc.) depending on the value specified for `use-jk`.. In the new
-    implementation, the instance-id, if defined, is always appended to the jsessionid.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `use-jk`
+    element without replacement in `jboss-web.xml` file descriptor.\n\n Previously
+    by specifying `use-jk` element, the instance-id of the node handling a given request
+    was appended to the jsessionid (foruse by load balancers such as mod_jk, mod_proxy_balancer,
+    mod_cluster, etc.) depending on the value specified for `use-jk`.\n\n In the new
+    implementation, the instance-id, if defined, is always appended to the jsessionid.\n "
   ruleID: jboss-eap5and6to7-xml-38003
   when:
     builtin.xml:
@@ -527,9 +508,8 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='use-jk']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config max-unreplicated-interval changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `max-unreplicated-interval` element in `jboss-web.xml` file descriptor.. Previously, this configuration option was an optimization that would prevent the replication of a session’s timestamp if no session attribute was changed. While this sounds nice, in practice it doesn't prevent any RPCs, since session access requires cache transaction RPCs regardless of whether any session attributes changed.. In the new implementation, the timestamp of a session is replicated on every request.. This prevents stale session metadata following failover.
+  description: Web Session Clustering config max-unreplicated-interval changes in
+    EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -546,14 +526,14 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `max-unreplicated-interval`
-    element in `jboss-web.xml` file descriptor.. Previously, this configuration option
-    was an optimization that would prevent the replication of a session’s timestamp
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `max-unreplicated-interval`
+    element in `jboss-web.xml` file descriptor.\n\n Previously, this configuration
+    option was an optimization that would prevent the replication of a session’s timestamp
     if no session attribute was changed. While this sounds nice, in practice it doesn't
     prevent any RPCs, since session access requires cache transaction RPCs regardless
-    of whether any session attributes changed.. In the new implementation, the timestamp
-    of a session is replicated on every request.. This prevents stale session metadata
-    following failover.
+    of whether any session attributes changed.\n\n In the new implementation, the
+    timestamp of a session is replicated on every request.\n This prevents stale session
+    metadata following failover.\n "
   ruleID: jboss-eap5and6to7-xml-38004
   when:
     builtin.xml:
@@ -563,9 +543,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='max-unreplicated-interval']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config snapshot-mode changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `snapshot-mode` element in `jboss-web.xml` file descriptor.. Previously, one could configure `snapshot-mode` as INSTANT or INTERVAL. Infinispan’s replication queue renders this configuration option obsolete.
+  description: Web Session Clustering config snapshot-mode changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -582,10 +560,10 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `snapshot-mode`
-    element in `jboss-web.xml` file descriptor.. Previously, one could configure `snapshot-mode`
-    as INSTANT or INTERVAL. Infinispan’s replication queue renders this configuration
-    option obsolete.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `snapshot-mode`
+    element in `jboss-web.xml` file descriptor.\n\n Previously, one could configure
+    `snapshot-mode` as INSTANT or INTERVAL. Infinispan’s replication queue renders
+    this configuration option obsolete.\n "
   ruleID: jboss-eap5and6to7-xml-38005
   when:
     builtin.xml:
@@ -595,9 +573,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='snapshot-mode']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config snapshot-interval changes in EAP 7
-    The EAP 7 Web Session Clustering configuration removed `snapshot-interval` element from `jboss-web.xml` file descriptor.. This option was only relevant for `<snapshot-mode>INTERVAL</snapshot-mode>`. Since `snapshot-mode` is no longer used, this option is no longer used as well.
+  description: Web Session Clustering config snapshot-interval changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -614,10 +590,10 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration removed `snapshot-interval`
-    element from `jboss-web.xml` file descriptor.. This option was only relevant for
-    `<snapshot-mode>INTERVAL</snapshot-mode>`. Since `snapshot-mode` is no longer
-    used, this option is no longer used as well.
+  message: "\n The EAP 7 Web Session Clustering configuration removed `snapshot-interval`
+    element from `jboss-web.xml` file descriptor.\n This option was only relevant
+    for `<snapshot-mode>INTERVAL</snapshot-mode>`. Since `snapshot-mode` is no longer
+    used, this option is no longer used as well.\n "
   ruleID: jboss-eap5and6to7-xml-38006
   when:
     builtin.xml:
@@ -627,9 +603,8 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='snapshot-interval']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config session-notification-policy changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `session-notification-policy` element in `jboss-web.xml` file descriptor.. Previously `session-notification-policy` element defined a policy for triggering session events.. In the new implementation, this behaviour is specification driven and not configurable.
+  description: Web Session Clustering config session-notification-policy changes in
+    EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -646,10 +621,10 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `session-notification-policy`
-    element in `jboss-web.xml` file descriptor.. Previously `session-notification-policy`
-    element defined a policy for triggering session events.. In the new implementation,
-    this behaviour is specification driven and not configurable.
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `session-notification-policy`
+    element in `jboss-web.xml` file descriptor.\n\n Previously `session-notification-policy`
+    element defined a policy for triggering session events.\n\n In the new implementation,
+    this behaviour is specification driven and not configurable.\n "
   ruleID: jboss-eap5and6to7-xml-38007
   when:
     builtin.xml:
@@ -659,9 +634,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='replication-config']/*[local-name()='session-notification-policy']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config passivation-config changes in EAP 7
-    The EAP 7 Web Session Clustering configuration deprecates `passivation-config` element and its sub-elements `use-session-passivation`, `passivation-min-idle-time` and `passivation-max-idle-time` completely in `jboss-web.xml` file descriptor.. * `use-session-passivation` enabled the passivation, but now passivation is enabled by specifying a non-negative value for `max-active-sessions` element.. * `passivation-min-idle-time` is not supported and the new implementation avoids waiting some time before the passivation.. * `passivation-max-idle-time` is not supported and the new implementation supports only lazy passivation. Sessions are only passivated when necessary to comply with `max-active-sessions`.
+  description: Web Session Clustering config passivation-config changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -678,15 +651,15 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration deprecates `passivation-config`
+  message: "\n The EAP 7 Web Session Clustering configuration deprecates `passivation-config`
     element and its sub-elements `use-session-passivation`, `passivation-min-idle-time`
-    and `passivation-max-idle-time` completely in `jboss-web.xml` file descriptor..
+    and `passivation-max-idle-time` completely in `jboss-web.xml` file descriptor.\n\n
     * `use-session-passivation` enabled the passivation, but now passivation is enabled
-    by specifying a non-negative value for `max-active-sessions` element.. * `passivation-min-idle-time`
+    by specifying a non-negative value for `max-active-sessions` element.\n\n * `passivation-min-idle-time`
     is not supported and the new implementation avoids waiting some time before the
-    passivation.. * `passivation-max-idle-time` is not supported and the new implementation
+    passivation.\n\n * `passivation-max-idle-time` is not supported and the new implementation
     supports only lazy passivation. Sessions are only passivated when necessary to
-    comply with `max-active-sessions`.
+    comply with `max-active-sessions`.\n "
   ruleID: jboss-eap5and6to7-xml-39000
   when:
     builtin.xml:
@@ -696,9 +669,7 @@
       xpath: /*[local-name()='jboss-web']/*[local-name()='passivation-config']
 - category: optional
   customVariables: []
-  description: |-
-    Web Session Clustering config max-active-sessions changes in EAP 7
-    The EAP 7 Web Session Clustering configuration changed `max-active-sessions` element meaning in `jboss-web.xml` file descriptor.. Previously, session creation would fail if an additional session would cause the number of active sessions to exceed the value specified by `<max-active-sessions/>`.. In the new implementation, `<max-active-sessions/>` is used to enable session passivation. If session creation would cause the number of active sessions to exceed `<max-active-sessions/>`,. then the oldest session known to the session manager will passivate to make room for the new session.
+  description: Web Session Clustering config max-active-sessions changes in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap5
@@ -715,14 +686,14 @@
   links:
   - title: Web Session Clustering config migration changes in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_web_session_clustering_changes
-  message: The EAP 7 Web Session Clustering configuration changed `max-active-sessions`
-    element meaning in `jboss-web.xml` file descriptor.. Previously, session creation
+  message: "\n The EAP 7 Web Session Clustering configuration changed `max-active-sessions`
+    element meaning in `jboss-web.xml` file descriptor.\n\n Previously, session creation
     would fail if an additional session would cause the number of active sessions
-    to exceed the value specified by `<max-active-sessions/>`.. In the new implementation,
+    to exceed the value specified by `<max-active-sessions/>`.\n\n In the new implementation,
     `<max-active-sessions/>` is used to enable session passivation. If session creation
-    would cause the number of active sessions to exceed `<max-active-sessions/>`,.
+    would cause the number of active sessions to exceed `<max-active-sessions/>`,\n
     then the oldest session known to the session manager will passivate to make room
-    for the new session.
+    for the new session.\n "
   ruleID: jboss-eap5and6to7-xml-40000
   when:
     builtin.xml:
diff --git a/default/generated/eap7/72-resteasy.windup.yaml b/default/generated/eap7/72-resteasy.windup.yaml
index 7c9395e2..4b0463d7 100644
--- a/default/generated/eap7/72-resteasy.windup.yaml
+++ b/default/generated/eap7/72-resteasy.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class SimpleServerCache in RESTEasy 3
-    Use `org.jboss.resteasy.plugins.cache.server.InfinispanCache` instead of `org.jboss.resteasy.plugins.cache.server.SimpleServerCache`.
+  description: Deprecated class SimpleServerCache in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap5
diff --git a/default/generated/eap7/73-eap6-xml.windup.yaml b/default/generated/eap7/73-eap6-xml.windup.yaml
index a8989ad3..e8e8d233 100644
--- a/default/generated/eap7/73-eap6-xml.windup.yaml
+++ b/default/generated/eap7/73-eap6-xml.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     JMS proprietary resource definitions
 
                             The proprietary XML descriptors, previously used to setup JMS resources, are deprecated in EAP 7.
@@ -30,7 +30,7 @@
           msg: urn:jboss:messaging-deployment:1.0
         xpath: /msg:messaging-deployment
 - customVariables: []
-  description: |
+  description: |-
     JBoss deployment structure dependencies (jboss-deployment-structure.xml)
     Verify in advance that all the modules this application depends on still exist.
   labels:
diff --git a/default/generated/eap7/74-eap6.windup.yaml b/default/generated/eap7/74-eap6.windup.yaml
index 4bb78385..035f4d70 100644
--- a/default/generated/eap7/74-eap6.windup.yaml
+++ b/default/generated/eap7/74-eap6.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Remote JNDI Provider URL has changed in EAP 7
-    Default Remote JNDI Provider URL has changed in EAP 7. External applications using JNDI to lookup remote resources, for instance an EJB or a JMS Queue,. may need to change the value for the JNDI InitialContext environment's property named `java.naming.provider.url`.. The default URL scheme is now **http-remoting** instead of **remote**, and the default URL port is now **8080** instead of **4447**.. As an example, consider the application server host is localhost, then clients previously accessing EAP 6 would use. ```. java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory. java.naming.provider.url=remote://localhost:4447. ```. while clients now accessing EAP 7 should use instead. ```. java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory. java.naming.provider.url=http-remoting://localhost:8080. ```
+  description: Remote JNDI Provider URL has changed in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -15,16 +13,16 @@
   links:
   - title: Remote JNDI URL in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_default_remote_url_connector_and_port_changes
-  message: Default Remote JNDI Provider URL has changed in EAP 7. External applications
-    using JNDI to lookup remote resources, for instance an EJB or a JMS Queue,. may
+  message: "\n Default Remote JNDI Provider URL has changed in EAP 7. External applications
+    using JNDI to lookup remote resources, for instance an EJB or a JMS Queue,\n may
     need to change the value for the JNDI InitialContext environment's property named
-    `java.naming.provider.url`.. The default URL scheme is now **http-remoting** instead
-    of **remote**, and the default URL port is now **8080** instead of **4447**..
+    `java.naming.provider.url`.\n The default URL scheme is now **http-remoting**
+    instead of **remote**, and the default URL port is now **8080** instead of **4447**.\n\n
     As an example, consider the application server host is localhost, then clients
-    previously accessing EAP 6 would use. ```. java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory.
-    java.naming.provider.url=remote://localhost:4447. ```. while clients now accessing
-    EAP 7 should use instead. ```. java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory.
-    java.naming.provider.url=http-remoting://localhost:8080. ```
+    previously accessing EAP 6 would use\n\n ```\n java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory\n
+    java.naming.provider.url=remote://localhost:4447\n ```\n\n while clients now accessing
+    EAP 7 should use instead\n\n ```\n java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory\n
+    java.naming.provider.url=http-remoting://localhost:8080\n ```\n\n "
   ruleID: eap6-08000
   when:
     builtin.filecontent:
@@ -32,9 +30,7 @@
       pattern: remote://.*:\d*
 - category: mandatory
   customVariables: []
-  description: |-
-    jboss-ejb-client.properties - Default Remote Connection Port changes
-    The default remote connection port has changed in **jboss-ejb-client.properties** from '4447' to '8080'.. In EAP 6, the jboss-ejb-client.properties file looked similar to the following:. ```. remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false. remote.connections=default. remote.connection.default.host=localhost. remote.connection.default.port=4447. remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false. ```. In EAP 7, the properties file looks like this:. ```. remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false. remote.connections=default. remote.connection.default.host=localhost. remote.connection.default.port=8080. remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false. ```
+  description: jboss-ejb-client.properties - Default Remote Connection Port changes
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -47,15 +43,15 @@
   links:
   - title: Remote JNDI URL in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#update_the_default_remote_connection_port
-  message: The default remote connection port has changed in **jboss-ejb-client.properties**
-    from '4447' to '8080'.. In EAP 6, the jboss-ejb-client.properties file looked
-    similar to the following:. ```. remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false.
-    remote.connections=default. remote.connection.default.host=localhost. remote.connection.default.port=4447.
-    remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false.
-    ```. In EAP 7, the properties file looks like this:. ```. remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false.
-    remote.connections=default. remote.connection.default.host=localhost. remote.connection.default.port=8080.
-    remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false.
-    ```
+  message: "\n The default remote connection port has changed in **jboss-ejb-client.properties**
+    from '4447' to '8080'.\n\n In EAP 6, the jboss-ejb-client.properties file looked
+    similar to the following:\n\n ```\n remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false\n
+    remote.connections=default\n remote.connection.default.host=localhost\n remote.connection.default.port=4447\n
+    remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false\n
+    ```\n\n In EAP 7, the properties file looks like this:\n\n ```\n remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false\n
+    remote.connections=default\n remote.connection.default.host=localhost\n remote.connection.default.port=8080\n
+    remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false\n
+    ```\n\n "
   ruleID: eap6-08001
   when:
     builtin.filecontent:
@@ -63,9 +59,7 @@
       pattern: remote.connection..*.port(.*(?!8080)\d{4})
 - category: mandatory
   customVariables: []
-  description: |-
-    Java - Default Remote Connection Port has changed in EAP 7
-    The default remote connection port has changed from '4447' to '8080'.. In EAP 6, Remote EJB client Java code looks like the following:. ```java. Properties properties = new Properties();. properties.put("remote.connection.default.port", "4447");. ```. In EAP 7, the Java client code looks like this:. ```java. Properties properties = new Properties();. properties.put("remote.connection.default.port", "8080");. ```
+  description: Java - Default Remote Connection Port has changed in EAP 7
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -78,12 +72,12 @@
   links:
   - title: Remote JNDI URL in EAP 7
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#update_the_default_remote_connection_port
-  message: The default remote connection port has changed from '4447' to '8080'..
-    In EAP 6, Remote EJB client Java code looks like the following:. ```java. Properties
-    properties = new Properties();. properties.put("remote.connection.default.port",
-    "4447");. ```. In EAP 7, the Java client code looks like this:. ```java. Properties
-    properties = new Properties();. properties.put("remote.connection.default.port",
-    "8080");. ```
+  message: "\n The default remote connection port has changed from '4447' to '8080'.\n\n
+    In EAP 6, Remote EJB client Java code looks like the following:\n\n ```java\n
+    Properties properties = new Properties();\n properties.put(\"remote.connection.default.port\",
+    \"4447\");\n ```\n\n In EAP 7, the Java client code looks like this:\n\n ```java\n
+    Properties properties = new Properties();\n properties.put(\"remote.connection.default.port\",
+    \"8080\");\n ```\n\n "
   ruleID: eap6-08002
   when:
     builtin.filecontent:
@@ -91,9 +85,7 @@
       pattern: remote.connection..*.port(.*(?!8080)\d{4})
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF FaceletContext.FACELET_CONTEXT_KEY changed value
-    The value of JSF constant `FaceletContext.FACELET_CONTEXT_KEY` has changed between JSF 2.1 and 2.2.. The variable is a compile-time constant expression, so when the program was originally compiled,. the reference to `FACELET_CONTEXT_KEY` was replaced by its value during compilation.. The application must be recompiled so that the reference to `FACELET_CONTEXT_KEY` is replaced by its new value.
+  description: JSF FaceletContext.FACELET_CONTEXT_KEY changed value
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -104,11 +96,11 @@
   links:
   - title: Compatibility Issue Between JSF 2.1 and JSF 2.2
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#compatibility_issue_between_jsf_2_1_and_jsf_2_2
-  message: The value of JSF constant `FaceletContext.FACELET_CONTEXT_KEY` has changed
-    between JSF 2.1 and 2.2.. The variable is a compile-time constant expression,
-    so when the program was originally compiled,. the reference to `FACELET_CONTEXT_KEY`
-    was replaced by its value during compilation.. The application must be recompiled
-    so that the reference to `FACELET_CONTEXT_KEY` is replaced by its new value.
+  message: "\n The value of JSF constant `FaceletContext.FACELET_CONTEXT_KEY` has
+    changed between JSF 2.1 and 2.2.\n The variable is a compile-time constant expression,
+    so when the program was originally compiled,\n the reference to `FACELET_CONTEXT_KEY`
+    was replaced by its value during compilation.\n The application must be recompiled
+    so that the reference to `FACELET_CONTEXT_KEY` is replaced by its new value.\n "
   ruleID: eap6-11000
   when:
     or:
@@ -120,9 +112,7 @@
         pattern: FaceletContext.FACELET_CONTEXT_KEY
 - category: mandatory
   customVariables: []
-  description: |-
-    HTTPS URL hostname check against a service’s Common Name (CN) changed
-    In EAP 6, you could disable the HTTPS URL hostname check against a service’s Common Name (CN) given in its certificate by setting the system property `org.jboss.security.ignoreHttpsHost` to `true`. This system property name has been replaced with `cxf.tls-client.disableCNCheck` in EAP 7.
+  description: HTTPS URL hostname check against a service’s Common Name (CN) changed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -134,10 +124,10 @@
   links:
   - title: IgnoreHttpsHost CN Check Change
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#changes_to_set_cookie_behavior
-  message: In EAP 6, you could disable the HTTPS URL hostname check against a service’s
+  message: "In EAP 6, you could disable the HTTPS URL hostname check against a service’s
     Common Name (CN) given in its certificate by setting the system property `org.jboss.security.ignoreHttpsHost`
     to `true`. This system property name has been replaced with `cxf.tls-client.disableCNCheck`
-    in EAP 7.
+    in EAP 7. \n "
   ruleID: eap6-12000
   when:
     builtin.filecontent:
diff --git a/default/generated/eap7/75-hibernate4-xml.windup.yaml b/default/generated/eap7/75-hibernate4-xml.windup.yaml
index dd660106..f3ed7c0c 100644
--- a/default/generated/eap7/75-hibernate4-xml.windup.yaml
+++ b/default/generated/eap7/75-hibernate4-xml.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate: Deprecated property hibernate.transaction.factory_class
-    Replace configuration transaction property `hibernate.transaction.factory_class`. with `hibernate.transaction.coordinator_class`.. Next the contract in `hibernate.transaction.coordinator_class` property should refer to `org.hibernate.resource.transaction.TransactionCoordinatorBuilder`. instead of to `org.hibernate.engine.transaction.spi.TransactionFactory`. If a JPA application does not provide a setting for `hibernate.transaction.coordinator_class`, Hibernate will automatically build the proper transaction coordinator based on the transaction type for the persistence unit.. If a non-JPA application does not provide a setting for `hibernate.transaction.coordinator_class`, Hibernate will use jdbc as the default. This default will cause problems if the application actually uses JTA-based transactions. A non-JPA application that uses JTA-based transactions should explicitly set `hibernate.transaction.coordinator_class=jta` or provide a custom `org.hibernate.resource.transaction.TransactionCoordinatorBuilder` that builds a `org.hibernate.resource.transaction.TransactionCoordinator` that properly coordinates with JTA-based transactions.
+  description: 'Hibernate: Deprecated property hibernate.transaction.factory_class'
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -21,20 +19,20 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migration_hibernate_orm_changes_transactions
   - title: Hibernate javadoc for org.hibernate.cfg.AvailableSettings.TRANSACTION_COORDINATOR_STRATEGY
     url: https://docs.jboss.org/hibernate/orm/5.1/javadocs/index.html?org/hibernate/cfg/AvailableSettings.html#TRANSACTION_COORDINATOR_STRATEGY
-  message: Replace configuration transaction property `hibernate.transaction.factory_class`.
-    with `hibernate.transaction.coordinator_class`.. Next the contract in `hibernate.transaction.coordinator_class`
-    property should refer to `org.hibernate.resource.transaction.TransactionCoordinatorBuilder`.
-    instead of to `org.hibernate.engine.transaction.spi.TransactionFactory`. If a
-    JPA application does not provide a setting for `hibernate.transaction.coordinator_class`,
+  message: "\n Replace configuration transaction property `hibernate.transaction.factory_class`\n
+    with `hibernate.transaction.coordinator_class`.\n\n Next the contract in `hibernate.transaction.coordinator_class`
+    property should refer to `org.hibernate.resource.transaction.TransactionCoordinatorBuilder`\n
+    instead of to `org.hibernate.engine.transaction.spi.TransactionFactory`\n\n If
+    a JPA application does not provide a setting for `hibernate.transaction.coordinator_class`,
     Hibernate will automatically build the proper transaction coordinator based on
-    the transaction type for the persistence unit.. If a non-JPA application does
+    the transaction type for the persistence unit.\n\n If a non-JPA application does
     not provide a setting for `hibernate.transaction.coordinator_class`, Hibernate
     will use jdbc as the default. This default will cause problems if the application
     actually uses JTA-based transactions. A non-JPA application that uses JTA-based
     transactions should explicitly set `hibernate.transaction.coordinator_class=jta`
     or provide a custom `org.hibernate.resource.transaction.TransactionCoordinatorBuilder`
     that builds a `org.hibernate.resource.transaction.TransactionCoordinator` that
-    properly coordinates with JTA-based transactions.
+    properly coordinates with JTA-based transactions.\n "
   ruleID: hibernate4-xml-00001
   when:
     builtin.filecontent:
@@ -42,9 +40,8 @@
       pattern: hibernate.transaction.factory_class
 - category: mandatory
   customVariables: []
-  description: |-
-    Class org.hibernate.id.{idclass} was removed/deprecated in Hibernate 5
-    Use `org.hibernate.id.enhanced.SequenceStyleGenerator` instead.
+  description: Class org.hibernate.id.{idclass} was removed/deprecated in Hibernate
+    5
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -68,8 +65,8 @@
       pattern: org.hibernate.id.(TableGenerator|TableHiLoGenerator|SequenceGenerator|SequenceIdentityGenerator|SequenceHiLoGenerator)
 - category: mandatory
   customVariables: []
-  description: |
-    Identifier generator {generator} was removed/deprecated in Hibernate 5
+  description: Identifier generator {generator} was removed/deprecated in Hibernate
+    5
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -101,9 +98,7 @@
         xpath: //generator/@class[matches(self::node(), '(seqhilo|sequence-identity|hilo)')]
 - category: mandatory
   customVariables: []
-  description: |-
-    TemporaryTableBulkIdStrategy was replaced in Hibernate 5
-    Since Hibernate 5, the `org.hibernate.hql.spi.TemporaryTableBulkIdStrategy` class was replaced by `org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy` and `org.hibernate.hql.spi.id.local.LocalTemporaryTableBulkIdStrategy`.
+  description: TemporaryTableBulkIdStrategy was replaced in Hibernate 5
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -135,9 +130,7 @@
         xpath: //property[text() = 'org.hibernate.hql.spi.TemporaryTableBulkIdStrategy']
 - category: mandatory
   customVariables: []
-  description: |-
-    Class PersistentTableBulkIdStrategy was moved in Hibernate 5
-    Since Hibernate 5, the `org.hibernate.hql.spi.PersistentTableBulkIdStrategy` class was moved to new package and you should use it as `org.hibernate.hql.spi.id.persistent.PersistentTableBulkIdStrategy`.
+  description: Class PersistentTableBulkIdStrategy was moved in Hibernate 5
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
diff --git a/default/generated/eap7/76-hibernate4.windup.yaml b/default/generated/eap7/76-hibernate4.windup.yaml
index a7385c9c..cbdd9f05 100644
--- a/default/generated/eap7/76-hibernate4.windup.yaml
+++ b/default/generated/eap7/76-hibernate4.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addFile()
-    Use `org.hibernate.boot.MetadataSources#addFile` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addFile()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -28,9 +26,7 @@
       pattern: org.hibernate.cfg.Configuration.addFile*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.add()
-    There is no direct replacement for method `org.hibernate.cfg.Configuration#add()`.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.add()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -56,9 +52,7 @@
       pattern: org.hibernate.cfg.Configuration.add*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addXML()
-    There is no direct replacement for method `org.hibernate.cfg.Configuration#addXML`.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addXML()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -84,9 +78,7 @@
       pattern: org.hibernate.cfg.Configuration.addXML*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addCacheableFile()
-    Use `org.hibernate.boot.MetadataSources#addCacheableFile` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addCacheableFile()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -112,9 +104,7 @@
       pattern: org.hibernate.cfg.Configuration.addCacheableFile*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addURL()
-    Use `org.hibernate.boot.MetadataSources#addURL` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addURL()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -140,9 +130,7 @@
       pattern: org.hibernate.cfg.Configuration.addURL*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addInputStream()
-    Use `org.hibernate.boot.MetadataSources#addInputStream` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addInputStream()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -168,9 +156,7 @@
       pattern: org.hibernate.cfg.Configuration.addInputStream*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addResource()
-    Use `org.hibernate.boot.MetadataSources#addResource` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addResource()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -196,9 +182,7 @@
       pattern: org.hibernate.cfg.Configuration.addResource*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addClass()
-    Use `org.hibernate.boot.MetadataSources#addClass` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addClass()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -224,9 +208,7 @@
       pattern: org.hibernate.cfg.Configuration.addClass*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addAnnotatedClass()
-    Use `org.hibernate.boot.MetadataSources#addAnnotatedClass` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addAnnotatedClass()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -252,9 +234,7 @@
       pattern: org.hibernate.cfg.Configuration.addAnnotatedClass*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addPackage()
-    Use `org.hibernate.boot.MetadataSources#addPackage` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addPackage()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -280,9 +260,7 @@
       pattern: org.hibernate.cfg.Configuration.addPackage*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addJar()
-    Use `org.hibernate.boot.MetadataSources#addJar` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addJar()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -308,9 +286,7 @@
       pattern: org.hibernate.cfg.Configuration.addJar*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addDirectory()
-    Use `org.hibernate.boot.MetadataSources#addDirectory` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addDirectory()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -336,9 +312,7 @@
       pattern: org.hibernate.cfg.Configuration.addDirectory*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.registerTypeContributor()
-    Use `org.hibernate.boot.MetadataBuilder#applyTypes` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.registerTypeContributor()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -364,9 +338,7 @@
       pattern: org.hibernate.cfg.Configuration.registerTypeContributor*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.registerTypeOverride()
-    Use `org.hibernate.boot.MetadataBuilder#applyBasicType` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.registerTypeOverride()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -392,9 +364,7 @@
       pattern: org.hibernate.cfg.Configuration.registerTypeOverride*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setProperty()
-    Use `org.hibernate.boot.registry.StandardServiceRegistryBuilder#applySetting` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setProperty()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -421,9 +391,7 @@
       pattern: org.hibernate.cfg.Configuration.setProperty*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setProperties()
-    There is no direct replacement.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setProperties()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -449,9 +417,7 @@
       pattern: org.hibernate.cfg.Configuration.setProperties*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addProperties()
-    Use `org.hibernate.boot.registry.StandardServiceRegistryBuilder#applySettings` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.addProperties()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -478,9 +444,7 @@
       pattern: org.hibernate.cfg.Configuration.addProperties*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setNamingStrategy()
-    Historically Hibernate provided just a singular contract for applying a "naming strategy".. Starting in 5.0 this has been split into 2 distinct contracts:. * ImplicitNamingStrategy - is used whenever a table or column is not explicitly named to determine the name to use.. * PhysicalNamingStrategy - is used to convert a "logical name" (either implicit or explicit) name of a table or column into a physical name (e.g. following corporate naming guidelines). Use methods `org.hibernate.boot.MetadataBuilder#setImplicitNamingStrategy(ImplicitNamingStrategy implicitNamingStrategy)` or. `org.hibernate.boot.MetadataBuilder#setPhysicalNamingStrategy(PhysicalNamingStrategy physicalNamingStrategy)`. instead of `public Configuration setNamingStrategy(NamingStrategy namingStrategy)()`
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setNamingStrategy()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -498,15 +462,15 @@
     url: https://github.com/hibernate/hibernate-orm/blob/5.0/migration-guide.adoc#re-purposing-of-configuration
   - title: Hibernate and JPA migration changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#hibernate_and_jpa_migration_changes
-  message: Historically Hibernate provided just a singular contract for applying a
-    "naming strategy".. Starting in 5.0 this has been split into 2 distinct contracts:.
+  message: "\n Historically Hibernate provided just a singular contract for applying
+    a \"naming strategy\".\n Starting in 5.0 this has been split into 2 distinct contracts:\n\n
     * ImplicitNamingStrategy - is used whenever a table or column is not explicitly
-    named to determine the name to use.. * PhysicalNamingStrategy - is used to convert
-    a "logical name" (either implicit or explicit) name of a table or column into
-    a physical name (e.g. following corporate naming guidelines). Use methods `org.hibernate.boot.MetadataBuilder#setImplicitNamingStrategy(ImplicitNamingStrategy
-    implicitNamingStrategy)` or. `org.hibernate.boot.MetadataBuilder#setPhysicalNamingStrategy(PhysicalNamingStrategy
-    physicalNamingStrategy)`. instead of `public Configuration setNamingStrategy(NamingStrategy
-    namingStrategy)()`
+    named to determine the name to use.\n * PhysicalNamingStrategy - is used to convert
+    a \"logical name\" (either implicit or explicit) name of a table or column into
+    a physical name (e.g. following corporate naming guidelines)\n\n Use methods `org.hibernate.boot.MetadataBuilder#setImplicitNamingStrategy(ImplicitNamingStrategy
+    implicitNamingStrategy)` or\n `org.hibernate.boot.MetadataBuilder#setPhysicalNamingStrategy(PhysicalNamingStrategy
+    physicalNamingStrategy)`\n instead of `public Configuration setNamingStrategy(NamingStrategy
+    namingStrategy)()`\n "
   ruleID: hibernate4-00018
   when:
     java.referenced:
@@ -517,9 +481,7 @@
   - name: configure
     nameOfCaptureGroup: configure
     pattern: org.hibernate.cfg.Configuration.(?P<configure>(configure\([^)]*\)))
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.configure()
-    Use `org.hibernate.boot.registry.StandardServiceRegistryBuilder#configure` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.configure()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -546,9 +508,7 @@
       pattern: org.hibernate.cfg.Configuration.(configure([^)]*))
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setInterceptor()
-    Use `org.hibernate.boot.SessionFactoryBuilder#applyInterceptor` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setInterceptor()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -574,9 +534,7 @@
       pattern: org.hibernate.cfg.Configuration.setInterceptor*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setEntityNotFoundDelegate()
-    Use `org.hibernate.boot.SessionFactoryBuilder#applyEntityNotFoundDelegate` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setEntityNotFoundDelegate()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -603,9 +561,7 @@
       pattern: org.hibernate.cfg.Configuration.setEntityNotFoundDelegate*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setSessionFactoryObserver()
-    Use `org.hibernate.boot.SessionFactoryBuilder#addSessionFactoryObservers` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setSessionFactoryObserver()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -632,9 +588,7 @@
       pattern: org.hibernate.cfg.Configuration.setSessionFactoryObserver*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setCurrentTenantIdentifierResolver()
-    Use `org.hibernate.boot.SessionFactoryBuilder#applyCurrentTenantIdentifierResolver` instead.
+  description: Hibernate 5 - Deprecated method org.hibernate.cfg.Configuration.setCurrentTenantIdentifierResolver()
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -664,8 +618,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.hibernate.metamodel.spi.(?P<type>(TypeContributor|TypeContributions))
-  description: |
-    Hibernate 5 - Moved method org.hibernate.metamodel.spi.{type}
+  description: Hibernate 5 - Moved method org.hibernate.metamodel.spi.{type}
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -690,9 +643,7 @@
       pattern: org.hibernate.metamodel.spi.(TypeContributor|TypeContributions)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Removed class org.hibernate.cfg.AnnotationConfiguration
-    All functionality from `org.hibernate.cfg.AnnotationConfiguration` has been moved to `org.hibernate.cfg.Configuration`.
+  description: Hibernate 5 - Removed class org.hibernate.cfg.AnnotationConfiguration
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -710,8 +661,8 @@
     url: https://github.com/hibernate/hibernate-orm/blob/5.0/migration-guide.adoc#deprecations
   - title: Removed and Deprecated Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migration_hibernate_orm_changes_deprecations
-  message: All functionality from `org.hibernate.cfg.AnnotationConfiguration` has
-    been moved to `org.hibernate.cfg.Configuration`.
+  message: "\n All functionality from `org.hibernate.cfg.AnnotationConfiguration`
+    has been moved to `org.hibernate.cfg.Configuration`.\n "
   ruleID: hibernate4-00027
   when:
     java.referenced:
@@ -721,9 +672,7 @@
   - name: idclass
     nameOfCaptureGroup: idclass
     pattern: org.hibernate.id.(?P<idclass>(TableGenerator|TableHiLoGenerator|SequenceGenerator|SequenceIdentityGenerator|SequenceHiLoGenerator))
-  description: |-
-    Hibernate 5 - Removed deprecated class org.hibernate.id.{idclass}
-    Use `org.hibernate.id.enhanced.SequenceStyleGenerator` instead.
+  description: Hibernate 5 - Removed deprecated class org.hibernate.id.{idclass}
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -751,8 +700,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.hibernate.hql.spi.(?P<type>(MultiTableBulkIdStrategy|MultiTableBulkIdStrategy.DeleteHandler|MultiTableBulkIdStrategy.UpdateHandler|AbstractTableBasedBulkIdHandler|AbstractTableBasedBulkIdHandler.ProcessedWhereClause|TableBasedDeleteHandlerImpl|TableBasedUpdateHandlerImpl))
-  description: |
-    Hibernate 5 - Moved class org.hibernate.hql.spi.{type}
+  description: Hibernate 5 - Moved class org.hibernate.hql.spi.{type}
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -776,9 +724,7 @@
       pattern: org.hibernate.hql.spi.(MultiTableBulkIdStrategy|MultiTableBulkIdStrategy.DeleteHandler|MultiTableBulkIdStrategy.UpdateHandler|AbstractTableBasedBulkIdHandler|AbstractTableBasedBulkIdHandler.ProcessedWhereClause|TableBasedDeleteHandlerImpl|TableBasedUpdateHandlerImpl)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Moved class org.hibernate.hql.spi.PersistentTableBulkIdStrategy
-    Hibernate 5 moved `org.hibernate.hql.spi.PersistentTableBulkIdStrategy` class to new `org.hibernate.hql.spi.id.persistent` package.
+  description: Hibernate 5 - Moved class org.hibernate.hql.spi.PersistentTableBulkIdStrategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -802,9 +748,7 @@
       pattern: org.hibernate.hql.spi.PersistentTableBulkIdStrategy
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Replaced class org.hibernate.hql.spi.TemporaryTableBulkIdStrategy
-    Hibernate 5 replaced `org.hibernate.hql.spi.TemporaryTableBulkIdStrategy` class with `org.hibernate.hql.spi.id.global.GlobalTemporaryTableBulkIdStrategy` and `org.hibernate.hql.spi.id.local.LocalTemporaryTableBulkIdStrategy`.
+  description: Hibernate 5 - Replaced class org.hibernate.hql.spi.TemporaryTableBulkIdStrategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -829,9 +773,7 @@
       pattern: org.hibernate.hql.spi.TemporaryTableBulkIdStrategy
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Changed interface org.hibernate.integrator.spi.Integrator
-    Hibernate 5 changed contract `org.hibernate.integrator.spi.Integrator` to account for bootstrap redesign.. Check if you implement method `integrate(Configuration configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry)` which is no longer there.
+  description: Hibernate 5 - Changed interface org.hibernate.integrator.spi.Integrator
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -849,10 +791,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migration_hibernate_orm_changes_other_classes
   - title: Hibernate 5 Changed or Moved Contracts
     url: https://github.com/hibernate/hibernate-orm/blob/5.0/migration-guide.adoc#changedmoved-contracts
-  message: Hibernate 5 changed contract `org.hibernate.integrator.spi.Integrator`
-    to account for bootstrap redesign.. Check if you implement method `integrate(Configuration
+  message: "Hibernate 5 changed contract `org.hibernate.integrator.spi.Integrator`
+    to account for bootstrap redesign.\n Check if you implement method `integrate(Configuration
     configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry
-    serviceRegistry)` which is no longer there.
+    serviceRegistry)` which is no longer there.\n "
   ruleID: hibernate4-00033
   when:
     java.referenced:
@@ -860,9 +802,7 @@
       pattern: org.hibernate.integrator.spi.Integrator
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Changed class org.hibernate.engine.jdbc.spi.JdbcServices
-    Hibernate 5 extracted new interface `org.hibernate.engine.jdbc.env.spi.JdbcEnvironment` from `org.hibernate.engine.jdbc.spi.JdbcServices`.
+  description: Hibernate 5 - Changed class org.hibernate.engine.jdbc.spi.JdbcServices
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -890,9 +830,7 @@
       pattern: org.hibernate.engine.jdbc.spi.JdbcServices
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Changed signature org.hibernate.id.Configurable
-    Hibernate 5 changed the signature of `org.hibernate.id.Configurable#configure` method to accept `ServiceRegistry` rather than just `Dialect`
+  description: Hibernate 5 - Changed signature org.hibernate.id.Configurable
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -919,9 +857,8 @@
       pattern: org.hibernate.id.Configurable
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - PersistentIdentifierGenerator implementations need to implement ExportableProducer#registerExportables
-    Since Hibernate 5, The `org.hibernate.id.PersistentIdentifierGenerator` extends new `org.hibernate.boot.model.relational.ExportableProducer` interface which will affect all `org.hibernate.id.PersistentIdentifierGenerator` implementations.. Therefore you need to implement additionally `ExportableProducer#registerExportables(org.hibernate.boot.model.relational.Database database)` method.
+  description: Hibernate 5 - PersistentIdentifierGenerator implementations need to
+    implement ExportableProducer#registerExportables
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -941,11 +878,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migration_hibernate_orm_changes_miscellaneous
   - title: Hibernate 5 ExportableProducer API
     url: https://docs.jboss.org/hibernate/orm/5.0/javadocs/org/hibernate/boot/model/relational/ExportableProducer.html#registerExportables-org.hibernate.boot.model.relational.Database-
-  message: Since Hibernate 5, The `org.hibernate.id.PersistentIdentifierGenerator`
-    extends new `org.hibernate.boot.model.relational.ExportableProducer` interface
-    which will affect all `org.hibernate.id.PersistentIdentifierGenerator` implementations..
-    Therefore you need to implement additionally `ExportableProducer#registerExportables(org.hibernate.boot.model.relational.Database
-    database)` method.
+  message: |-
+    Since Hibernate 5, The `org.hibernate.id.PersistentIdentifierGenerator` extends new `org.hibernate.boot.model.relational.ExportableProducer` interface which will affect all `org.hibernate.id.PersistentIdentifierGenerator` implementations.
+     Therefore you need to implement additionally `ExportableProducer#registerExportables(org.hibernate.boot.model.relational.Database database)` method.
   ruleID: hibernate4-00036
   when:
     java.referenced:
@@ -953,9 +888,7 @@
       pattern: org.hibernate.id.PersistentIdentifierGenerator
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Removed class org.hibernate.envers.configuration.AuditConfiguration
-    Hibernate 5 removed `AuditConfiguration` in preference for new `org.hibernate.envers.boot.internal.EnversService`.
+  description: Hibernate 5 - Removed class org.hibernate.envers.configuration.AuditConfiguration
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -980,9 +913,7 @@
       pattern: org.hibernate.envers.configuration.AuditConfiguration
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5 - Registration needed for built-in implementations of org.hibernate.type.descriptor.sql.SqlTypeDescriptor
-    Built-in implementations of `org.hibernate.type.descriptor.sql.SqlTypeDescriptor` and `org.hibernate.type.descriptor.java.JavaTypeDescriptor` no longer. auto-register themselves with `org.hibernate.type.descriptor.sql.SqlTypeDescriptorRegistry` and `org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry`.. Applications using custom `SqlTypeDescriptor`/`JavaTypeDescriptor` implementations which extends the built-in ones and. rely on that behavior should be updated to call `SqlTypeDescriptorRegistry#addDescriptor` or `JavaTypeDescriptorRegistry#addDescriptor` themselves.. This warning is important especially for users of Hibernate 4.3.
+  description: Hibernate 5 - Registration needed for built-in implementations of org.hibernate.type.descriptor.sql.SqlTypeDescriptor
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -1002,14 +933,12 @@
     url: https://docs.jboss.org/hibernate/orm/5.0/javadocs/index.html?org/hibernate/type/descriptor/sql/SqlTypeDescriptorRegistry.html
   - title: Hibernate 5 javadoc for JavaTypeDescriptorRegistry#addDescriptor
     url: https://docs.jboss.org/hibernate/orm/5.0/javadocs/index.html?org/hibernate/type/descriptor/java/JavaTypeDescriptorRegistry.html
-  message: Built-in implementations of `org.hibernate.type.descriptor.sql.SqlTypeDescriptor`
-    and `org.hibernate.type.descriptor.java.JavaTypeDescriptor` no longer. auto-register
-    themselves with `org.hibernate.type.descriptor.sql.SqlTypeDescriptorRegistry`
-    and `org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry`.. Applications
-    using custom `SqlTypeDescriptor`/`JavaTypeDescriptor` implementations which extends
-    the built-in ones and. rely on that behavior should be updated to call `SqlTypeDescriptorRegistry#addDescriptor`
-    or `JavaTypeDescriptorRegistry#addDescriptor` themselves.. This warning is important
-    especially for users of Hibernate 4.3.
+  message: |-
+    Built-in implementations of `org.hibernate.type.descriptor.sql.SqlTypeDescriptor` and `org.hibernate.type.descriptor.java.JavaTypeDescriptor` no longer
+     auto-register themselves with `org.hibernate.type.descriptor.sql.SqlTypeDescriptorRegistry` and `org.hibernate.type.descriptor.java.JavaTypeDescriptorRegistry`.
+     Applications using custom `SqlTypeDescriptor`/`JavaTypeDescriptor` implementations which extends the built-in ones and
+     rely on that behavior should be updated to call `SqlTypeDescriptorRegistry#addDescriptor` or `JavaTypeDescriptorRegistry#addDescriptor` themselves.
+     This warning is important especially for users of Hibernate 4.3.
   ruleID: hibernate4-00038
   when:
     or:
@@ -1041,9 +970,7 @@
   - name: extension
     nameOfCaptureGroup: extension
     pattern: byte\[\]
-  description: |-
-    Hibernate 5  - Oracle12cDialect maps byte[] and Byte[] to BLOB
-    Previous versions of Hibernate have mapped `byte[]` and `Byte[]` to Oracle’s `LONG RAW` data type (via the JDBC `LONGVARBINARY` type). Oracle have deprecated the `LONG RAW` data type for many releases - possibly as far back as 8i.. Therefore it was decided to start having Hibernate map `byte[]` and `Byte[]` to `BLOB` for Oracle.. However, in the interest of backwards compatibility and not breaking existing applications it was also decided to limit this change to just the `Oracle12cDialect`. So starting in 5.1 applications using `Oracle12cDialect` and implicitly mapping `byte[]` and `Byte[]` values will start seeing those handled as `BLOB` data rather than `LONG RAW` data.. For existing applications that want to continue to use `Oracle12cDialect` and still continue to implicitly map `byte[]` and `Byte[]` attributes to `LONG RAW`, there is a new configuration setting you can use to enable that: `hibernate.dialect.oracle.prefer_longvarbinary`, which is `false `by default (map to `BLOB`).
+  description: Hibernate 5  - Oracle12cDialect maps byte[] and Byte[] to BLOB
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
@@ -1058,19 +985,19 @@
   - configuration
   - Hibernate
   links: []
-  message: 'Previous versions of Hibernate have mapped `byte[]` and `Byte[]` to Oracle’s
-    `LONG RAW` data type (via the JDBC `LONGVARBINARY` type). Oracle have deprecated
-    the `LONG RAW` data type for many releases - possibly as far back as 8i.. Therefore
-    it was decided to start having Hibernate map `byte[]` and `Byte[]` to `BLOB` for
-    Oracle.. However, in the interest of backwards compatibility and not breaking
-    existing applications it was also decided to limit this change to just the `Oracle12cDialect`.
-    So starting in 5.1 applications using `Oracle12cDialect` and implicitly mapping
-    `byte[]` and `Byte[]` values will start seeing those handled as `BLOB` data rather
-    than `LONG RAW` data.. For existing applications that want to continue to use
-    `Oracle12cDialect` and still continue to implicitly map `byte[]` and `Byte[]`
-    attributes to `LONG RAW`, there is a new configuration setting you can use to
-    enable that: `hibernate.dialect.oracle.prefer_longvarbinary`, which is `false
-    `by default (map to `BLOB`).'
+  message: "\n Previous versions of Hibernate have mapped `byte[]` and `Byte[]` to
+    Oracle’s `LONG RAW` data type (via the JDBC `LONGVARBINARY` type). Oracle have
+    deprecated the `LONG RAW` data type for many releases - possibly as far back as
+    8i.\n\n Therefore it was decided to start having Hibernate map `byte[]` and `Byte[]`
+    to `BLOB` for Oracle.\n\n However, in the interest of backwards compatibility
+    and not breaking existing applications it was also decided to limit this change
+    to just the `Oracle12cDialect`. So starting in 5.1 applications using `Oracle12cDialect`
+    and implicitly mapping `byte[]` and `Byte[]` values will start seeing those handled
+    as `BLOB` data rather than `LONG RAW` data.\n For existing applications that want
+    to continue to use `Oracle12cDialect` and still continue to implicitly map `byte[]`
+    and `Byte[]` attributes to `LONG RAW`, there is a new configuration setting you
+    can use to enable that: `hibernate.dialect.oracle.prefer_longvarbinary`, which
+    is `false `by default (map to `BLOB`).\n "
   ruleID: hibernate4-00039
   when:
     or:
@@ -1094,14 +1021,13 @@
         pattern: byte*
 - category: mandatory
   customVariables:
-  - name: param_dialects
-    nameOfCaptureGroup: param_dialects
-    pattern: (?P<param_classes_setfirstresult>javax.persistence.Query|org.hibernate.Query|org.hibernate.Criteria.)?setFirstResult(int)
   - name: param_classes_setfirstresult
     nameOfCaptureGroup: param_classes_setfirstresult
     pattern: (?P<param_classes_setfirstresult>javax.persistence.Query|org.hibernate.Query|org.hibernate.Criteria.)?setFirstResult(int)
-  description: |
-    Hibernate 5.3 - Dialects not supporting Limit Offset
+  - name: param_dialects
+    nameOfCaptureGroup: param_dialects
+    pattern: (?P<param_classes_setfirstresult>javax.persistence.Query|org.hibernate.Query|org.hibernate.Criteria.)?setFirstResult(int)
+  description: Hibernate 5.3 - Dialects not supporting Limit Offset
   effort: 1
   labels:
   - konveyor.io/source=hibernate4
diff --git a/default/generated/eap7/77-hsearch.windup.yaml b/default/generated/eap7/77-hsearch.windup.yaml
index b801c6c6..d780b68c 100644
--- a/default/generated/eap7/77-hsearch.windup.yaml
+++ b/default/generated/eap7/77-hsearch.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Hibernate Search - API usage
     Hibernate Search library API used in application.
   labels:
@@ -24,9 +24,7 @@
       pattern: org.hibernate.search*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Renamed class SearchMappingBuilder
-    The class `org.hibernate.search.impl.SearchMappingBuilder` was replaced by `org.hibernate.search.engine.spi.SearchMappingHelper` class.
+  description: Hibernate Search 5 - Renamed class SearchMappingBuilder
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -50,9 +48,7 @@
       pattern: org.hibernate.search.impl.SearchMappingBuilder
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for Environment
-    The class `org.hibernate.search.Environment` was replaced by `org.hibernate.search.cfg.Environment` class.
+  description: Hibernate Search 5 - Package change for Environment
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -76,9 +72,7 @@
       pattern: org.hibernate.search.Environment
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for FullTextFilter
-    The class `org.hibernate.search.FullTextFilter` was replaced by `org.hibernate.search.filter.FullTextFilter` class.
+  description: Hibernate Search 5 - Package change for FullTextFilter
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -102,9 +96,7 @@
       pattern: org.hibernate.search.FullTextFilter
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for DirectoryBasedIndexManager
-    The class `org.hibernate.search.indexes.impl.DirectoryBasedIndexManager` was replaced by `org.hibernate.search.indexes.spi.DirectoryBasedIndexManager` class.
+  description: Hibernate Search 5 - Package change for DirectoryBasedIndexManager
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -129,9 +121,7 @@
       pattern: org.hibernate.search.indexes.impl.DirectoryBasedIndexManager
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for InfinispanDirectoryProvider
-    The class `org.hibernate.search.infinispan.impl.InfinispanDirectoryProvider` was replaced by `org.hibernate.search.infinispan.spi.InfinispanDirectoryProvider` class.
+  description: Hibernate Search 5 - Package change for InfinispanDirectoryProvider
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -156,9 +146,7 @@
       pattern: org.hibernate.search.infinispan.impl.InfinispanDirectoryProvider
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for ProjectionConstants
-    The class `org.hibernate.search.ProjectionConstants` was replaced by `org.hibernate.search.engine.ProjectionConstants` class.
+  description: Hibernate Search 5 - Package change for ProjectionConstants
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -182,9 +170,7 @@
       pattern: org.hibernate.search.ProjectionConstants
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for SearchException
-    The class `org.hibernate.search.SearchException` was replaced by `org.hibernate.search.exception.SearchException` class.
+  description: Hibernate Search 5 - Package change for SearchException
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -208,9 +194,7 @@
       pattern: org.hibernate.search.SearchException
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for MassIndexerFactory
-    The class `org.hibernate.search.spi.MassIndexerFactory` was replaced by `org.hibernate.search.batchindexing.spi.MassIndexerFactory` class.
+  description: Hibernate Search 5 - Package change for MassIndexerFactory
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -234,9 +218,7 @@
       pattern: org.hibernate.search.spi.MassIndexerFactory
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated interface org.hibernate.search.spi.SearchFactoryBuilder
-    The class `org.hibernate.search.spi.SearchFactoryBuilder` was replaced by `org.hibernate.search.spi.SearchIntegratorBuilder` class.
+  description: Hibernate Search 5 - Deprecated interface org.hibernate.search.spi.SearchFactoryBuilder
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -262,9 +244,7 @@
       pattern: org.hibernate.search.spi.SearchFactoryBuilder
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated interface org.hibernate.search.spi.SearchFactoryIntegrator
-    Do not use `org.hibernate.search.spi.SearchFactoryIntegrator`. You should migrate all code to use `org.hibernate.search.spi.SearchIntegrator`.. This interface is a temporary placeholder and will be removed at the next micro release!
+  description: Hibernate Search 5 - Deprecated interface org.hibernate.search.spi.SearchFactoryIntegrator
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -282,18 +262,16 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_hibernate_search_advanced_integrator_changes
   - title: Hibernate Search javadoc for SearchIntegrator
     url: https://docs.jboss.org/hibernate/search/5.5/api/org/hibernate/search/spi/SearchIntegrator.html
-  message: Do not use `org.hibernate.search.spi.SearchFactoryIntegrator`. You should
-    migrate all code to use `org.hibernate.search.spi.SearchIntegrator`.. This interface
-    is a temporary placeholder and will be removed at the next micro release!
+  message: |-
+    Do not use `org.hibernate.search.spi.SearchFactoryIntegrator`. You should migrate all code to use `org.hibernate.search.spi.SearchIntegrator`.
+     This interface is a temporary placeholder and will be removed at the next micro release!
   ruleID: hsearch-00010
   when:
     java.referenced:
       pattern: org.hibernate.search.spi.SearchFactoryIntegrator
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Package change for Version
-    The class `org.hibernate.search.Version` was replaced by `org.hibernate.search.engine.Version` class.
+  description: Hibernate Search 5 - Package change for Version
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -317,9 +295,7 @@
       pattern: org.hibernate.search.Version
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated constructor NumericFieldMapping.NumericFieldMapping
-    Use `NumericFieldMapping.NumericFieldMapping(String, PropertyDescriptor, EntityDescriptor, SearchMapping)` instead.
+  description: Hibernate Search 5 - Deprecated constructor NumericFieldMapping.NumericFieldMapping
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -347,9 +323,7 @@
         org.hibernate.search.cfg.EntityDescriptor, org.hibernate.search.cfg.SearchMapping)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated interface org.hibernate.search.store.IndexShardingStrategy
-    `org.hibernate.search.store.IndexShardingStrategy` interface is deprecated as of Hibernate Search 4.4. Might be removed in Hibernate Search 5.. Use `org.hibernate.search.store.ShardIdentifierProvider` instead.
+  description: Hibernate Search 5 - Deprecated interface org.hibernate.search.store.IndexShardingStrategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -367,18 +341,16 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_hibernate_search_changes
   - title: Hibernate Search javadoc
     url: https://docs.jboss.org/hibernate/search/5.5/api/org/hibernate/search/store/ShardIdentifierProvider.html
-  message: '`org.hibernate.search.store.IndexShardingStrategy` interface is deprecated
-    as of Hibernate Search 4.4. Might be removed in Hibernate Search 5.. Use `org.hibernate.search.store.ShardIdentifierProvider`
-    instead.'
+  message: |-
+    `org.hibernate.search.store.IndexShardingStrategy` interface is deprecated as of Hibernate Search 4.4. Might be removed in Hibernate Search 5.
+     Use `org.hibernate.search.store.ShardIdentifierProvider` instead.
   ruleID: hsearch-00101
   when:
     java.referenced:
       pattern: org.hibernate.search.store.IndexShardingStrategy
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated interface org.hibernate.search.store.Workspace
-    `org.hibernate.search.store.Workspace` interface will be moved and considered as non-public API.
+  description: Hibernate Search 5 - Deprecated interface org.hibernate.search.store.Workspace
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -402,9 +374,7 @@
       pattern: org.hibernate.search.store.Workspace
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated interface org.hibernate.search.filter.FilterKey
-    Custom filter keys are deprecated and are scheduled for removal in Hibernate Search 6. As of Hibernate Search 5.1, keys for caching Lucene filters are calculated automatically based on the given filter parameters.
+  description: Hibernate Search 5 - Deprecated interface org.hibernate.search.filter.FilterKey
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -431,9 +401,7 @@
       pattern: org.hibernate.search.filter.FilterKey
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated class org.hibernate.search.filter.StandardFilterKey
-    Custom filter keys `StandardFilterKey` are deprecated and are scheduled for removal in Hibernate Search 6.. As of Hibernate Search 5.1, keys for caching Lucene filters are calculated automatically based on the given filter parameters.
+  description: Hibernate Search 5 - Deprecated class org.hibernate.search.filter.StandardFilterKey
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -453,18 +421,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.1/#api-changes
   - title: hibernate Search javadoc
     url: https://docs.jboss.org/hibernate/search/5.5/api/index.html?org/hibernate/search/filter/StandardFilterKey.html
-  message: Custom filter keys `StandardFilterKey` are deprecated and are scheduled
-    for removal in Hibernate Search 6.. As of Hibernate Search 5.1, keys for caching
-    Lucene filters are calculated automatically based on the given filter parameters.
+  message: |-
+    Custom filter keys `StandardFilterKey` are deprecated and are scheduled for removal in Hibernate Search 6.
+     As of Hibernate Search 5.1, keys for caching Lucene filters are calculated automatically based on the given filter parameters.
   ruleID: hsearch-00106
   when:
     java.referenced:
       pattern: org.hibernate.search.filter.StandardFilterKey
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated enum FieldCacheType
-    Remove the `@FieldCacheType` annotation. No alternative replacement necessary as the Field Cache in Apache Lucene feature does no longer exist.
+  description: Hibernate Search 5 - Deprecated enum FieldCacheType
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -491,9 +457,7 @@
       pattern: org.hibernate.search.annotations.FieldCacheType
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated annotation CacheFromIndex
-    Remove the `@CacheFromIndex` annotation. No alternative replacement necessary.
+  description: Hibernate Search 5 - Deprecated annotation CacheFromIndex
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -519,9 +483,7 @@
       pattern: org.hibernate.search.annotations.CacheFromIndex
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated annotation Key
-    Custom filter cache keys are a deprecated feature and are scheduled to be removed in Hibernate Search 6.. As of Hibernate Search 5.1, the filter cache keys are determined automatically based on the filter parameters so it is no longer required to provide a key object.
+  description: Hibernate Search 5 - Deprecated annotation Key
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -541,10 +503,10 @@
     url: http://hibernate.org/search/documentation/migrate/5.1/#api-changes
   - title: Hibernate Search javadoc for @Key
     url: https://docs.jboss.org/hibernate/search/5.5/api/index.html?org/hibernate/search/annotations/Key.html
-  message: Custom filter cache keys are a deprecated feature and are scheduled to
-    be removed in Hibernate Search 6.. As of Hibernate Search 5.1, the filter cache
+  message: "Custom filter cache keys are a deprecated feature and are scheduled to
+    be removed in Hibernate Search 6.\n As of Hibernate Search 5.1, the filter cache
     keys are determined automatically based on the filter parameters so it is no longer
-    required to provide a key object.
+    required to provide a key object. "
   ruleID: hsearch-00109
   when:
     java.referenced:
@@ -555,9 +517,7 @@
   - name: constant
     nameOfCaptureGroup: constant
     pattern: org.hibernate.search.backend.configuration.impl.IndexWriterSetting.(?P<constant>(MAX_THREAD_STATES|TERM_INDEX_INTERVAL))
-  description: |-
-    Hibernate Search 5 - Deprecated enum constant in IndexWriterSetting
-    The `IndexWriterSetting.MAX_THREAD_STATES` and `IndexWriterSetting.TERM_INDEX_INTERVAL` enum constants are deprecated.. They affect which properties are read from the configuration, so the fact they they are missing means that configuration properties such as `hibernate.search.Animals.2.indexwriter.term_index_interval = default` are now ignored.. The only side effect is that the property is not applied.
+  description: Hibernate Search 5 - Deprecated enum constant in IndexWriterSetting
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -573,11 +533,10 @@
   links:
   - title: Advanced Integrator Changes in Hibernate Search 5.x
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_hibernate_search_advanced_integrator_changes
-  message: The `IndexWriterSetting.MAX_THREAD_STATES` and `IndexWriterSetting.TERM_INDEX_INTERVAL`
-    enum constants are deprecated.. They affect which properties are read from the
-    configuration, so the fact they they are missing means that configuration properties
-    such as `hibernate.search.Animals.2.indexwriter.term_index_interval = default`
-    are now ignored.. The only side effect is that the property is not applied.
+  message: |-
+    The `IndexWriterSetting.MAX_THREAD_STATES` and `IndexWriterSetting.TERM_INDEX_INTERVAL` enum constants are deprecated.
+     They affect which properties are read from the configuration, so the fact they they are missing means that configuration properties such as `hibernate.search.Animals.2.indexwriter.term_index_interval = default` are now ignored.
+     The only side effect is that the property is not applied.
   ruleID: hsearch-00110
   when:
     or:
@@ -589,9 +548,7 @@
         pattern: org.hibernate.search.backend.configuration.impl.IndexWriterSetting.(MAX_THREAD_STATES|TERM_INDEX_INTERVAL)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Renamed SpatialMode.GRID to HASH
-    The enum value `SpatialMode.GRID` for `@Spatial` annotation was renamed to `SpatialMode.HASH`.
+  description: Hibernate Search 5 - Renamed SpatialMode.GRID to HASH
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -616,9 +573,7 @@
       pattern: org.hibernate.search.annotations.Spatial
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - FullTextIndexEventListener class is now final
-    The class `FullTextIndexEventListener` is now a final class. If you currently extend this class, you must find an alternate solution to achieve the same functionality. You could in some cases use an `EntityIndexingInterceptor`.
+  description: Hibernate Search 5 - FullTextIndexEventListener class is now final
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -646,9 +601,8 @@
       pattern: org.hibernate.search.event.impl.FullTextIndexEventListener
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Internal AbstractJMSHibernateSearchController class used
-    The JMS backend was depending to Hibernate ORM. This dependency was removed, so that the backend can be used in other (non ORM) environments as well.. A consequence is that implementors of `org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController` will need to adjust to the new signature.. This class is really considered internal. We suggest to take this class as an example instead of extending it.
+  description: Hibernate Search 5 - Internal AbstractJMSHibernateSearchController
+    class used
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -666,11 +620,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
   - title: JMS Controller API changed
     url: http://hibernate.org/search/documentation/migrate/5.0/#jms-controller-api-changed
-  message: The JMS backend was depending to Hibernate ORM. This dependency was removed,
-    so that the backend can be used in other (non ORM) environments as well.. A consequence
-    is that implementors of `org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController`
-    will need to adjust to the new signature.. This class is really considered internal.
-    We suggest to take this class as an example instead of extending it.
+  message: |-
+    The JMS backend was depending to Hibernate ORM. This dependency was removed, so that the backend can be used in other (non ORM) environments as well.
+     A consequence is that implementors of `org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController` will need to adjust to the new signature.
+     This class is really considered internal. We suggest to take this class as an example instead of extending it.
   ruleID: hsearch-00113
   when:
     java.referenced:
@@ -678,9 +631,7 @@
       pattern: org.hibernate.search.backend.impl.jms.AbstractJMSHibernateSearchController
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - ServiceProvider implementation
-    The `org.hibernate.search.spi.ServiceProvider` SPI has been refactored.. If you where integrating with the old service contract, refer to the javadoc of `ServiceManager`, `Service`, `Startable` and `Stoppable` for details about the new contract.
+  description: Hibernate Search 5 - ServiceProvider implementation
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -704,10 +655,9 @@
     url: http://docs.jboss.org/hibernate/search/5.0/api/org/hibernate/search/engine/service/spi/Stoppable.html
   - title: Hibernate Search javadoc for Startable
     url: http://docs.jboss.org/hibernate/search/5.0/api/org/hibernate/search/engine/service/spi/Startable.html
-  message: The `org.hibernate.search.spi.ServiceProvider` SPI has been refactored..
-    If you where integrating with the old service contract, refer to the javadoc of
-    `ServiceManager`, `Service`, `Startable` and `Stoppable` for details about the
-    new contract.
+  message: |-
+    The `org.hibernate.search.spi.ServiceProvider` SPI has been refactored.
+     If you where integrating with the old service contract, refer to the javadoc of `ServiceManager`, `Service`, `Startable` and `Stoppable` for details about the new contract.
   ruleID: hsearch-00114
   when:
     java.referenced:
@@ -715,9 +665,7 @@
       pattern: org.hibernate.search.spi.ServiceProvider
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Indexing of id fields of Embedded Relations
-    When using an `@IndexedEmbedded` annotation to include fields from a related entity,. the id of the related entity is no longer included.. You can enable the inclusion of the id by using the `includeEmbeddedObjectId` attribute of the `@IndexedEmbedded` annotation.. ```java. @IndexedEmbedded(includeEmbeddedObjectId=true). ```
+  description: Hibernate Search 5 - Indexing of id fields of Embedded Relations
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -735,10 +683,11 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
   - title: Hibernate Search javadoc for IndexedEmbedded
     url: https://docs.jboss.org/hibernate/search/5.5/api/index.html?org/hibernate/search/annotations/IndexedEmbedded.html
-  message: When using an `@IndexedEmbedded` annotation to include fields from a related
-    entity,. the id of the related entity is no longer included.. You can enable the
-    inclusion of the id by using the `includeEmbeddedObjectId` attribute of the `@IndexedEmbedded`
-    annotation.. ```java. @IndexedEmbedded(includeEmbeddedObjectId=true). ```
+  message: "\n When using an `@IndexedEmbedded` annotation to include fields from
+    a related entity,\n the id of the related entity is no longer included.\n\n You
+    can enable the inclusion of the id by using the `includeEmbeddedObjectId` attribute
+    of the `@IndexedEmbedded` annotation.\n\n ```java\n @IndexedEmbedded(includeEmbeddedObjectId=true)\n
+    ```\n\n "
   ruleID: hsearch-00115
   when:
     java.referenced:
@@ -746,9 +695,7 @@
       pattern: org.hibernate.search.annotations.IndexedEmbedded
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Changes in indexing numeric and date values
-    Numbers and dates are now indexed as numeric fields by default. Properties of type int, long, float, double, and their. corresponding wrapper classes are no longer indexed as strings. Instead, they are now indexed using Lucene’s appropriate numeric. encoding. The id fields are an exception to this rule. Even when they are represented by a numeric type, they are still indexed as. a string keyword by default. The use of `@NumericField` is now obsolete unless you want to specify a custom precision for the numeric. encoding. You can keep the old string-based index format by explicitly specifying a string encoding field bridge. In the case of. integers, this is the `org.hibernate.search.bridge.builtin.IntegerBridge`. Check the `org.hibernate.search.bridge.builtin` package for. other publicly available field bridges.. Date and Calendar are no longer indexed as strings. Instead, instances are encoded as long values representing the number. of milliseconds since January 1, 1970, 00:00:00 GMT. You can switch the indexing format by using the new EncodingType enum. For example:. ```java. @DateBridge(encoding=EncodingType.STRING). @CalendarBridge(encoding=EncodingType.STRING). ```. The encoding change for numbers and dates is important and can have a big impact on application behavior. If you have. a query that targets a field that was previously string-encoded, but is now encoded numerically, you must update the query. Numeric. fields must be searched with a NumericRangeQuery. You must also make sure that all fields targeted by faceting are string encoded.. If you use the Search query DSL, the correct query should be created automatically for you.
+  description: Hibernate Search 5 - Changes in indexing numeric and date values
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -770,27 +717,27 @@
     url: http://docs.jboss.org/hibernate/search/5.5/api/org/hibernate/search/bridge/builtin/package-summary.html
   - title: Javadoc API for IntegerBridge
     url: http://docs.jboss.org/hibernate/search/5.5/api/org/hibernate/search/bridge/builtin/IntegerBridge.html
-  message: Numbers and dates are now indexed as numeric fields by default. Properties
-    of type int, long, float, double, and their. corresponding wrapper classes are
+  message: "\n Numbers and dates are now indexed as numeric fields by default. Properties
+    of type int, long, float, double, and their\n corresponding wrapper classes are
     no longer indexed as strings. Instead, they are now indexed using Lucene’s appropriate
-    numeric. encoding. The id fields are an exception to this rule. Even when they
-    are represented by a numeric type, they are still indexed as. a string keyword
+    numeric\n encoding. The id fields are an exception to this rule. Even when they
+    are represented by a numeric type, they are still indexed as\n a string keyword
     by default. The use of `@NumericField` is now obsolete unless you want to specify
-    a custom precision for the numeric. encoding. You can keep the old string-based
+    a custom precision for the numeric\n encoding. You can keep the old string-based
     index format by explicitly specifying a string encoding field bridge. In the case
-    of. integers, this is the `org.hibernate.search.bridge.builtin.IntegerBridge`.
-    Check the `org.hibernate.search.bridge.builtin` package for. other publicly available
-    field bridges.. Date and Calendar are no longer indexed as strings. Instead, instances
-    are encoded as long values representing the number. of milliseconds since January
-    1, 1970, 00:00:00 GMT. You can switch the indexing format by using the new EncodingType
-    enum. For example:. ```java. @DateBridge(encoding=EncodingType.STRING). @CalendarBridge(encoding=EncodingType.STRING).
-    ```. The encoding change for numbers and dates is important and can have a big
-    impact on application behavior. If you have. a query that targets a field that
-    was previously string-encoded, but is now encoded numerically, you must update
-    the query. Numeric. fields must be searched with a NumericRangeQuery. You must
-    also make sure that all fields targeted by faceting are string encoded.. If you
-    use the Search query DSL, the correct query should be created automatically for
-    you.
+    of\n integers, this is the `org.hibernate.search.bridge.builtin.IntegerBridge`.
+    Check the `org.hibernate.search.bridge.builtin` package for\n other publicly available
+    field bridges.\n\n Date and Calendar are no longer indexed as strings. Instead,
+    instances are encoded as long values representing the number\n of milliseconds
+    since January 1, 1970, 00:00:00 GMT. You can switch the indexing format by using
+    the new EncodingType enum. For example:\n\n ```java\n @DateBridge(encoding=EncodingType.STRING)\n
+    @CalendarBridge(encoding=EncodingType.STRING)\n ```\n\n The encoding change for
+    numbers and dates is important and can have a big impact on application behavior.
+    If you have\n a query that targets a field that was previously string-encoded,
+    but is now encoded numerically, you must update the query. Numeric\n fields must
+    be searched with a NumericRangeQuery. You must also make sure that all fields
+    targeted by faceting are string encoded.\n If you use the Search query DSL, the
+    correct query should be created automatically for you.\n "
   ruleID: hsearch-00116
   when:
     or:
@@ -806,9 +753,7 @@
         pattern: java.lang.(Integer|Long|Float|Double)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Changes in indexing null values
-    When using `@Field(indexNullAs=)` to encode a null marker value in the index, the type of the marker must be compatible with all other values that are indexed in that same field.. For example, it was previously possible to encode a null value for numeric fields using a string _null_.. This is no longer allowed. Instead, you must choose a number to represent the null value, such as -1.
+  description: Hibernate Search 5 - Changes in indexing null values
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -826,11 +771,11 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
   - title: Null value tokens for numeric fields
     url: http://hibernate.org/search/documentation/migrate/5.5/#null-value-tokens-for-numeric-fields
-  message: When using `@Field(indexNullAs=)` to encode a null marker value in the
+  message: "When using `@Field(indexNullAs=)` to encode a null marker value in the
     index, the type of the marker must be compatible with all other values that are
-    indexed in that same field.. For example, it was previously possible to encode
-    a null value for numeric fields using a string _null_.. This is no longer allowed.
-    Instead, you must choose a number to represent the null value, such as -1.
+    indexed in that same field.\n For example, it was previously possible to encode
+    a null value for numeric fields using a string _null_.\n This is no longer allowed.
+    Instead, you must choose a number to represent the null value, such as -1. "
   ruleID: hsearch-00117
   when:
     java.referenced:
@@ -838,9 +783,7 @@
       pattern: org.hibernate.search.annotations.Field
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Improvements in Faceting Engine
-    Significant improvements were made to the faceting engine. Most of the changes do not affect the API. The one notable exception is that you must now annotate any fields you intend to use for faceting with the `@Facet` or `@Facets` annotation.
+  description: Hibernate Search 5 - Improvements in Faceting Engine
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -877,9 +820,7 @@
         pattern: org.hibernate.search.query.facet.(Facet|FacetingRequest|FacetSelection|FacetSortOrder|RangeFacet)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Changes in indexing numeric values
-    Numbers and dates now indexed as numeric fields by default.. Properties of type `Date`, `Calendar` as well as `int`, `long`, `float`, `double` and their corresponding wrappers, are no longer indexed as strings. Instead, they are now indexed using Lucene’s appropriate numeric encoding.. The `id` fields are an exception to this rule: even when these are represented by a numeric type, they will still be indexed as a string keyword by default..
+  description: Hibernate Search 5 - Changes in indexing numeric values
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -897,12 +838,11 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
   - title: Numeric and Date index format
     url: http://hibernate.org/search/documentation/migrate/5.5/#number-and-date-index-format
-  message: 'Numbers and dates now indexed as numeric fields by default.. Properties
-    of type `Date`, `Calendar` as well as `int`, `long`, `float`, `double` and their
-    corresponding wrappers, are no longer indexed as strings. Instead, they are now
-    indexed using Lucene’s appropriate numeric encoding.. The `id` fields are an exception
-    to this rule: even when these are represented by a numeric type, they will still
-    be indexed as a string keyword by default..'
+  message: |-
+    Numbers and dates now indexed as numeric fields by default.
+    Properties of type `Date`, `Calendar` as well as `int`, `long`, `float`, `double` and their corresponding wrappers, are no longer indexed as strings. Instead, they are now indexed using Lucene’s appropriate numeric encoding.
+
+    The `id` fields are an exception to this rule: even when these are represented by a numeric type, they will still be indexed as a string keyword by default..
   ruleID: hsearch-00119
   when:
     or:
@@ -911,9 +851,7 @@
     - java.referenced:
         pattern: java.lang.(Integer|Long|Float|Double)
 - customVariables: []
-  description: Maven artifact org.hibernate:hibernate-search-analyzers was removed
-    from Hibernate Search 5. We recommend to depend on the appropriate Lucene artifact
-    directly, for example org.apache.lucene:lucene-analyzers-common.
+  description: null
   labels:
   - konveyor.io/source=hibernate-search4
   - konveyor.io/source=hibernate-search
@@ -936,9 +874,7 @@
       name: org.hibernate.hibernate-search-analyzers
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Dropped hibernate-search-analyzers maven artifact
-    The hibernate-search-analyzers module was removed. The recommended approach is to directly use the appropriate Lucene artifact,. for example org.apache.lucene:lucene-analyzers-common.
+  description: Hibernate Search 5 - Dropped hibernate-search-analyzers maven artifact
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -955,8 +891,9 @@
   links:
   - title: Miscelanous Changes in Hibernate Search 5.x
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
-  message: The hibernate-search-analyzers module was removed. The recommended approach
-    is to directly use the appropriate Lucene artifact,. for example org.apache.lucene:lucene-analyzers-common.
+  message: |-
+    The hibernate-search-analyzers module was removed. The recommended approach is to directly use the appropriate Lucene artifact,
+     for example org.apache.lucene:lucene-analyzers-common.
   ruleID: hsearch-00201
   when:
     builtin.xml:
@@ -966,9 +903,7 @@
       xpath: //*[local-name() = 'artifactId' and text() = 'hibernate-search-analyzers']
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Changed constructor for org.apache.lucene.search.SortField
-    The Lucene SortField API requires the following application code change. In the previous release of JBoss EAP, you set the type of the sort field in the query as follows.. ```java. fulltextQuery.setSort(new Sort(new SortField("title", SortField.STRING)));. ```. The following is an example of how you set it in JBoss EAP 7.. ```java. fulltextQuery.setSort(new Sort(new SortField("title", SortField.Type.STRING))). ```
+  description: Lucene 4.x - Changed constructor for org.apache.lucene.search.SortField
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -987,12 +922,12 @@
     url: http://hibernate.org/search/documentation/migrate/5.5/#sorting-options
   - title: Miscellaneous Hibernate Search Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_miscellaneous_hibernate_search_changes
-  message: The Lucene SortField API requires the following application code change.
+  message: "\n The Lucene SortField API requires the following application code change.
     In the previous release of JBoss EAP, you set the type of the sort field in the
-    query as follows.. ```java. fulltextQuery.setSort(new Sort(new SortField("title",
-    SortField.STRING)));. ```. The following is an example of how you set it in JBoss
-    EAP 7.. ```java. fulltextQuery.setSort(new Sort(new SortField("title", SortField.Type.STRING))).
-    ```
+    query as follows.\n\n```java\nfulltextQuery.setSort(new Sort(new SortField(\"title\",
+    SortField.STRING)));\n```\n\nThe following is an example of how you set it in
+    JBoss EAP 7.\n\n```java\nfulltextQuery.setSort(new Sort(new SortField(\"title\",
+    SortField.Type.STRING)))\n```\n\n "
   ruleID: hsearch-00210
   when:
     java.referenced:
@@ -1000,9 +935,7 @@
       pattern: org.apache.lucene.search.SortField*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method ContainedInMapping#numericField
-    Method `ContainedInMapping#numericField()` has been deprecated and is scheduled for removal. Invoke `ContainedInMapping#field().numericField()` instead.
+  description: Hibernate Search 5 - Deprecated method ContainedInMapping#numericField
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1029,9 +962,7 @@
       pattern: org.hibernate.search.cfg.ContainedInMapping.numericField*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method FullTextSharedSessionBuilder#autoClose
-    Don't use `FullTextSharedSessionBuilder#autoclose()` and `FullTextSharedSessionBuilder#autoclose(boolean)` method. There is no replacement.
+  description: Hibernate Search 5 - Deprecated method FullTextSharedSessionBuilder#autoClose
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1058,9 +989,7 @@
       pattern: org.hibernate.search.FullTextSharedSessionBuilder.autoClose*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method IndexedMapping#cacheFromIndex
-    This will be removed with no replacement.
+  description: Hibernate Search 5 - Deprecated method IndexedMapping#cacheFromIndex
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1086,9 +1015,7 @@
       pattern: org.hibernate.search.cfg.IndexedMapping.cacheFromIndex*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method EntityDescriptor#getCacheInMemory
-    This will be removed with no replacement.
+  description: Hibernate Search 5 - Deprecated method EntityDescriptor#getCacheInMemory
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1114,9 +1041,7 @@
       pattern: org.hibernate.search.cfg.EntityDescriptor.getCacheInMemory*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method HSQuery#getExtendedSearchIntegrator
-    should be at most SearchIntegrator, preferably removed altogether
+  description: Hibernate Search 5 - Deprecated method HSQuery#getExtendedSearchIntegrator
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1142,9 +1067,7 @@
       pattern: org.hibernate.search.query.engine.spi.HSQuery.getExtendedSearchIntegrator*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method DocumentBuilderIndexedEntity#getFieldCacheOption
-    The `DocumentBuilderIndexedEntity#getFieldCacheOption()` method has been deprecated. There is no replacement.
+  description: Hibernate Search 5 - Deprecated method DocumentBuilderIndexedEntity#getFieldCacheOption
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1171,9 +1094,7 @@
       pattern: org.hibernate.search.engine.spi.DocumentBuilderIndexedEntity.getFieldCacheOption*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method BuildContext#getIndexingStrategy
-    The `BuildContext#getIndexingStrategy()` method is deprecated. Use `BuildContext#getIndexingMode()` instead.
+  description: Hibernate Search 5 - Deprecated method BuildContext#getIndexingStrategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1198,9 +1119,7 @@
       pattern: org.hibernate.search.spi.BuildContext.getIndexingStrategy*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method DirectoryHelper#getVerifiedIndexDir
-    The `DirectoryHelper#getVerifiedIndexDir(String, Properties, boolean)` method is deprecated. Use `DirectoryHelper#getVerifiedIndexPath(java.lang.String, java.util.Properties, boolean)` instead.
+  description: Hibernate Search 5 - Deprecated method DirectoryHelper#getVerifiedIndexDir
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1216,9 +1135,9 @@
   links:
   - title: Advanced Integrator Changes in Hibernate Search 5.x
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_hibernate_search_advanced_integrator_changes
-  message: The `DirectoryHelper#getVerifiedIndexDir(String, Properties, boolean)`
+  message: 'The `DirectoryHelper#getVerifiedIndexDir(String, Properties, boolean)`
     method is deprecated. Use `DirectoryHelper#getVerifiedIndexPath(java.lang.String,
-    java.util.Properties, boolean)` instead.
+    java.util.Properties, boolean)` instead. '
   ruleID: hsearch-00219
   when:
     java.referenced:
@@ -1226,9 +1145,7 @@
       pattern: org.hibernate.search.store.spi.DirectoryHelper.getVerifiedIndexDir*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method EntityDescriptor#setCacheInMemory
-    Method `org.hibernate.search.cfg.EntityDescriptor.setCacheInMemory` is deprecated and there is no replacement.
+  description: Hibernate Search 5 - Deprecated method EntityDescriptor#setCacheInMemory
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1255,9 +1172,7 @@
       pattern: org.hibernate.search.cfg.EntityDescriptor.setCacheInMemory*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method MassIndexer#threadsForSubsequentFetching
-    Method `org.hibernate.search.MassIndexer.threadsForSubsequentFetching(int)` is deprecated and will be removed.
+  description: Hibernate Search 5 - Deprecated method MassIndexer#threadsForSubsequentFetching
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1284,9 +1199,7 @@
       pattern: org.hibernate.search.MassIndexer.threadsForSubsequentFetching*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Deprecated method FuzzyContext#withThreshold
-    Use `FuzzyContext.withEditDistanceUpTo(int)` instead.
+  description: Hibernate Search 5 - Deprecated method FuzzyContext#withThreshold
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1315,8 +1228,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.queryParser.(?P<type>(CharStream|FastCharStream|MultiFieldQueryParser|ParseException|QueryParser|QueryParserBase|QueryParserConstants|QueryParserTokenManager))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.queryparser.classic'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.queryparser.classic'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1346,9 +1258,7 @@
       pattern: org.apache.lucene.queryParser.(CharStream|FastCharStream|MultiFieldQueryParser|ParseException|QueryParser|QueryParserBase|QueryParserConstants|QueryParserTokenManager)
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Renamed class org.apache.lucene.queryParser.QueryParserToken
-    Lucene's core `org.apache.lucene.queryParser.QueryParserToken` have been consolidated into lucene/queryparser, that results in changing package name so it is now named as `org.apache.lucene.queryparser.classic.Token`.
+  description: Lucene 4.x - Renamed class org.apache.lucene.queryParser.QueryParserToken
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1378,9 +1288,7 @@
       pattern: org.apache.lucene.queryParser.QueryParserToken
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Renamed class org.apache.lucene.queryParser.QueryParserTokenMgrError
-    Lucene's core `org.apache.lucene.queryParser.QueryParserTokenMgrError` have been consolidated into lucene/queryparser, that results in changing package name so it is now named as `org.apache.lucene.queryparser.classic.TokenMgrError`.
+  description: Lucene 4.x - Renamed class org.apache.lucene.queryParser.QueryParserTokenMgrError
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1413,8 +1321,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.analysis.(?P<type>(KeywordAnalyzer|KeywordTokenizer|LetterTokenizer|LowerCaseFilter|LowerCaseTokenizer|SimpleAnalyzer|StopAnalyzer|StopFilter|WhitespaceAnalyzer|WhitespaceTokenizer))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.core'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.core'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1435,18 +1342,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.core.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.core.{{type}}`.
   ruleID: hsearch-00227
   when:
     java.referenced:
       pattern: org.apache.lucene.analysis.(KeywordAnalyzer|KeywordTokenizer|LetterTokenizer|LowerCaseFilter|LowerCaseTokenizer|SimpleAnalyzer|StopAnalyzer|StopFilter|WhitespaceAnalyzer|WhitespaceTokenizer)
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Class 'PorterStemFilter' repackaged to 'org.apache.lucene.analysis.en'
-    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.. During the refactoring package name have changed for `org.apache.lucene.analysis.PorterStemFilter` to `org.apache.lucene.analysis.en.PorterStemFilter`.
+  description: Lucene 4.x - Class 'PorterStemFilter' repackaged to 'org.apache.lucene.analysis.en'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1467,9 +1372,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.PorterStemFilter` to `org.apache.lucene.analysis.en.PorterStemFilter`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.PorterStemFilter` to `org.apache.lucene.analysis.en.PorterStemFilter`.
   ruleID: hsearch-00228
   when:
     java.referenced:
@@ -1479,8 +1384,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.analysis.(?P<type>(ASCIIFoldingFilter|ISOLatin1AccentFilter|KeywordMarkerFilter|LengthFilter|PerFieldAnalyzerWrapper))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.miscellaneous'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.miscellaneous'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1501,18 +1405,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.miscellaneous.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.miscellaneous.{{type}}`.
   ruleID: hsearch-00229
   when:
     java.referenced:
       pattern: org.apache.lucene.analysis.(ASCIIFoldingFilter|ISOLatin1AccentFilter|KeywordMarkerFilter|LengthFilter|PerFieldAnalyzerWrapper)
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Class 'TeeSinkTokenFilter' repackaged to 'org.apache.lucene.analysis.sinks'
-    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.. During the refactoring package name have changed for `org.apache.lucene.analysis.TeeSinkTokenFilter` to `org.apache.lucene.analysis.sinks.TeeSinkTokenFilter`.
+  description: Lucene 4.x - Class 'TeeSinkTokenFilter' repackaged to 'org.apache.lucene.analysis.sinks'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1533,9 +1435,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.TeeSinkTokenFilter` to `org.apache.lucene.analysis.sinks.TeeSinkTokenFilter`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.TeeSinkTokenFilter` to `org.apache.lucene.analysis.sinks.TeeSinkTokenFilter`.
   ruleID: hsearch-00230
   when:
     java.referenced:
@@ -1545,8 +1447,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.analysis.(?P<type>(CharFilter|BaseCharFilter|MappingCharFilter|NormalizeCharMap))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.charfilter'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.charfilter'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1567,9 +1468,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.charfilter.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.charfilter.{{type}}`.
   ruleID: hsearch-00231
   when:
     java.referenced:
@@ -1579,8 +1480,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.analysis.(?P<type>(CharArraySet|CharArrayMap|StopwordAnalyzerBase|WordlistLoader|CharTokenizer))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.util'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.analysis.util'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1601,18 +1501,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.util.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.analysis.{{type}}` to `org.apache.lucene.analysis.util.{{type}}`.
   ruleID: hsearch-00232
   when:
     java.referenced:
       pattern: org.apache.lucene.analysis.(CharArraySet|CharArrayMap|StopwordAnalyzerBase|WordlistLoader|CharTokenizer)
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Class 'ReusableAnalyzerBase' renamed to 'org.apache.lucene.analysis.Analyzer'
-    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.. During the refactoring class name have changed for `org.apache.lucene.analysis.ReusableAnalyzerBase` to `org.apache.lucene.analysis.Analyzer`.
+  description: Lucene 4.x - Class 'ReusableAnalyzerBase' renamed to 'org.apache.lucene.analysis.Analyzer'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1633,18 +1531,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring class name have
-    changed for `org.apache.lucene.analysis.ReusableAnalyzerBase` to `org.apache.lucene.analysis.Analyzer`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring class name have changed for `org.apache.lucene.analysis.ReusableAnalyzerBase` to `org.apache.lucene.analysis.Analyzer`.
   ruleID: hsearch-00233
   when:
     java.referenced:
       pattern: org.apache.lucene.analysis.ReusableAnalyzerBase
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Class 'CharacterUtils' repackaged to 'org.apache.lucene.analysis.util'
-    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.. During the refactoring package name have changed for `org.apache.lucene.util.CharacterUtils` to `org.apache.lucene.analysis.util.CharacterUtils`.
+  description: Lucene 4.x - Class 'CharacterUtils' repackaged to 'org.apache.lucene.analysis.util'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1665,9 +1561,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.util.CharacterUtils` to `org.apache.lucene.analysis.util.CharacterUtils`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.util.CharacterUtils` to `org.apache.lucene.analysis.util.CharacterUtils`.
   ruleID: hsearch-00234
   when:
     java.referenced:
@@ -1677,8 +1573,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.search.function.(?P<type>(CustomScoreQuery|CustomScoreProvider))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1699,18 +1594,16 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.{{type}}`.
   ruleID: hsearch-00235
   when:
     java.referenced:
       pattern: org.apache.lucene.search.function.(CustomScoreQuery|CustomScoreProvider)
 - category: optional
   customVariables: []
-  description: |-
-    Lucene 4.x - Class 'NumericIndexDocValueSource' repackaged to 'org.apache.lucene.queries.function.valuesource'
-    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.. During the refactoring package name have changed for `org.apache.lucene.search.function.NumericIndexDocValueSource` to `org.apache.lucene.queries.function.valuesource.NumericIndexDocValueSource`.
+  description: Lucene 4.x - Class 'NumericIndexDocValueSource' repackaged to 'org.apache.lucene.queries.function.valuesource'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1731,10 +1624,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.search.function.NumericIndexDocValueSource`
-    to `org.apache.lucene.queries.function.valuesource.NumericIndexDocValueSource`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.search.function.NumericIndexDocValueSource` to `org.apache.lucene.queries.function.valuesource.NumericIndexDocValueSource`.
   ruleID: hsearch-00236
   when:
     java.referenced:
@@ -1744,8 +1636,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.search.function.(?P<type>(DocValues|FieldScoreQuery|ValueSource|ValueSourceQuery))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries.function'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries.function'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1766,9 +1657,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.function.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.function.{{type}}`.
   ruleID: hsearch-00237
   when:
     java.referenced:
@@ -1778,8 +1669,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.lucene.search.function.(?P<type>(ByteFieldSource|FieldCacheSource|FloatFieldSource|IntFieldSource|OrdFieldSource|ReverseOrdFieldSource|ShortFieldSource))
-  description: |
-    Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries.function.valuesources'
+  description: Lucene 4.x - Classes repackaged to 'org.apache.lucene.queries.function.valuesources'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1800,9 +1690,9 @@
     url: http://hibernate.org/search/documentation/migrate/5.0/#within-apache-lucene
   - title: Lucene - Renamed and Repackaged Classes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_lucene_renamed_and_repackaged_classes
-  message: Lucene's core and contrib analyzers, along with Solr's analyzers, were
-    consolidated into lucene/analysis module.. During the refactoring package name
-    have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.function.valuesources.{{type}}`.
+  message: |-
+    Lucene's core and contrib analyzers, along with Solr's analyzers, were consolidated into lucene/analysis module.
+     During the refactoring package name have changed for `org.apache.lucene.search.function.{{type}}` to `org.apache.lucene.queries.function.valuesources.{{type}}`.
   ruleID: hsearch-00238
   when:
     java.referenced:
@@ -1812,8 +1702,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.apache.solr.analysis.(?P<type>(TokenizerFactory|TokenFilterFactory))
-  description: |
-    Lucene 4.x - Solr classes repackaged to 'org.apache.lucene.analysis.util'
+  description: Lucene 4.x - Solr classes repackaged to 'org.apache.lucene.analysis.util'
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
@@ -1842,9 +1731,7 @@
       pattern: org.apache.solr.analysis.(TokenizerFactory|TokenFilterFactory)
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate Search 5 - Removed method MassIndexer#threadsForIndexWriter
-    Method `org.hibernate.search.MassIndexer#threadsForIndexWriter(int)` was removed in Hibernate Search 5.
+  description: Hibernate Search 5 - Removed method MassIndexer#threadsForIndexWriter
   effort: 1
   labels:
   - konveyor.io/source=hibernate-search4
diff --git a/default/generated/eap7/78-jax-ws.windup.yaml b/default/generated/eap7/78-jax-ws.windup.yaml
index f2fa7862..72a6ce8e 100644
--- a/default/generated/eap7/78-jax-ws.windup.yaml
+++ b/default/generated/eap7/78-jax-ws.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    JAX-WS 2.2 Requirements for WebServiceRef
-    EAP 7 uses JAX-WS 2.2 style constructors with the `javax.xml.ws.WebServiceFeature` class to build clients that are injected into web service references (i.e. using the `@WebServiceRef` annotation).. This means that user provided service classes injected by the container must implement JAX-WS 2.2 or later.. The class must be changed to add the constructor [`Service(URL wsdlDocumentLocation, QName serviceName, WebServiceFeature... features)`](https://docs.oracle.com/javase/7/docs/api/javax/xml/ws/Service.html#Service&#40;java.net.URL,%20javax.xml.namespace.QName,%20javax.xml.ws.WebServiceFeature...&#41;)
+  description: JAX-WS 2.2 Requirements for WebServiceRef
   effort: 1
   labels:
   - konveyor.io/target=eap7+
@@ -10,12 +8,13 @@
   - konveyor.io/source
   - jax-ws
   links: []
-  message: EAP 7 uses JAX-WS 2.2 style constructors with the `javax.xml.ws.WebServiceFeature`
+  message: "\n \n EAP 7 uses JAX-WS 2.2 style constructors with the `javax.xml.ws.WebServiceFeature`
     class to build clients that are injected into web service references (i.e. using
-    the `@WebServiceRef` annotation).. This means that user provided service classes
-    injected by the container must implement JAX-WS 2.2 or later.. The class must
+    the `@WebServiceRef` annotation). \n This means that user provided service classes
+    injected by the container must implement JAX-WS 2.2 or later. \n The class must
     be changed to add the constructor [`Service(URL wsdlDocumentLocation, QName serviceName,
-    WebServiceFeature... features)`](https://docs.oracle.com/javase/7/docs/api/javax/xml/ws/Service.html#Service&#40;java.net.URL,%20javax.xml.namespace.QName,%20javax.xml.ws.WebServiceFeature...&#41;)
+    WebServiceFeature... features)`](https://docs.oracle.com/javase/7/docs/api/javax/xml/ws/Service.html#Service&#40;java.net.URL,%20javax.xml.namespace.QName,%20javax.xml.ws.WebServiceFeature...&#41;)\n
+    \n "
   ruleID: jax-ws-00000
   when:
     or:
diff --git a/default/generated/eap7/79-resteasy.windup.yaml b/default/generated/eap7/79-resteasy.windup.yaml
index 80ffb748..d6017a29 100644
--- a/default/generated/eap7/79-resteasy.windup.yaml
+++ b/default/generated/eap7/79-resteasy.windup.yaml
@@ -3,9 +3,7 @@
   - name: cache_class
     nameOfCaptureGroup: cache_class
     pattern: org.jboss.resteasy.client.cache.(?P<cache_class>(CacheEntry|CacheFactory|CacheInterceptor|LightweightBrowserCache|BrowserCache|MapCache))
-  description: |-
-    RESTEasy 3 Cache Client package change
-    Caching in the RESTEasy client framework in resteasy-jaxrs is replaced by caching in the JAX-RS 2.0 compliant resteasy-client module.. Use `org.jboss.resteasy.client.jaxrs.cache` package instead of `org.jboss.resteasy.client.cache`.
+  description: RESTEasy 3 Cache Client package change
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -20,18 +18,16 @@
   links:
   - title: RESTEasy Client Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#application_migration_changes
-  message: Caching in the RESTEasy client framework in resteasy-jaxrs is replaced
-    by caching in the JAX-RS 2.0 compliant resteasy-client module.. Use `org.jboss.resteasy.client.jaxrs.cache`
-    package instead of `org.jboss.resteasy.client.cache`.
+  message: "Caching in the RESTEasy client framework in resteasy-jaxrs is replaced
+    by caching in the JAX-RS 2.0 compliant resteasy-client module.\n Use `org.jboss.resteasy.client.jaxrs.cache`
+    package instead of `org.jboss.resteasy.client.cache`.\n "
   ruleID: resteasy-eap6-000001
   when:
     java.referenced:
       pattern: org.jboss.resteasy.client.cache.(CacheEntry|CacheFactory|CacheInterceptor|LightweightBrowserCache|BrowserCache|MapCache)
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class ClientRequest in RESTEasy 3
-    Replace class `org.jboss.resteasy.client.ClientRequest` with `org.jboss.resteasy.client.jaxrs.ResteasyClient`.. The following is an example of how to send a link header with the RESTEasy client in EAP 6 with RESTEasy 2.3.x.. ```java. ClientRequest request = new ClientRequest(generateURL("/linkheader/str"));. request.addLink("previous chapter", "previous", "http://example.com/TheBook/chapter2", null);. ClientResponse response = request.post();. LinkHeader header = response.getLinkHeader();. ```. The following is an example of how to accomplish the same task with the RESTEasy client in RESTEasy 3.. ```java. ResteasyClient client = new ResteasyClientBuilder().build();. Response response = client.target(generateURL("/linkheader/str")).request(). .header("Link", "<http://example.com/TheBook/chapter2>; rel="previous";. title="previous chapter">").post(Entity.text(new String()));. javax.ws.rs.core.Link link = response.getLink("previous");. ```
+  description: Deprecated class ClientRequest in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -46,25 +42,24 @@
   links:
   - title: RESTEasy Client Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#application_migration_changes
-  message: Replace class `org.jboss.resteasy.client.ClientRequest` with `org.jboss.resteasy.client.jaxrs.ResteasyClient`..
+  message: "\n Replace class `org.jboss.resteasy.client.ClientRequest` with `org.jboss.resteasy.client.jaxrs.ResteasyClient`.\n\n
     The following is an example of how to send a link header with the RESTEasy client
-    in EAP 6 with RESTEasy 2.3.x.. ```java. ClientRequest request = new ClientRequest(generateURL("/linkheader/str"));.
-    request.addLink("previous chapter", "previous", "http://example.com/TheBook/chapter2",
-    null);. ClientResponse response = request.post();. LinkHeader header = response.getLinkHeader();.
-    ```. The following is an example of how to accomplish the same task with the RESTEasy
-    client in RESTEasy 3.. ```java. ResteasyClient client = new ResteasyClientBuilder().build();.
-    Response response = client.target(generateURL("/linkheader/str")).request(). .header("Link",
-    "<http://example.com/TheBook/chapter2>; rel="previous";. title="previous chapter">").post(Entity.text(new
-    String()));. javax.ws.rs.core.Link link = response.getLink("previous");. ```
+    in EAP 6 with RESTEasy 2.3.x.\n\n ```java\n ClientRequest request = new ClientRequest(generateURL(\"/linkheader/str\"));\n
+    request.addLink(\"previous chapter\", \"previous\", \"http://example.com/TheBook/chapter2\",
+    null);\n ClientResponse response = request.post();\n LinkHeader header = response.getLinkHeader();\n
+    ```\n\n The following is an example of how to accomplish the same task with the
+    RESTEasy client in RESTEasy 3.\n\n ```java\n ResteasyClient client = new ResteasyClientBuilder().build();\n
+    Response response = client.target(generateURL(\"/linkheader/str\")).request()\n
+    .header(\"Link\", \"<http://example.com/TheBook/chapter2>; rel=\"previous\";\n
+    title=\"previous chapter\">\").post(Entity.text(new String()));\n javax.ws.rs.core.Link
+    link = response.getLink(\"previous\");\n ```\n\n "
   ruleID: resteasy-eap6-000002
   when:
     java.referenced:
       pattern: org.jboss.resteasy.client.ClientRequest
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class ClientResponse in RESTEasy 3
-    Replace `org.jboss.resteasy.client.ClientResponse` class with `javax.ws.rs.core.Response`.
+  description: Deprecated class ClientResponse in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -89,8 +84,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.jboss.resteasy.client.(?P<type>(ProxyBuilder|ProxyConfig|ProxyFactory))
-  description: |
-    Deprecated class org.jboss.resteasy.client.{type} in RESTEasy 3
+  description: Deprecated class org.jboss.resteasy.client.{type} in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -112,9 +106,7 @@
       pattern: org.jboss.resteasy.client.(ProxyBuilder|ProxyConfig|ProxyFactory)
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class EntityTypeFactory in RESTEasy 3
-    There is no direct replacement for `org.jboss.resteasy.client.EntityTypeFactory` class.. `org.jboss.resteasy.client.ClientResponse<T>` is a generic type in the RESTEasy client framework,. but `org.jboss.resteasy.client.jaxrs.internal.ClientResponse` in the resteasy-client module is not, so. `EntityTypeFactory` is no longer useful.
+  description: Deprecated class EntityTypeFactory in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -129,19 +121,17 @@
   links:
   - title: RESTEasy Client Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#application_migration_changes
-  message: There is no direct replacement for `org.jboss.resteasy.client.EntityTypeFactory`
-    class.. `org.jboss.resteasy.client.ClientResponse<T>` is a generic type in the
-    RESTEasy client framework,. but `org.jboss.resteasy.client.jaxrs.internal.ClientResponse`
-    in the resteasy-client module is not, so. `EntityTypeFactory` is no longer useful.
+  message: "\n There is no direct replacement for `org.jboss.resteasy.client.EntityTypeFactory`
+    class.\n\n `org.jboss.resteasy.client.ClientResponse<T>` is a generic type in
+    the RESTEasy client framework,\n but `org.jboss.resteasy.client.jaxrs.internal.ClientResponse`
+    in the resteasy-client module is not, so\n `EntityTypeFactory` is no longer useful.\n "
   ruleID: resteasy-eap6-000005
   when:
     java.referenced:
       pattern: org.jboss.resteasy.client.EntityTypeFactory
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface ClientExecutor in RESTEasy 3
-    Replace the `org.jboss.resteasy.client.ClientExecutor` usage with `org.jboss.resteasy.client.jaxrs.ClientHttpEngine` class.
+  description: Deprecated interface ClientExecutor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -164,9 +154,7 @@
       pattern: org.jboss.resteasy.client.ClientExecutor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class ClientRequestFactory in RESTEasy 3
-    Replace the `org.jboss.resteasy.client.ClientRequestFactory` usage with `org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder` class.
+  description: Deprecated class ClientRequestFactory in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -189,9 +177,7 @@
       pattern: org.jboss.resteasy.client.ClientRequestFactory
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception ClientResponseFailure in RESTEasy 3
-    Replace the `org.jboss.resteasy.client.ClientResponseFailure` with `javax.ws.rs.client.ResponseProcessingException`. or with `javax.ws.rs.client.ProcessingException` or with `javax.ws.rs.client.WebApplicationException` class.
+  description: Deprecated exception ClientResponseFailure in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -206,18 +192,16 @@
   links:
   - title: RESTEasy Client Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#application_migration_changes
-  message: Replace the `org.jboss.resteasy.client.ClientResponseFailure` with `javax.ws.rs.client.ResponseProcessingException`.
-    or with `javax.ws.rs.client.ProcessingException` or with `javax.ws.rs.client.WebApplicationException`
-    class.
+  message: |-
+    Replace the `org.jboss.resteasy.client.ClientResponseFailure` with `javax.ws.rs.client.ResponseProcessingException`
+     or with `javax.ws.rs.client.ProcessingException` or with `javax.ws.rs.client.WebApplicationException` class.
   ruleID: resteasy-eap6-000008
   when:
     java.referenced:
       pattern: org.jboss.resteasy.client.ClientResponseFailure
 - category: mandatory
   customVariables: []
-  description: |-
-    RESTEasy 3 SPI Application Change for StringConverter
-    Replace `org.jboss.resteasy.spi.StringConverter` by `javax.ws.rs.ext.ParamConverterProvider`.
+  description: RESTEasy 3 SPI Application Change for StringConverter
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -241,9 +225,7 @@
       pattern: org.jboss.resteasy.spi.StringConverter
 - category: mandatory
   customVariables: []
-  description: |-
-    RESTEasy 3 SPI Application Changes for InjectorFactory
-    There were multiple changes on adding/removing methods on `org.jboss.resteasy.spi.InjectorFactory`.
+  description: RESTEasy 3 SPI Application Changes for InjectorFactory
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -267,9 +249,7 @@
       pattern: org.jboss.resteasy.spi.InjectorFactory
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface MessageBodyWriterInterceptor in RESTEasy 3
-    The interface `org.jboss.resteasy.spi.interception.MessageBodyWriterInterceptor` is deprecated and you should use `javax.ws.rs.ext.WriterInterceptor` from JAX-RS API.
+  description: Deprecated interface MessageBodyWriterInterceptor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -295,9 +275,7 @@
       pattern: org.jboss.resteasy.spi.interception.MessageBodyWriterInterceptor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface MessageBodyReaderInterceptor in RESTEasy 3
-    The interface `org.jboss.resteasy.spi.interception.MessageBodyReaderInterceptor` is deprecated and you should use `javax.ws.rs.ext.ReaderInterceptor` from JAX-RS API.
+  description: Deprecated interface MessageBodyReaderInterceptor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -323,9 +301,7 @@
       pattern: org.jboss.resteasy.spi.interception.MessageBodyReaderInterceptor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface MessageBodyWriterContext in RESTEasy 3
-    The interface `org.jboss.resteasy.spi.interception.MessageBodyWriterContext` is replaced by the `javax.ws.rs.ext.WriterInterceptorContext` interface by JAX-RS 2.0 compliant interceptor facility.
+  description: Deprecated interface MessageBodyWriterContext in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -351,9 +327,7 @@
       pattern: org.jboss.resteasy.spi.interception.MessageBodyWriterContext
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class InterceptorRegistry in RESTEasy 3
-    `org.jboss.resteasy.core.interception.InterceptorRegistry` is deprecated in favor of the JAX-RS 2.0 Interceptor and filter API.
+  description: Deprecated class InterceptorRegistry in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -378,9 +352,7 @@
       pattern: org.jboss.resteasy.core.interception.InterceptorRegistry
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface InterceptorRegistryListener in RESTEasy 3
-    `org.jboss.resteasy.core.interception.InterceptorRegistryListener` is deprecated in favor of the JAX-RS 2.0 Interceptor and filter API.
+  description: Deprecated interface InterceptorRegistryListener in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -405,9 +377,7 @@
       pattern: org.jboss.resteasy.core.interception.InterceptorRegistryListener
 - category: mandatory
   customVariables: []
-  description: |-
-    Removed class ApacheHttpClientExecutor from in RESTEasy 3
-    No direct replacement.
+  description: Removed class ApacheHttpClientExecutor from in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -431,9 +401,7 @@
       pattern: org.jboss.resteasy.client.core.executors.ApacheHttpClientExecutor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface AcceptedByMethod in RESTEasy 3
-    Use `javax.ws.rs.container.DynamicFeature` for Dynamic binding instead of implementing `org.jboss.resteasy.spi.interception.AcceptedByMethod` interface.
+  description: Deprecated interface AcceptedByMethod in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -458,9 +426,7 @@
       pattern: org.jboss.resteasy.spi.interception.AcceptedByMethod
 - category: mandatory
   customVariables: []
-  description: |-
-    Removed annotation ServerCached in RESTEasy 3
-    Remove annotation `@org.jboss.resteasy.annotations.cache.ServerCached' as it was removed in RESTEasy 3.x.
+  description: Removed annotation ServerCached in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -487,9 +453,7 @@
       pattern: org.jboss.resteasy.annotations.cache.ServerCached
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated class Link in RESTEasy 3
-    Replaced by `javax.ws.rs.core.Link` in JAX-RS API.
+  description: Deprecated class Link in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -514,9 +478,7 @@
       pattern: org.jboss.resteasy.spi.Link
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface ClientExecutionContext in RESTEasy 3
-    `org.jboss.resteasy.spi.interception.ClientExecutionContext` is deprecated in favor of the JAX-RS 2.0 Interceptor and filter API.
+  description: Deprecated interface ClientExecutionContext in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -541,9 +503,7 @@
       pattern: org.jboss.resteasy.spi.interception.ClientExecutionContext
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface ClientExecutionInterceptor in RESTEasy 3
-    Use `javax.ws.rs.client.Invocation` instead of `org.jboss.resteasy.spi.interception.ClientExecutionInterceptor`.. The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
+  description: Deprecated interface ClientExecutionInterceptor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -558,18 +518,16 @@
   links:
   - title: RESTEasy SPI Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
-  message: Use `javax.ws.rs.client.Invocation` instead of `org.jboss.resteasy.spi.interception.ClientExecutionInterceptor`..
-    The RESTEasy interceptor facility introduced in release 2.x is replaced by the
-    JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
+  message: |-
+    Use `javax.ws.rs.client.Invocation` instead of `org.jboss.resteasy.spi.interception.ClientExecutionInterceptor`.
+     The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
   ruleID: resteasy-eap6-000023
   when:
     java.referenced:
       pattern: org.jboss.resteasy.spi.interception.ClientExecutionInterceptor
 - category: mandatory
   customVariables: []
-  description: |-
-    ResteasyProviderFactory#add* methods were removed
-    Most of the `org.jboss.resteasy.spi.ResteasyProviderFactory#add*` methods have been removed or made protected in RESTEasy 3.0.. For example, the `addBuiltInMessageBodyReader()` and `addBuiltInMessageBodyWriter()` methods have been removed and the `addMessageBodyReader()` and `addMessageBodyWriter()` methods have been made protected.. You should now use the `registerProvider()` and `registerProviderInstance()` methods.
+  description: ResteasyProviderFactory#add* methods were removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -586,11 +544,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#resteasyproviderfactory_add_methods
   - title: JAX-RS API
     url: https://docs.jboss.org/resteasy/docs/3.0.16.Final/javadocs/org/jboss/resteasy/spi/ResteasyProviderFactory.html
-  message: Most of the `org.jboss.resteasy.spi.ResteasyProviderFactory#add*` methods
-    have been removed or made protected in RESTEasy 3.0.. For example, the `addBuiltInMessageBodyReader()`
-    and `addBuiltInMessageBodyWriter()` methods have been removed and the `addMessageBodyReader()`
-    and `addMessageBodyWriter()` methods have been made protected.. You should now
-    use the `registerProvider()` and `registerProviderInstance()` methods.
+  message: |-
+    Most of the `org.jboss.resteasy.spi.ResteasyProviderFactory#add*` methods have been removed or made protected in RESTEasy 3.0.
+     For example, the `addBuiltInMessageBodyReader()` and `addBuiltInMessageBodyWriter()` methods have been removed and the `addMessageBodyReader()` and `addMessageBodyWriter()` methods have been made protected.
+     You should now use the `registerProvider()` and `registerProviderInstance()` methods.
   ruleID: resteasy-eap6-000024
   when:
     java.referenced:
@@ -598,9 +555,7 @@
       pattern: org.jboss.resteasy.spi.ResteasyProviderFactory.add*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface MessageBodyReaderContext in RESTEasy 3
-    Use `javax.ws.rs.ext.ReaderInterceptorContext` instead of `org.jboss.resteasy.spi.interception.MessageBodyReaderContext`.. The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
+  description: Deprecated interface MessageBodyReaderContext in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -617,18 +572,16 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
   - title: JAX-RS API
     url: https://docs.oracle.com/javaee/7/api/index.html?javax/ws/rs/ext/ReaderInterceptor.html
-  message: Use `javax.ws.rs.ext.ReaderInterceptorContext` instead of `org.jboss.resteasy.spi.interception.MessageBodyReaderContext`..
-    The RESTEasy interceptor facility introduced in release 2.x is replaced by the
-    JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
+  message: |-
+    Use `javax.ws.rs.ext.ReaderInterceptorContext` instead of `org.jboss.resteasy.spi.interception.MessageBodyReaderContext`.
+     The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant interceptor facility in release 3.0.x.
   ruleID: resteasy-eap6-000025
   when:
     java.referenced:
       pattern: org.jboss.resteasy.spi.interception.MessageBodyReaderContext
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface PostProcessInterceptor in RESTEasy 3
-    Use `javax.ws.rs.container.ContainerResponseFilter` instead of `org.jboss.resteasy.spi.interception.PostProcessInterceptor`.. The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
+  description: Deprecated interface PostProcessInterceptor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -645,18 +598,16 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
   - title: JAX-RS API
     url: https://jax-rs-spec.java.net/nonav/2.0-rev-a/apidocs/index.html?javax/ws/rs/container/ContainerResponseFilter.html
-  message: Use `javax.ws.rs.container.ContainerResponseFilter` instead of `org.jboss.resteasy.spi.interception.PostProcessInterceptor`..
-    The RESTEasy interceptor facility introduced in release 2.x is replaced by the
-    JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
+  message: |-
+    Use `javax.ws.rs.container.ContainerResponseFilter` instead of `org.jboss.resteasy.spi.interception.PostProcessInterceptor`.
+     The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
   ruleID: resteasy-eap6-000029
   when:
     java.referenced:
       pattern: org.jboss.resteasy.spi.interception.PostProcessInterceptor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated interface PreProcessInterceptor in RESTEasy 3
-    Use `javax.ws.rs.container.ContainerRequestFilter` instead of `org.jboss.resteasy.spi.interception.PreProcessInterceptor`.. The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
+  description: Deprecated interface PreProcessInterceptor in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -673,18 +624,16 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
   - title: JAX-RS API
     url: https://jax-rs-spec.java.net/nonav/2.0-rev-a/apidocs/index.html?javax/ws/rs/container/ContainerRequestFilter.html
-  message: Use `javax.ws.rs.container.ContainerRequestFilter` instead of `org.jboss.resteasy.spi.interception.PreProcessInterceptor`..
-    The RESTEasy interceptor facility introduced in release 2.x is replaced by the
-    JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
+  message: |-
+    Use `javax.ws.rs.container.ContainerRequestFilter` instead of `org.jboss.resteasy.spi.interception.PreProcessInterceptor`.
+     The RESTEasy interceptor facility introduced in release 2.x is replaced by the JAX-RS 2.0 compliant filters and interceptor facility in release 3.0.x.
   ruleID: resteasy-eap6-000030
   when:
     java.referenced:
       pattern: org.jboss.resteasy.spi.interception.PreProcessInterceptor
 - category: mandatory
   customVariables: []
-  description: |-
-    RESTEasy 3 SPI Registry changed
-    There were multiple changes on adding/removing methods on `org.jboss.resteasy.spi.Registry`.
+  description: RESTEasy 3 SPI Registry changed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -708,9 +657,7 @@
       pattern: org.jboss.resteasy.spi.Registry
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception ForbiddenException in RESTEasy 3
-    Replaced by `javax.ws.rs.ForbiddenException` in jaxrs-api module.
+  description: Deprecated exception ForbiddenException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -735,9 +682,7 @@
       pattern: org.jboss.resteasy.spi.ForbiddenException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception MethodNotAllowedException in RESTEasy 3
-    Replaced by `javax.ws.rs.NotAllowedException` in jaxrs-api module.
+  description: Deprecated exception MethodNotAllowedException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -762,9 +707,7 @@
       pattern: org.jboss.resteasy.spi.MethodNotAllowedException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception NotAcceptableException in RESTEasy 3
-    Replaced by `javax.ws.rs.NotAcceptableException` in jaxrs-api module.
+  description: Deprecated exception NotAcceptableException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -789,9 +732,7 @@
       pattern: org.jboss.resteasy.spi.NotAcceptableException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception NotFoundException in RESTEasy 3
-    Replaced by `javax.ws.rs.NotFoundException` in jaxrs-api module.
+  description: Deprecated exception NotFoundException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -816,9 +757,7 @@
       pattern: org.jboss.resteasy.spi.NotFoundException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception UnauthorizedException in RESTEasy 3
-    Replaced by `javax.ws.rs.NotAuthorizedException` in jaxrs-api module.
+  description: Deprecated exception UnauthorizedException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -843,9 +782,7 @@
       pattern: org.jboss.resteasy.spi.UnauthorizedException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated exception UnsupportedMediaTypeException in RESTEasy 3
-    Replaced by `javax.ws.rs.NotSupportedException` in jaxrs-api module.
+  description: Deprecated exception UnsupportedMediaTypeException in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -870,9 +807,7 @@
       pattern: org.jboss.resteasy.spi.UnsupportedMediaTypeException
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method ServerCookie#checkName in RESTEasy 3
-    RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#checkName` without a replacement.. It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie` class which was a template for this method.
+  description: Deprecated method ServerCookie#checkName in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -887,9 +822,9 @@
   links:
   - title: RESTEasy SPI Application Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
-  message: RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#checkName`
-    without a replacement.. It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie`
-    class which was a template for this method.
+  message: |-
+    RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#checkName` without a replacement.
+     It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie` class which was a template for this method.
   ruleID: resteasy-eap6-000118
   when:
     java.referenced:
@@ -897,9 +832,7 @@
       pattern: org.jboss.resteasy.plugins.delegates.ServerCookie.checkName*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method JAXBContextWrapper#createValidator in RESTEasy 3
-    Empty
+  description: Deprecated method JAXBContextWrapper#createValidator in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -922,9 +855,7 @@
       pattern: org.jboss.resteasy.plugins.providers.jaxb.JAXBContextWrapper.createValidator*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method ResteasyHttpServletResponseWrapper#encodeRedirectUrl
-    Replace method calls of `encodeRedirectUrl` with `encodeRedirectURL(String url)`.
+  description: Deprecated method ResteasyHttpServletResponseWrapper#encodeRedirectUrl
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -950,9 +881,7 @@
       pattern: org.jboss.resteasy.core.ResteasyHttpServletResponseWrapper.encodeRedirectUrl*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated ResteasyHttpServletResponseWrapper#encodeUrl method
-    Replace `ResteasyHttpServletResponseWrapper#encodeUrl` with `ResteasyHttpServletResponseWrapper#encodeURL(String url)`.
+  description: Deprecated ResteasyHttpServletResponseWrapper#encodeUrl method
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -978,9 +907,8 @@
       pattern: org.jboss.resteasy.core.ResteasyHttpServletResponseWrapper.encodeUrl*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method MultipartFormDataInputImpl#getFormData in RESTEasy 3
-    `MultipartFormDataInputImpl#getFormData` method will be removed in the future. Use `MultipartFormDataInput#getFormDataMap()` instead.
+  description: Deprecated method MultipartFormDataInputImpl#getFormData in RESTEasy
+    3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1006,9 +934,7 @@
       pattern: org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInputImpl.getFormData*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method MultipartFormDataInput#getFormData in RESTEasy 3
-    `MultipartFormDataInput#getFormData` method will be removed in the future. Use `MultipartFormDataInput#getFormDataMap()` instead.
+  description: Deprecated method MultipartFormDataInput#getFormData in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1034,9 +960,8 @@
       pattern: org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput.getFormData*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method ResteasyHttpServletRequestWrapper.isRequestedSessionIdFromURL in RESTEasy 3
-    As of Version 2.1 of the Java Servlet API, use `ResteasyHttpServletRequestWrapper.isRequestedSessionIdFromURL()` instead.
+  description: Deprecated method ResteasyHttpServletRequestWrapper.isRequestedSessionIdFromURL
+    in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1062,9 +987,7 @@
       pattern: org.jboss.resteasy.core.ResteasyHttpServletRequestWrapper.isRequestedSessionIdFromUrl*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method SecureUnmarshaller#isValidating in RESTEasy 3
-    Method `org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller#isValidating` is deprecated without a replacement.
+  description: Deprecated method SecureUnmarshaller#isValidating in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1090,9 +1013,7 @@
       pattern: org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller.isValidating*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method ServerCookie#maybeQuote in RESTEasy 3
-    RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#maybeQuote` without a replacement.. It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie` class which was a template for this method.
+  description: Deprecated method ServerCookie#maybeQuote in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1109,9 +1030,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
   - title: JAX-RS API
     url: https://docs.jboss.org/resteasy/docs/3.0.16.Final/javadocs/org/jboss/resteasy/plugins/delegates/ServerCookie.html#maybeQuote%28int,%20java.lang.StringBuffer,%20java.lang.String%29
-  message: RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#maybeQuote`
-    without a replacement.. It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie`
-    class which was a template for this method.
+  message: |-
+    RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.delegates.ServerCookie#maybeQuote` without a replacement.
+     It was deprecated in the original `org.apache.tomcat.util.http.ServerCookie` class which was a template for this method.
   ruleID: resteasy-eap6-000127
   when:
     java.referenced:
@@ -1119,9 +1040,7 @@
       pattern: org.jboss.resteasy.plugins.delegates.ServerCookie.maybeQuote*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method SecureUnmarshaller#setAdapter in RESTEasy 3
-    Method `org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller#setAdapter` is deprecated in RESTEasy 3.
+  description: Deprecated method SecureUnmarshaller#setAdapter in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1147,9 +1066,8 @@
       pattern: org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller.setAdapter*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method ResteasyHttpServletResponseWrapper#setStatus in RESTEasy 3
-    As of version 2.1, due to ambiguous meaning of the message parameter. To set a status code use `setStatus(int)` instead,. to send an error with a description use `sendError(int, String)`. Sets the status code and message for this response.
+  description: Deprecated method ResteasyHttpServletResponseWrapper#setStatus in RESTEasy
+    3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1166,9 +1084,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_resteasy_deprecated_classes
   - title: RESTEasy javadoc ResteasyHttpServletResponseWrapper.html#setStatus
     url: https://docs.jboss.org/resteasy/docs/3.0.16.Final/javadocs/org/jboss/resteasy/core/ResteasyHttpServletResponseWrapper.html#setStatus(int,%20java.lang.String)
-  message: As of version 2.1, due to ambiguous meaning of the message parameter. To
-    set a status code use `setStatus(int)` instead,. to send an error with a description
-    use `sendError(int, String)`. Sets the status code and message for this response.
+  message: |-
+    As of version 2.1, due to ambiguous meaning of the message parameter. To set a status code use `setStatus(int)` instead,
+     to send an error with a description use `sendError(int, String)`. Sets the status code and message for this response.
   ruleID: resteasy-eap6-000129
   when:
     java.referenced:
@@ -1176,9 +1094,7 @@
       pattern: org.jboss.resteasy.core.ResteasyHttpServletResponseWrapper.setStatus*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method SecureUnmarshaller#setValidating in RESTEasy 3
-    RESTEasy 3 deprecates method `org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller#setValidating` without a replacement.
+  description: Deprecated method SecureUnmarshaller#setValidating in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1204,9 +1120,7 @@
       pattern: org.jboss.resteasy.plugins.providers.jaxb.SecureUnmarshaller.setValidating*
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated method OAuthValidator#validateMessage in RESTEasy 3
-    RESTEasy 3 deprecates `org.jboss.resteasy.auth.oauth.OAuthValidator#validateMessage` method without a replacement.
+  description: Deprecated method OAuthValidator#validateMessage in RESTEasy 3
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1232,9 +1146,7 @@
       pattern: org.jboss.resteasy.auth.oauth.OAuthValidator.validateMessage*
 - category: mandatory
   customVariables: []
-  description: |-
-    Resteasy Yaml Provider is deprecated and disabled by default
-    The resteasy-yaml-provider module is not recommended to use due security issue in SnakeYAML library used by RESTEasy for unmarshaling.. If you would like to use YAML Resteasy Provider even it is not recommended,. you need to add the SnakeYAML library (Maven dependency) into your application and enable it by creating file `META-INF/services/javax.ws.rs.ext.Providers` with line `org.jboss.resteasy.plugins.providers.YamlProvider` in that file and your application.
+  description: Resteasy Yaml Provider is deprecated and disabled by default
   effort: 3
   labels:
   - konveyor.io/source=eap6
@@ -1248,12 +1160,12 @@
   - resteasy
   - yaml
   links: []
-  message: The resteasy-yaml-provider module is not recommended to use due security
-    issue in SnakeYAML library used by RESTEasy for unmarshaling.. If you would like
-    to use YAML Resteasy Provider even it is not recommended,. you need to add the
-    SnakeYAML library (Maven dependency) into your application and enable it by creating
-    file `META-INF/services/javax.ws.rs.ext.Providers` with line `org.jboss.resteasy.plugins.providers.YamlProvider`
-    in that file and your application.
+  message: "The resteasy-yaml-provider module is not recommended to use due security
+    issue in SnakeYAML library used by RESTEasy for unmarshaling. \n If you would
+    like to use YAML Resteasy Provider even it is not recommended, \n you need to
+    add the SnakeYAML library (Maven dependency) into your application and enable
+    it by creating file `META-INF/services/javax.ws.rs.ext.Providers` with line `org.jboss.resteasy.plugins.providers.YamlProvider`
+    in that file and your application.\n "
   ruleID: resteasy-eap6-000140
   when:
     java.referenced:
@@ -1261,9 +1173,7 @@
       pattern: javax.ws.rs.Produces
 - category: mandatory
   customVariables: []
-  description: |-
-    Resteasy SerializableProvider is disabled by default
-    Deserializing Java objects from untrusted sources is not safe. For this reason,. the `org.jboss.resteasy.plugins.providers.SerializableProvider` class is disabled by default, and it is not recommended to use this provider.. If you need to enable it even against the recommendation, create or update file `META-INF/services/javax.ws.rs.ext.Providers` with adding line with `org.jboss.resteasy.plugins.providers.SerializableProvider` string.
+  description: Resteasy SerializableProvider is disabled by default
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1276,12 +1186,12 @@
   - konveyor.io/target=eap
   - resteasy
   links: []
-  message: Deserializing Java objects from untrusted sources is not safe. For this
-    reason,. the `org.jboss.resteasy.plugins.providers.SerializableProvider` class
-    is disabled by default, and it is not recommended to use this provider.. If you
-    need to enable it even against the recommendation, create or update file `META-INF/services/javax.ws.rs.ext.Providers`
+  message: "Deserializing Java objects from untrusted sources is not safe. For this
+    reason, \n the `org.jboss.resteasy.plugins.providers.SerializableProvider` class
+    is disabled by default, and it is not recommended to use this provider. \n If
+    you need to enable it even against the recommendation, create or update file `META-INF/services/javax.ws.rs.ext.Providers`
     with adding line with `org.jboss.resteasy.plugins.providers.SerializableProvider`
-    string.
+    string.\n "
   ruleID: resteasy-eap6-000141
   when:
     or:
@@ -1293,9 +1203,7 @@
         pattern: javax.ws.rs.Consumes
 - category: optional
   customVariables: []
-  description: |-
-    RESTEasy Text default charset response changed
-    RESTEasy fixes the issue when it doesn't set/add correctly character set meta data specified in JAX-RS specification. Therefore UTF-8 as the character set for text media types is set by default.. This behavior results in adding `charset=UTF-8` string to the returned content-type header when the resource method returns a `text/*` or `application/xml*` media type without an explicit charset.. The behavior is controlled by `resteasy.add.charset` parameter which is set to `true` by default and you can customize the `resteasy.add.charset` parameter to `false` in _web.xml_'s `context-param` element. in case of wanting to keep previous behavior.
+  description: RESTEasy Text default charset response changed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -1313,14 +1221,15 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html/migration_guide/application_migration_changes#migrate_resteasy_default_charset_utf8_in_content_type_header
   - title: RESTEasy Text media types and character sets
     url: http://docs.jboss.org/resteasy/docs/3.1.4.Final/userguide/html_single/index.html#Text_media_types
-  message: RESTEasy fixes the issue when it doesn't set/add correctly character set
+  message: "RESTEasy fixes the issue when it doesn't set/add correctly character set
     meta data specified in JAX-RS specification. Therefore UTF-8 as the character
-    set for text media types is set by default.. This behavior results in adding `charset=UTF-8`
-    string to the returned content-type header when the resource method returns a
-    `text/*` or `application/xml*` media type without an explicit charset.. The behavior
-    is controlled by `resteasy.add.charset` parameter which is set to `true` by default
-    and you can customize the `resteasy.add.charset` parameter to `false` in _web.xml_'s
-    `context-param` element. in case of wanting to keep previous behavior.
+    set for text media types is set by default.\n This behavior results in adding
+    `charset=UTF-8` string to the returned content-type header when the resource method
+    returns a `text/*` or `application/xml*` media type without an explicit charset.\n
+    The behavior is controlled by `resteasy.add.charset` parameter which is set to
+    `true` by default and you can customize the `resteasy.add.charset` parameter to
+    `false` in _web.xml_'s `context-param` element \n in case of wanting to keep previous
+    behavior.\n "
   ruleID: resteasy-eap6-000142
   when:
     or:
diff --git a/default/generated/eap7/80-ws-security.windup.yaml b/default/generated/eap7/80-ws-security.windup.yaml
index 060c2111..a93ca925 100644
--- a/default/generated/eap7/80-ws-security.windup.yaml
+++ b/default/generated/eap7/80-ws-security.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WS-Security WSPasswordCallback's package changed
-    The `org.apache.ws.security.WSPasswordCallback` class has moved to package `org.apache.wss4j.common.ext`.. The application must be changed to reference to the new package.
+  description: WS-Security WSPasswordCallback's package changed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -14,9 +12,9 @@
   links:
   - title: WS-Security Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_ws_security_changes
-  message: The `org.apache.ws.security.WSPasswordCallback` class has moved to package
-    `org.apache.wss4j.common.ext`.. The application must be changed to reference to
-    the new package.
+  message: "\n The `org.apache.ws.security.WSPasswordCallback` class has moved to
+    package `org.apache.wss4j.common.ext`.\n The application must be changed to reference
+    to the new package.\n "
   ruleID: ws-security-00000
   when:
     java.referenced:
@@ -27,9 +25,7 @@
   - name: SAMLClassAndPackages
     nameOfCaptureGroup: SAMLClassAndPackages
     pattern: org.apache.ws.security.saml.ext.(?P<SAMLClassAndPackages>(bean.|builder.|OpenSAMLBootstrap|OpenSAMLUtil|SAMLCallback))?.*
-  description: |-
-    WS-Security SAML package changed
-    Most of the SAML bean objects from the `org.apache.ws.security.saml.ext` package have been moved to the `org.apache.wss4j.common.saml` package.. The application must be changed to reference to the new package.
+  description: WS-Security SAML package changed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -41,9 +37,9 @@
   links:
   - title: WS-Security Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate_ws_security_changes
-  message: Most of the SAML bean objects from the `org.apache.ws.security.saml.ext`
-    package have been moved to the `org.apache.wss4j.common.saml` package.. The application
-    must be changed to reference to the new package.
+  message: "\n Most of the SAML bean objects from the `org.apache.ws.security.saml.ext`
+    package have been moved to the `org.apache.wss4j.common.saml` package.\n The application
+    must be changed to reference to the new package.\n "
   ruleID: ws-security-00001
   when:
     java.referenced:
@@ -51,9 +47,7 @@
       pattern: org.apache.ws.security.saml.ext.(bean.|builder.|OpenSAMLBootstrap|OpenSAMLUtil|SAMLCallback)*
 - category: mandatory
   customVariables: []
-  description: |-
-    WS-Security AssertionWrapper renamed and moved
-    The `org.apache.ws.security.saml.ext.AssertionWrapper` class have been renamed and moved to the `org.apache.wss4j.common.saml.SamlAssertionWrapper` class.. The application must be changed to reference and use the new class.
+  description: WS-Security AssertionWrapper renamed and moved
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -65,9 +59,9 @@
   links:
   - title: Javadoc SamlAssertionWrapper
     url: https://access.redhat.com/webassets/avalon/d/red-hat-jboss-enterprise-application-platform/7.0.0/javadocs/org/apache/wss4j/common/saml/SamlAssertionWrapper.html
-  message: The `org.apache.ws.security.saml.ext.AssertionWrapper` class have been
-    renamed and moved to the `org.apache.wss4j.common.saml.SamlAssertionWrapper` class..
-    The application must be changed to reference and use the new class.
+  message: "\n The `org.apache.ws.security.saml.ext.AssertionWrapper` class have been
+    renamed and moved to the `org.apache.wss4j.common.saml.SamlAssertionWrapper` class.\n
+    The application must be changed to reference and use the new class.\n "
   ruleID: ws-security-00002
   when:
     java.referenced:
diff --git a/default/generated/eap7/81-hibernate50-51.windup.yaml b/default/generated/eap7/81-hibernate50-51.windup.yaml
index 8a4a8cee..0aea64c3 100644
--- a/default/generated/eap7/81-hibernate50-51.windup.yaml
+++ b/default/generated/eap7/81-hibernate50-51.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5.1  - @Embeddable changes interpretation
-    Previous releases of Hibernate interpreted all null column values for an `@Embeddable` to mean the `@Embeddable` itself should be null.. In this release, applications can dictate that Hibernate should instead use an empty `@Embeddable` instance by specifying the `hibernate.create_empty_composites.enabled` opt-in setting.
+  description: Hibernate 5.1  - @Embeddable changes interpretation
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.0-
@@ -18,11 +16,11 @@
   links:
   - title: Hibernate ORM 5.1 Features
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/migration_guide/application_migration_changes#hibernate_5_1_features
-  message: Previous releases of Hibernate interpreted all null column values for an
-    `@Embeddable` to mean the `@Embeddable` itself should be null.. In this release,
-    applications can dictate that Hibernate should instead use an empty `@Embeddable`
+  message: "\n Previous releases of Hibernate interpreted all null column values for
+    an `@Embeddable` to mean the `@Embeddable` itself should be null.\n\n In this
+    release, applications can dictate that Hibernate should instead use an empty `@Embeddable`
     instance by specifying the `hibernate.create_empty_composites.enabled` opt-in
-    setting.
+    setting.\n "
   ruleID: hibernate50-51-00000
   when:
     java.referenced:
@@ -30,9 +28,7 @@
       pattern: javax.persistence.Embeddable
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.1  - Changes to schema management tooling
-    The changes mainly focused on:. *  Unifying handling of hbm2ddl.auto and Hibernate’s JPA schema-generation support.. *  Removing JDBC concerns from the SPI to facilitate true replacement (for OGM). These changes are a migration concern since the application is directly using some of the changed classes.
+  description: Hibernate 5.1  - Changes to schema management tooling
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.0-
@@ -48,10 +44,10 @@
   links:
   - title: Schema Management Tooling Changes
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.1/html-single/migration_guide/application_migration_changes#schema_management_tooling_changes
-  message: The changes mainly focused on:. *  Unifying handling of hbm2ddl.auto and
-    Hibernate’s JPA schema-generation support.. *  Removing JDBC concerns from the
-    SPI to facilitate true replacement (for OGM). These changes are a migration concern
-    since the application is directly using some of the changed classes.
+  message: "\n The changes mainly focused on:\n\n * Unifying handling of hbm2ddl.auto
+    and Hibernate’s JPA schema-generation support.\n * Removing JDBC concerns from
+    the SPI to facilitate true replacement (for OGM)\n\n These changes are a migration
+    concern since the application is directly using some of the changed classes.\n "
   ruleID: hibernate50-51-00100
   when:
     or:
diff --git a/default/generated/eap7/82-hibernate51-53.windup.yaml b/default/generated/eap7/82-hibernate51-53.windup.yaml
index 1ccb1f83..236d731c 100644
--- a/default/generated/eap7/82-hibernate51-53.windup.yaml
+++ b/default/generated/eap7/82-hibernate51-53.windup.yaml
@@ -3,9 +3,7 @@
   - name: methods_param
     nameOfCaptureGroup: methods_param
     pattern: (?P<methods_param>(org.hibernate.usertype.UserVersionType.next|org.hibernate.type.VersionType.next|org.hibernate.type.SingleColumnType.set|org.hibernate.type.AbstractStandardBasicType.set|org.hibernate.type.Type.resolve|org.hibernate.usertype.UserVersionType.seed|org.hibernate.type.VersionType.seed|org.hibernate.collection.spi.PersistentCollection.setCurrentSession|org.hibernate.type.ProcedureParameterNamedBinder.nullSafeSet|org.hibernate.type.Type.nullSafeSet|org.hibernate.usertype.UserType.nullSafeSet|org.hibernate.usertype.CompositeUserType.nullSafeSet|org.hibernate.type.Type.beforeAssemble|org.hibernate.type.AbstractStandardBasicType.nullSafeGet|org.hibernate.type.Type.nullSafeGet|org.hibernate.type.SingleColumnType.nullSafeGet|org.hibernate.usertype.UserType.nullSafeGet|org.hibernate.usertype.CompositeUserType.nullSafeGet|org.hibernate.type.Type.replace|org.hibernate.usertype.CompositeUserType.replace|org.hibernate.usertype.UserCollectionType.replaceElements|org.hibernate.collection.spi.PersistentCollection.unsetSession|org.hibernate.type.Type.hydrate|org.hibernate.type.Type.semiResolve|org.hibernate.usertype.CompositeUserType.assemble|org.hibernate.type.Type.assemble|org.hibernate.usertype.UserCollectionType.instantiate|org.hibernate.usertype.CompositeUserType.disassemble|org.hibernate.type.Type.disassemble|org.hibernate.type.ProcedureParameterExtractionAware.extract|org.hibernate.type.Type.isDirty|org.hibernate.type.Type.isModified|org.hibernate.type.SingleColumnType.get|org.hibernate.type.AbstractStandardBasicType.get|org.hibernate.usertype.UserCollectionType.wrap))?(.*org.hibernate.engine.spi.SessionImplementor.*)
-  description: |-
-    Hibernate 5.3 - SessionImplementor parameter changed to SharedSessionContractImplementor
-    `org.hibernate.engine.spi.SessionImplementor` parameter has to be changed to `org.hibernate.engine.spi.SharedSessionContractImplementor`.
+  description: Hibernate 5.3 - SessionImplementor parameter changed to SharedSessionContractImplementor
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -28,9 +26,8 @@
       pattern: (org.hibernate.usertype.UserVersionType.next|org.hibernate.type.VersionType.next|org.hibernate.type.SingleColumnType.set|org.hibernate.type.AbstractStandardBasicType.set|org.hibernate.type.Type.resolve|org.hibernate.usertype.UserVersionType.seed|org.hibernate.type.VersionType.seed|org.hibernate.collection.spi.PersistentCollection.setCurrentSession|org.hibernate.type.ProcedureParameterNamedBinder.nullSafeSet|org.hibernate.type.Type.nullSafeSet|org.hibernate.usertype.UserType.nullSafeSet|org.hibernate.usertype.CompositeUserType.nullSafeSet|org.hibernate.type.Type.beforeAssemble|org.hibernate.type.AbstractStandardBasicType.nullSafeGet|org.hibernate.type.Type.nullSafeGet|org.hibernate.type.SingleColumnType.nullSafeGet|org.hibernate.usertype.UserType.nullSafeGet|org.hibernate.usertype.CompositeUserType.nullSafeGet|org.hibernate.type.Type.replace|org.hibernate.usertype.CompositeUserType.replace|org.hibernate.usertype.UserCollectionType.replaceElements|org.hibernate.collection.spi.PersistentCollection.unsetSession|org.hibernate.type.Type.hydrate|org.hibernate.type.Type.semiResolve|org.hibernate.usertype.CompositeUserType.assemble|org.hibernate.type.Type.assemble|org.hibernate.usertype.UserCollectionType.instantiate|org.hibernate.usertype.CompositeUserType.disassemble|org.hibernate.type.Type.disassemble|org.hibernate.type.ProcedureParameterExtractionAware.extract|org.hibernate.type.Type.isDirty|org.hibernate.type.Type.isModified|org.hibernate.type.SingleColumnType.get|org.hibernate.type.AbstractStandardBasicType.get|org.hibernate.usertype.UserCollectionType.wrap)(*org.hibernate.engine.spi.SessionImplementor*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - hibernate-java8 module has been merged into hibernate-core and the Java 8 date/time types are now natively supported.
-    change reference to hibernate-java8 to hibernate-core (since hibernate-java8 has been merged into hibernate-core module)
+  description: Hibernate 5.3 - hibernate-java8 module has been merged into hibernate-core
+    and the Java 8 date/time types are now natively supported.
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -44,8 +41,8 @@
   - title: 'Red Hat JBoss EAP 7.2: Migrating from Hibernate ORM 5.1 to Hibernate ORM
       5.3'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#migrating_from_hibernate_5_1_to_5_3
-  message: change reference to hibernate-java8 to hibernate-core (since hibernate-java8
-    has been merged into hibernate-core module)
+  message: 'change reference to hibernate-java8 to hibernate-core (since hibernate-java8
+    has been merged into hibernate-core module) '
   ruleID: hibernate51-53-00100
   when:
     or:
@@ -78,9 +75,7 @@
       |context.TenantIdentifierMismatchException|jdbc.TooManyRowsAffectedException|TransactionException|resource.transaction.TransactionRequiredForJoinException
       |TransientObjectException|TypeMismatchException|cache.spi.access.UnknownAccessTypeException|persister.spi.UnknownPersisterException|UnknownProfileException
       |service.UnknownServiceException|service.UnknownUnwrapTypeException|UnresolvableObjectException|UnsupportedLockAttemptException|WrongClassException))
-  description: |-
-    Hibernate 5.3 - Exception Handling
-    If the `SessionFactory` is built via Hibernate’s native bootstrapping and `org.hibernate.HibernateException` or a subclass is referenced by the application. then set `hibernate.native_exception_handling_51_compliance` configuration property to `true`.
+  description: Hibernate 5.3 - Exception Handling
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -94,10 +89,9 @@
   - title: 'Red Hat JBoss EAP 7.2: Migrating from Hibernate ORM 5.1 to Hibernate ORM
       5.3'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#exception_handling_changes_between_51_53
-  message: If the `SessionFactory` is built via Hibernate’s native bootstrapping and
-    `org.hibernate.HibernateException` or a subclass is referenced by the application.
-    then set `hibernate.native_exception_handling_51_compliance` configuration property
-    to `true`.
+  message: |2-
+     If the `SessionFactory` is built via Hibernate’s native bootstrapping and `org.hibernate.HibernateException` or a subclass is referenced by the application
+     then set `hibernate.native_exception_handling_51_compliance` configuration property to `true`.
   ruleID: hibernate51-53-00300
   when:
     java.referenced:
@@ -122,9 +116,7 @@
         |service.UnknownServiceException|service.UnknownUnwrapTypeException|UnresolvableObjectException|UnsupportedLockAttemptException|WrongClassException)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getQueryCache() method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getDefaultQueryResultsCache()` should be used instead of `SessionFactoryImplementor.getQueryCache()` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getQueryCache() method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -147,9 +139,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getQueryCache*
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getQueryCache(String regionName) method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getDefaultQueryResultsCache(String regionName)` should be used instead of `SessionFactoryImplementor.getQueryCache(String regionName)` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getQueryCache(String regionName)
+    method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -173,9 +164,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getQueryCache(*String*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getUpdateTimestampsCache() method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getTimestampsCache()` should be used instead of `SessionFactoryImplementor.getUpdateTimestampsCache()` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getUpdateTimestampsCache()
+    method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -199,9 +189,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getUpdateTimestampsCache*
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getSecondLevelCacheRegion(String regionName) method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getRegion(String regionName)` should be used instead of `SessionFactoryImplementor.getSecondLevelCacheRegion(String regionName)` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getSecondLevelCacheRegion(String
+    regionName) method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -225,9 +214,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getSecondLevelCacheRegion(*String*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getSecondLevelCacheRegionAccessStrategy(String regionName) method removed
-    Depending on the type of region, the appropriate method should be used instead:. * For an entity cache region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister( entityName ).getCacheAccessStrategy()` should be used instead. * For a collection region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().collectionPersister( role ).getCacheAccessStrategy()` should be used instead. * For a natural ID region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister( entityName ).getNaturalIdCacheAccessStrategy()` should be used instead
+  description: Hibernate 5.3 - SessionFactoryImplementor.getSecondLevelCacheRegionAccessStrategy(String
+    regionName) method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -241,13 +229,13 @@
   - title: 'Red Hat JBoss EAP 7.2: Migrating from Hibernate ORM 5.1 to Hibernate ORM
       5.3'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#migrating_from_hibernate_5_1_to_5_3
-  message: Depending on the type of region, the appropriate method should be used
-    instead:. * For an entity cache region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister(
-    entityName ).getCacheAccessStrategy()` should be used instead. * For a collection
+  message: "\n Depending on the type of region, the appropriate method should be used
+    instead: \n\n * For an entity cache region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister(
+    entityName ).getCacheAccessStrategy()` should be used instead\n * For a collection
     region, `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().collectionPersister(
-    role ).getCacheAccessStrategy()` should be used instead. * For a natural ID region,
+    role ).getCacheAccessStrategy()` should be used instead\n * For a natural ID region,
     `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister(
-    entityName ).getNaturalIdCacheAccessStrategy()` should be used instead
+    entityName ).getNaturalIdCacheAccessStrategy()` should be used instead\n "
   ruleID: hibernate51-53-00404
   when:
     java.referenced:
@@ -255,9 +243,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getSecondLevelCacheRegionAccessStrategy(*String*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getNaturalIdCacheRegion(String regionName) method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getRegion(String regionName)` should be used instead of `SessionFactoryImplementor.getNaturalIdCacheRegion(String regionName)` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getNaturalIdCacheRegion(String
+    regionName) method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -281,9 +268,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getNaturalIdCacheRegion(*String*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getNaturalIdCacheRegionAccessStrategy(String regionName) method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister( entityName ).getNaturalIdCacheAccessStrategy()` should be used instead of `SessionFactoryImplementor.getNaturalIdCacheRegionAccessStrategy(String regionName)` method.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getNaturalIdCacheRegionAccessStrategy(String
+    regionName) method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -307,9 +293,8 @@
       pattern: org.hibernate.engine.spi.SessionFactoryImplementor.getNaturalIdCacheRegionAccessStrategy(*String*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SessionFactoryImplementor.getAllSecondLevelCacheRegions() method removed
-    `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getCacheRegionNames()` should be used to obtain all cache region names, then `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getRegion(String regionName)` should be used to look up each region.
+  description: Hibernate 5.3 - SessionFactoryImplementor.getAllSecondLevelCacheRegions()
+    method removed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -323,9 +308,9 @@
   - title: 'Red Hat JBoss EAP 7.2: Migrating from Hibernate ORM 5.1 to Hibernate ORM
       5.3'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#migrating_from_hibernate_5_1_to_5_3
-  message: '`org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getCacheRegionNames()`
+  message: "\n `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getCacheRegionNames()`
     should be used to obtain all cache region names, then `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getRegion(String
-    regionName)` should be used to look up each region.'
+    regionName)` should be used to look up each region.\n "
   ruleID: hibernate51-53-00407
   when:
     java.referenced:
@@ -336,9 +321,7 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: org.hibernate.(?P<className>(cache.RegionFactory|cache.spi.RegionFactory|cache.spi.AbstractRegionFactory|testing.cache.CachingRegionFactory|cache.spi.support.RegionFactoryTemplate|cache.ehcache.EhCacheRegionFactory|cache.infinispan.InfinispanRegionFactory|cache.infinispan.JndiInfinispanRegionFactory|cache.internal.NoCachingRegionFactory|cache.ehcache.SingletonEhCacheRegionFactory))
-  description: |-
-    Hibernate 5.3 - RegionFactory usage
-    Review usage of classes in `org.hibernate.cache.spi.RegionFactory`, as SPIs for this class has changed.. See Javadoc for `org.hibernate.cache.spi.RegionFactory` for details.
+  description: Hibernate 5.3 - RegionFactory usage
   effort: 3
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -354,9 +337,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#migrating_from_hibernate_5_1_to_5_3
   - title: Javadoc for org.hibernate.cache.spi.RegionFactory
     url: https://docs.jboss.org/hibernate/orm/5.3/javadocs/org/hibernate/cache/spi/RegionFactory.html
-  message: Review usage of classes in `org.hibernate.cache.spi.RegionFactory`, as
-    SPIs for this class has changed.. See Javadoc for `org.hibernate.cache.spi.RegionFactory`
-    for details.
+  message: "Review usage of classes in `org.hibernate.cache.spi.RegionFactory`, as
+    SPIs for this class has changed. \n See Javadoc for `org.hibernate.cache.spi.RegionFactory`
+    for details."
   ruleID: hibernate51-53-00500
   when:
     java.referenced:
@@ -364,9 +347,7 @@
       pattern: org.hibernate.(cache.RegionFactory|cache.spi.RegionFactory|cache.spi.AbstractRegionFactory|testing.cache.CachingRegionFactory|cache.spi.support.RegionFactoryTemplate|cache.ehcache.EhCacheRegionFactory|cache.infinispan.InfinispanRegionFactory|cache.infinispan.JndiInfinispanRegionFactory|cache.internal.NoCachingRegionFactory|cache.ehcache.SingletonEhCacheRegionFactory)
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - org.hibernate.cache.spi.QueryCacheFactory implementations
-    One potential upgrade concern is any custom `org.hibernate.cache.spi.QueryCacheFactory` implementations.. `org.hibernate.cache.spi.QueryCacheFactory` was meant as a means to allow service providers the ability to define query result caching, generally with more stale-tolerant query result invalidation handling.. However, the contract also bound it to the old second level cache contracts so they had to be updated.. Its responsibilities also changed so we also decided to "rename it" to `org.hibernate.cache.spi.TimestampsCacheFactory`.. Details can be found in HHH-11356 JIRA issue (link below).
+  description: Hibernate 5.3 - org.hibernate.cache.spi.QueryCacheFactory implementations
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -384,13 +365,13 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#hibernate_orm_5_3_features
   - title: 'HHH-11356: Adjust the 2nd-Cache SPIs to better reflect supported uses'
     url: https://hibernate.atlassian.net/browse/HHH-11356
-  message: One potential upgrade concern is any custom `org.hibernate.cache.spi.QueryCacheFactory`
-    implementations.. `org.hibernate.cache.spi.QueryCacheFactory` was meant as a means
-    to allow service providers the ability to define query result caching, generally
-    with more stale-tolerant query result invalidation handling.. However, the contract
-    also bound it to the old second level cache contracts so they had to be updated..
-    Its responsibilities also changed so we also decided to "rename it" to `org.hibernate.cache.spi.TimestampsCacheFactory`..
-    Details can be found in HHH-11356 JIRA issue (link below).
+  message: "\n One potential upgrade concern is any custom `org.hibernate.cache.spi.QueryCacheFactory`
+    implementations. \n `org.hibernate.cache.spi.QueryCacheFactory` was meant as a
+    means to allow service providers the ability to define query result caching, generally
+    with more stale-tolerant query result invalidation handling. \n However, the contract
+    also bound it to the old second level cache contracts so they had to be updated.
+    \n Its responsibilities also changed so we also decided to \"rename it\" to `org.hibernate.cache.spi.TimestampsCacheFactory`.
+    \n Details can be found in HHH-11356 JIRA issue (link below).\n "
   ruleID: hibernate51-53-00600
   when:
     java.referenced:
@@ -401,9 +382,8 @@
   - name: interfaces
     nameOfCaptureGroup: interfaces
     pattern: org.hibernate.stat.(?P<interfaces>(SecondLevelCacheStatistics|NaturalIdCacheStatistics).)?getEntries\(\)
-  description: |-
-    Hibernate 5.3 - SecondLevelCacheStatistics.getEntries() and NaturalIdCacheStatistics.getEntries(): deprecated methods
-    A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()` and `NaturalIdCacheStatistics.getEntries()`.. These methods have been deprecated, however the new caching SPI does not really require caching providers to support this.. As of Hibernate 5.3 these methods inherently return an empty Map (`Collections#emptyMap`).. This has always been something that providers did not implement "correctly" anyway.. Details can be found in HHH-11356 JIRA issue (link below).
+  description: 'Hibernate 5.3 - SecondLevelCacheStatistics.getEntries() and NaturalIdCacheStatistics.getEntries():
+    deprecated methods'
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -421,12 +401,12 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#hibernate_orm_5_3_features
   - title: 'HHH-11356: Adjust the 2nd-Cache SPIs to better reflect supported uses'
     url: https://hibernate.atlassian.net/browse/HHH-11356
-  message: A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`
-    and `NaturalIdCacheStatistics.getEntries()`.. These methods have been deprecated,
+  message: "\n A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`
+    and `NaturalIdCacheStatistics.getEntries()`. \n These methods have been deprecated,
     however the new caching SPI does not really require caching providers to support
-    this.. As of Hibernate 5.3 these methods inherently return an empty Map (`Collections#emptyMap`)..
-    This has always been something that providers did not implement "correctly" anyway..
-    Details can be found in HHH-11356 JIRA issue (link below).
+    this. \n As of Hibernate 5.3 these methods inherently return an empty Map (`Collections#emptyMap`).
+    \n This has always been something that providers did not implement \"correctly\"
+    anyway. \n Details can be found in HHH-11356 JIRA issue (link below).\n "
   ruleID: hibernate51-53-00700
   when:
     java.referenced:
@@ -434,9 +414,7 @@
       pattern: org.hibernate.stat.(SecondLevelCacheStatistics|NaturalIdCacheStatistics).getEntries*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5.3 - NaturalIdCacheStatistics.getEntries() deprecated method
-    A change to be aware of is accessing cache entries via `NaturalIdCacheStatistics.getEntries()`.. This method has been deprecated, however the new caching SPI does not really require caching providers to support this.. As of Hibernate 5.3 this method inherently return an empty Map (`Collections#emptyMap`).. This has always been something that providers did not implement "correctly" anyway.. Details can be found in HHH-11356 JIRA issue (link below).
+  description: Hibernate 5.3 - NaturalIdCacheStatistics.getEntries() deprecated method
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -447,12 +425,12 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: A change to be aware of is accessing cache entries via `NaturalIdCacheStatistics.getEntries()`..
-    This method has been deprecated, however the new caching SPI does not really require
-    caching providers to support this.. As of Hibernate 5.3 this method inherently
-    return an empty Map (`Collections#emptyMap`).. This has always been something
-    that providers did not implement "correctly" anyway.. Details can be found in
-    HHH-11356 JIRA issue (link below).
+  message: "\n A change to be aware of is accessing cache entries via `NaturalIdCacheStatistics.getEntries()`.
+    \n This method has been deprecated, however the new caching SPI does not really
+    require caching providers to support this. \n As of Hibernate 5.3 this method
+    inherently return an empty Map (`Collections#emptyMap`). \n This has always been
+    something that providers did not implement \"correctly\" anyway. \n Details can
+    be found in HHH-11356 JIRA issue (link below).\n "
   ruleID: hibernate51-53-00701
   when:
     java.referenced:
@@ -460,9 +438,8 @@
       pattern: '*.getEntries*'
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 5.3 - SecondLevelCacheStatistics.getEntries() deprecated method
-    A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`.. This method has been deprecated, however the new caching SPI does not really require caching providers to support this.. As of Hibernate 5.3 these methods inherently return an empty Map (`Collections#emptyMap`).. This has always been something that providers did not implement "correctly" anyway.. Details can be found in HHH-11356 JIRA issue (link below).
+  description: Hibernate 5.3 - SecondLevelCacheStatistics.getEntries() deprecated
+    method
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -473,12 +450,12 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`..
-    This method has been deprecated, however the new caching SPI does not really require
-    caching providers to support this.. As of Hibernate 5.3 these methods inherently
-    return an empty Map (`Collections#emptyMap`).. This has always been something
-    that providers did not implement "correctly" anyway.. Details can be found in
-    HHH-11356 JIRA issue (link below).
+  message: "\n A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`.
+    \n This method has been deprecated, however the new caching SPI does not really
+    require caching providers to support this. \n As of Hibernate 5.3 these methods
+    inherently return an empty Map (`Collections#emptyMap`). \n This has always been
+    something that providers did not implement \"correctly\" anyway. \n Details can
+    be found in HHH-11356 JIRA issue (link below).\n "
   ruleID: hibernate51-53-00702
   when:
     java.referenced:
@@ -489,8 +466,7 @@
   - name: packages
     nameOfCaptureGroup: packages
     pattern: org.hibernate.(?P<packages>(persister|tuple).)?.*
-  description: |
-    Hibernate 5.3 - SPI in package org.hibernate.{packages} changed
+  description: Hibernate 5.3 - SPI in package org.hibernate.{packages} changed
   effort: 3
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -506,9 +482,9 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html-single/migration_guide/#migrating_from_hibernate_5_1_to_5_3
   - title: Hibernate 5.3 JavaDoc
     url: http://docs.jboss.org/hibernate/orm/5.3/javadocs/
-  message: The SPIs in the `org.hibernate.{{packages}}` package have changed.. Any
-    custom classes using those SPIs will need to be reviewed and updated.. See Javadoc
-    for these packages for details.
+  message: "\n The SPIs in the `org.hibernate.{{packages}}` package have changed.
+    \n Any custom classes using those SPIs will need to be reviewed and updated. \n
+    See Javadoc for these packages for details.\n "
   ruleID: hibernate51-53-00800
   when:
     java.referenced:
@@ -516,9 +492,8 @@
       pattern: org.hibernate.(persister|tuple)*
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate 5.3 - default_schema or default_catalog must be defined or set jdbc_metadata_extraction_strategy
-    Define `hibernate.default_schema` or `hibernate.default_catalog` (whichever is used by the selected dialect), or, alternatively, set `hibernate.hbm2ddl.jdbc_metadata_extraction_strategy=individually`.
+  description: Hibernate 5.3 - default_schema or default_catalog must be defined or
+    set jdbc_metadata_extraction_strategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -548,9 +523,8 @@
       from: persistence_files
 - category: potential
   customVariables: []
-  description: |-
-    Hibernate 5.3 - default_schema or default_catalog must be defined or set jdbc_metadata_extraction_strategy
-    If the application uses Hibernate, please define `hibernate.default_schema` or `hibernate.default_catalog` (whichever is used by the selected dialect), or, alternatively, set `hibernate.hbm2ddl.jdbc_metadata_extraction_strategy=individually`.
+  description: Hibernate 5.3 - default_schema or default_catalog must be defined or
+    set jdbc_metadata_extraction_strategy
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -581,9 +555,7 @@
       from: persistence_files
 - category: potential
   customVariables: []
-  description: |-
-    Hibernate 5.3  - @TableGenerator changes interpretation
-    Applications using the `@TableGenerator` should set the `hibernate.id.generator.stored_last_used` configuration property to `false`.
+  description: Hibernate 5.3  - @TableGenerator changes interpretation
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
@@ -609,8 +581,7 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: org.hibernate.(?P<className>(engine.query.spi.NamedParameterDescriptor|engine.query.spi.OrdinalParameterDescriptor|query.procedure.internal.ProcedureParameterImpl|query.internal.QueryParameterImpl|query.internal.QueryParameterNamedImpl).)?getType(.*)
-  description: |
-    Hibernate 5.3 - QueryParameter.getType() renamed
+  description: Hibernate 5.3 - QueryParameter.getType() renamed
   effort: 1
   labels:
   - konveyor.io/source=hibernate5.1-
diff --git a/default/generated/eap7/83-picketlink25.windup.yaml b/default/generated/eap7/83-picketlink25.windup.yaml
index 4d02f9de..334ce2fa 100644
--- a/default/generated/eap7/83-picketlink25.windup.yaml
+++ b/default/generated/eap7/83-picketlink25.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Picketlink STS token format change
-    JBoss EAP 7.2 PicketLink STS issues tokens with a different format, which may require changes in applications such as EJB clients.. Please refer to the JBoss EAP 7.2 Migration Guide section with respect to this migration issue, and how to resolve it.
+  description: Picketlink STS token format change
   effort: 1
   labels:
   - konveyor.io/source=eap7.1-
@@ -13,10 +11,10 @@
   links:
   - title: JBoss EAP 7.2 Migration Guide
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.2/html/migration_guide/application_migration_changes#migrate_ejb_client_code_to_eap_72
-  message: JBoss EAP 7.2 PicketLink STS issues tokens with a different format, which
-    may require changes in applications such as EJB clients.. Please refer to the
-    JBoss EAP 7.2 Migration Guide section with respect to this migration issue, and
-    how to resolve it.
+  message: "\n JBoss EAP 7.2 PicketLink STS issues tokens with a different format,
+    which may require changes in applications such as EJB clients. \n Please refer
+    to the JBoss EAP 7.2 Migration Guide section with respect to this migration issue,
+    and how to resolve it.\n "
   ruleID: picketlink25-00000
   when:
     java.referenced:
diff --git a/default/generated/eap7/84-resteasy30-36.windup.yaml b/default/generated/eap7/84-resteasy30-36.windup.yaml
index cdfc99a8..809067aa 100644
--- a/default/generated/eap7/84-resteasy30-36.windup.yaml
+++ b/default/generated/eap7/84-resteasy30-36.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    RESTEasy 3.6 - Resource Method Algorithm Switch changes
-    If you migrate your application from JBoss EAP from 7.1.1 to 7.2.x and want to retain the stricter behavior as defined in the JAX-RS 2.0 specification, set the `jaxrs.2.0.request.matching` option to `true`.
+  description: RESTEasy 3.6 - Resource Method Algorithm Switch changes
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/85-deprecated-singletonpolicy.rhamt.yaml b/default/generated/eap7/85-deprecated-singletonpolicy.rhamt.yaml
index fcaa35a5..91a2bf2d 100644
--- a/default/generated/eap7/85-deprecated-singletonpolicy.rhamt.yaml
+++ b/default/generated/eap7/85-deprecated-singletonpolicy.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Deprecated HA Singleton API
-    The application imports class `org.wildfly.clustering.singleton.SingletonPolicy`, from deprecated HA Singleton API.
+  description: Deprecated HA Singleton API
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/86-maven-artemis-jms-client.rhamt.yaml b/default/generated/eap7/86-maven-artemis-jms-client.rhamt.yaml
index 1f0c5626..793ed02d 100644
--- a/default/generated/eap7/86-maven-artemis-jms-client.rhamt.yaml
+++ b/default/generated/eap7/86-maven-artemis-jms-client.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Artemis JMS Client requires wildfly-client-properties
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, if the application depends on Artemis JMS Client artifact then it should also depend on artifact with groupId `org.jboss.eap`, and artifactId `wildfly-client-properties`.
+  description: Artemis JMS Client requires wildfly-client-properties
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/87-maven-javax-to-jakarta.rhamt.yaml b/default/generated/eap7/87-maven-javax-to-jakarta.rhamt.yaml
index 91d4e907..9a76aacf 100644
--- a/default/generated/eap7/87-maven-javax-to-jakarta.rhamt.yaml
+++ b/default/generated/eap7/87-maven-javax-to-jakarta.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - com.sun.mail:javax.mail
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with groupId `com.sun.mail`, and artifactId `jakarta.mail`.
+  description: Move to Jakarta EE Maven Artifacts - com.sun.mail:javax.mail
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -26,9 +24,7 @@
       pattern: artifactId>javax.mail<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - replace groupId javax.activation
-    If you migrate your application to JBoss EAP 7.3, or later, and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with groupId `com.sun.activation`
+  description: Move to Jakarta EE Maven Artifacts - replace groupId javax.activation
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -52,9 +48,7 @@
       name: javax.activation.activation
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - replace artifactId activation
-    If you migrate your application to JBoss EAP 7.3, or later, and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with artifactId `jakarta.activation`
+  description: Move to Jakarta EE Maven Artifacts - replace artifactId activation
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -78,8 +72,7 @@
       pattern: artifactId>activation<
 - category: potential
   customVariables: []
-  description: |
-    javax.{renamed-g} groupId has been replaced by jakarta.{renamed-g}
+  description: javax.{renamed-g} groupId has been replaced by jakarta.{renamed-g}
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -103,8 +96,8 @@
       pattern: groupId>javax.(enterprise|inject|json|json.bind|persistence|security.enterprise|validation)<
 - category: potential
   customVariables: []
-  description: |
-    javax.{renamed-a} javax.{renamed-a}-api artifactId has been replaced by jakarta.{renamed-a} jakarta.{renamed-a}-api
+  description: javax.{renamed-a} javax.{renamed-a}-api artifactId has been replaced
+    by jakarta.{renamed-a} jakarta.{renamed-a}-api
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -128,9 +121,7 @@
       pattern: artifactId>javax.(json|json.bind|persistence|security.enterprise)-api<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - replace artifactId cdi-api
-    If you migrate your application to JBoss EAP 7.3, or later, and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with artifactId `jakarta.enterprise.cdi-api`
+  description: Move to Jakarta EE Maven Artifacts - replace artifactId cdi-api
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -154,9 +145,7 @@
       pattern: artifactId>cdi-api<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - replace artifactId validation-api
-    If you migrate your application to JBoss EAP 7.3, or later, and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with artifactId `jakarta.validation-api`
+  description: Move to Jakarta EE Maven Artifacts - replace artifactId validation-api
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -180,9 +169,7 @@
       pattern: artifactId>validation-api<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - replace artifactId javax.inject
-    If you migrate your application to JBoss EAP 7.3, or later, and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with artifactId `jakarta.inject-api`
+  description: Move to Jakarta EE Maven Artifacts - replace artifactId javax.inject
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -206,9 +193,7 @@
       pattern: artifactId>javax.inject<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with groupId `org.jboss.spec.javax.xml.soap`, and artifactId `jboss-saaj-api_1.4_spec`.
+  description: Move to Jakarta EE Maven Artifacts - org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -233,9 +218,7 @@
       pattern: artifactId>jboss-saaj-api_1.3_spec<
 - category: potential
   customVariables: []
-  description: |-
-    Move to Jakarta EE Maven Artifacts - org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the Jakarta EE dependency with groupId `org.jboss.spec.javax.transaction`, and artifactId `jboss-transaction-api_1.3_spec`.
+  description: Move to Jakarta EE Maven Artifacts - org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -260,9 +243,7 @@
       pattern: artifactId>jboss-transaction-api_1.2_spec<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss EAP Jakarta EE BOM with groupId `org.jboss.bom`, and artifactId `jboss-eap-jakartaee8`.
+  description: Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -286,9 +267,7 @@
       pattern: artifactId>jboss-eap-javaee8<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8-with-spring4
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss EAP Jakarta EE BOM with groupId `org.jboss.bom`, and artifactId `jboss-eap-jakartaee8-with-spring4`.
+  description: Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8-with-spring4
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -312,9 +291,7 @@
       pattern: artifactId>jboss-eap-javaee8-with-spring4<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8-with-tools
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss EAP Jakarta EE BOM with groupId `org.jboss.bom`, and artifactId `jboss-eap-jakartaee8-with-tools`.
+  description: Move to JBoss EAP Jakarta EE BOMs - org.jboss.bom:jboss-eap-javaee8-with-tools
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -338,9 +315,7 @@
       pattern: artifactId>jboss-eap-javaee8-with-tools<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-8.0
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss Jakarta EE BOM with groupId `org.jboss.spec`, and artifactId `jboss-jakartaee-8.0`.
+  description: Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-8.0
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -364,9 +339,7 @@
       pattern: artifactId>jboss-javaee-8.0<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-web-8.0
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss Jakarta EE BOM with groupId `org.jboss.spec`, and artifactId `jboss-jakartaee-web-8.0`.
+  description: Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-web-8.0
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -390,9 +363,7 @@
       pattern: artifactId>jboss-javaee-web-8.0<
 - category: potential
   customVariables: []
-  description: |-
-    Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-all-8.0
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, use instead the JBoss Jakarta EE BOM with groupId `org.jboss.spec`, and artifactId `jboss-jakartaee-all-8.0`.
+  description: Move to JBoss Jakarta EE BOMs - org.jboss.spec:jboss-javaee-all-8.0
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml b/default/generated/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
index 7a983f72..acc4db2a 100644
--- a/default/generated/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
+++ b/default/generated/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Remove Maven dependency on org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec
-    If you migrate your application to JBoss EAP 7.3 (or later), and want to ensure its Maven building, running or testing works as expected, remove any dependency on unsupported artifact with groupId `org.jboss.spec.javax.rmi`, and artifactId `jboss-rmi-api_1.0_spec`.
+  description: Remove Maven dependency on org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml b/default/generated/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml
index 1c2b72a1..ab69ad84 100644
--- a/default/generated/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml
+++ b/default/generated/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Move to Microprofile REST Client 1.3
-    The application imports class `org.jboss.resteasy.client.microprofile.MicroprofileClientBuilderResolver`, and should be changed to use instead `org.eclipse.microprofile.rest.client.RestClientBuilder`, from Microprofile REST Client 1.3.
+  description: Move to Microprofile REST Client 1.3
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/90-singleton-sessionbean.rhamt.yaml b/default/generated/eap7/90-singleton-sessionbean.rhamt.yaml
index 72b4c6d1..ecec5395 100644
--- a/default/generated/eap7/90-singleton-sessionbean.rhamt.yaml
+++ b/default/generated/eap7/90-singleton-sessionbean.rhamt.yaml
@@ -1,21 +1,19 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Removed SessionBean interface
-    When a singleton EJB bean class implements `javax.ejb.SessionBean` interface, this interface should be removed from the implements clause.. All methods declared in `javax.ejb.SessionBean` interface (see below) that are implemented in the bean class or its super classes should be checked for `@Override` annotation and remove this annotation too if present.. Methods declared by `javax.ejb.SessionBean` interface:. ```. void setSessionContext(SessionContext ctx);. void ejbRemove();. void ejbActivate();. void ejbPassivate();. ```
+  description: Removed SessionBean interface
   effort: 1
   labels:
   - konveyor.io/target=eap7
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: When a singleton EJB bean class implements `javax.ejb.SessionBean` interface,
-    this interface should be removed from the implements clause.. All methods declared
-    in `javax.ejb.SessionBean` interface (see below) that are implemented in the bean
-    class or its super classes should be checked for `@Override` annotation and remove
-    this annotation too if present.. Methods declared by `javax.ejb.SessionBean` interface:.
-    ```. void setSessionContext(SessionContext ctx);. void ejbRemove();. void ejbActivate();.
-    void ejbPassivate();. ```
+  message: "\n \n When a singleton EJB bean class implements `javax.ejb.SessionBean`
+    interface, this interface should be removed from the implements clause. \n All
+    methods declared in `javax.ejb.SessionBean` interface (see below) that are implemented
+    in the bean class or its super classes should be checked for `@Override` annotation
+    and remove this annotation too if present. \n Methods declared by `javax.ejb.SessionBean`
+    interface: \n \n ```\n void setSessionContext(SessionContext ctx); \n \n void
+    ejbRemove(); \n \n void ejbActivate(); \n \n void ejbPassivate(); \n ```\n \n "
   ruleID: singleton-sessionbean-00001
   when:
     or:
diff --git a/default/generated/eap7/91-microprofile_removed_from_eap.mta.yaml b/default/generated/eap7/91-microprofile_removed_from_eap.mta.yaml
index 32119bb3..841b049a 100644
--- a/default/generated/eap7/91-microprofile_removed_from_eap.mta.yaml
+++ b/default/generated/eap7/91-microprofile_removed_from_eap.mta.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Eclipse MicroProfile removed from JBoss EAP - MicroProfile Config
-    This application depends on Eclipse MicroProfile Config, which is no longer supported by JBoss EAP 7.4 (or later), unless the JBoss EAP expansion pack is installed.
+  description: Eclipse MicroProfile removed from JBoss EAP - MicroProfile Config
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -23,9 +21,7 @@
       name: org.eclipse.microprofile.config.microprofile-config-api
 - category: potential
   customVariables: []
-  description: |-
-    Eclipse MicroProfile removed from JBoss EAP - MicroProfile Health
-    This application depends on Eclipse MicroProfile Health, which is no longer supported by JBoss EAP 7.4 (or later), unless the JBoss EAP expansion pack is installed.
+  description: Eclipse MicroProfile removed from JBoss EAP - MicroProfile Health
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -46,9 +42,7 @@
       name: org.eclipse.microprofile.health.microprofile-health-api
 - category: potential
   customVariables: []
-  description: |-
-    Eclipse MicroProfile removed from JBoss EAP - MicroProfile Metrics
-    This application depends on Eclipse MicroProfile Metrics, which is no longer supported by JBoss EAP 7.4 (or later), unless the JBoss EAP expansion pack is installed.
+  description: Eclipse MicroProfile removed from JBoss EAP - MicroProfile Metrics
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -69,9 +63,7 @@
       name: org.eclipse.microprofile.metrics.microprofile-metrics-api
 - category: potential
   customVariables: []
-  description: |-
-    Eclipse MicroProfile removed from JBoss EAP - MicroProfile REST Client
-    This application depends on Eclipse MicroProfile REST Client, which is no longer supported by JBoss EAP 7.4 (or later), unless the JBoss EAP expansion pack is installed.
+  description: Eclipse MicroProfile removed from JBoss EAP - MicroProfile REST Client
   effort: 1
   labels:
   - konveyor.io/target=eap7
@@ -92,9 +84,7 @@
       name: org.eclipse.microprofile.rest.client.microprofile-rest-client-api
 - category: potential
   customVariables: []
-  description: |-
-    Eclipse MicroProfile removed from JBoss EAP - MicroProfile Opentracing
-    This application depends on Eclipse MicroProfile Opentracing, which is no longer supported by JBoss EAP 7.4 (or later), unless the JBoss EAP expansion pack is installed.
+  description: Eclipse MicroProfile removed from JBoss EAP - MicroProfile Opentracing
   effort: 1
   labels:
   - konveyor.io/target=eap7
diff --git a/default/generated/eap7/92-embedded-framework-libraries.windup.yaml b/default/generated/eap7/92-embedded-framework-libraries.windup.yaml
index f538546e..b0e83073 100644
--- a/default/generated/eap7/92-embedded-framework-libraries.windup.yaml
+++ b/default/generated/eap7/92-embedded-framework-libraries.windup.yaml
@@ -1,6 +1,6 @@
 - customVariables: []
   description: "Embedded library - Drools\n\n                        The application
-    embedds a Drools library.\n                    \n"
+    embedds a Drools library.\n                    "
   labels:
   - konveyor.io/target=eap
   - konveyor.io/source
@@ -23,7 +23,7 @@
     to remove the embedded library and configure the application to use the module's
     library but then the application will rely on a tested and supported version of
     the Hibernate library.\n\n                        In the links below there are
-    the instructions to enable alternative versions for both EAP 6 and 7.\n                    \n"
+    the instructions to enable alternative versions for both EAP 6 and 7.\n                    "
   labels:
   - konveyor.io/target=eap
   - konveyor.io/source
@@ -43,7 +43,7 @@
       pattern: .*hibernate.*\.jar$
 - customVariables: []
   description: "Embedded library - JDBC\n\n                        The application
-    embeds a JDBC library.\n                    \n"
+    embeds a JDBC library.\n                    "
   labels:
   - konveyor.io/target=eap
   - konveyor.io/source
@@ -66,7 +66,7 @@
     embedded library and configure the application to use the module's library, but
     then the application will rely on a tested and supported version of the JSF library.\n\n
     \                       In the links below there are instructions to enable alternative
-    versions for both EAP 6 and 7.\n                    \n"
+    versions for both EAP 6 and 7.\n                    "
   labels:
   - konveyor.io/target=eap
   - konveyor.io/source
@@ -102,7 +102,7 @@
     5, does not support Seam 2.2 or Seam 2.3 due to end of life of Red Hat JBoss Web
     Framework Kit. It is recommended that you rewrite your Seam components using CDI
     beans.\n                        In the links below there are the instructions
-    to enable alternatives for both EAP 6 and 7\n                    \n"
+    to enable alternatives for both EAP 6 and 7\n                    "
   labels:
   - konveyor.io/target=eap
   - konveyor.io/source
diff --git a/default/generated/eap7/94-weblogic-jms.windup.yaml b/default/generated/eap7/94-weblogic-jms.windup.yaml
index 1ce8ec29..cf1edac3 100644
--- a/default/generated/eap7/94-weblogic-jms.windup.yaml
+++ b/default/generated/eap7/94-weblogic-jms.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -21,9 +22,7 @@
       pattern: oracle.jms*
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Session
-    Oracle JMS sessions are used for producing and consuming messaging API objects such as message producers, message. consumers, messages, queue browsers, and temporary queues and topics.. This reference should be replaced with the Java EE. standard API: `javax.jms.Session`.
+  description: Oracle JMS Session
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -34,19 +33,17 @@
   links:
   - title: Java EE 7 - JMS Session
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEN
-  message: 'Oracle JMS sessions are used for producing and consuming messaging API
-    objects such as message producers, message. consumers, messages, queue browsers,
-    and temporary queues and topics.. This reference should be replaced with the Java
-    EE. standard API: `javax.jms.Session`.'
+  message: "\n Oracle JMS sessions are used for producing and consuming messaging
+    API objects such as message producers, message\n consumers, messages, queue browsers,
+    and temporary queues and topics.\n\n This reference should be replaced with the
+    Java EE\n standard API: `javax.jms.Session`.\n "
   ruleID: weblogic-jms-eap7-01000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsSession
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Queue Browser
-    Oracle JMS queue browsers are used for browsing messages in a JMS queue.. This reference should be replaced with the Java. EE standard API: `javax.jms.QueueBrowser`.
+  description: Oracle JMS Queue Browser
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -57,17 +54,15 @@
   links:
   - title: Java EE 7 - JMS Queue Browser
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEY
-  message: 'Oracle JMS queue browsers are used for browsing messages in a JMS queue..
-    This reference should be replaced with the Java. EE standard API: `javax.jms.QueueBrowser`.'
+  message: "\n Oracle JMS queue browsers are used for browsing messages in a JMS queue.\n\n
+    This reference should be replaced with the Java\n EE standard API: `javax.jms.QueueBrowser`.\n "
   ruleID: weblogic-jms-eap7-02000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsQueueBrowser
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Producer
-    Oracle JMS producers are used for sending messages to a destination.. This reference should be replaced with the Java. EE. standard API: `javax.jms.MessageProducer`.
+  description: Oracle JMS Producer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -78,17 +73,15 @@
   links:
   - title: Java EE 7 - JMS Message Producer
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEO
-  message: 'Oracle JMS producers are used for sending messages to a destination..
-    This reference should be replaced with the Java. EE. standard API: `javax.jms.MessageProducer`.'
+  message: "\n Oracle JMS producers are used for sending messages to a destination.\n\n
+    This reference should be replaced with the Java\n EE\n standard API: `javax.jms.MessageProducer`.\n "
   ruleID: weblogic-jms-eap7-03000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsProducer
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Consumer
-    Oracle JMS consumers are used for receiving messages sent to a destination.. This reference should be replaced with the. Java EE standard API: `javax.jms.MessageConsumer`.
+  description: Oracle JMS Consumer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -99,17 +92,15 @@
   links:
   - title: Java EE 7 - JMS Message Consumer
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEP
-  message: 'Oracle JMS consumers are used for receiving messages sent to a destination..
-    This reference should be replaced with the. Java EE standard API: `javax.jms.MessageConsumer`.'
+  message: "\n Oracle JMS consumers are used for receiving messages sent to a destination.\n\n
+    This reference should be replaced with the\n Java EE standard API: `javax.jms.MessageConsumer`.\n "
   ruleID: weblogic-jms-eap7-04000
   when:
     java.referenced:
       pattern: oracle.jms.AQjmsConsumer
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Consumer
-    Oracle JMS connections represent virtual connections with a JMS provider.. This reference should be replaced with the. Java. EE standard API: `javax.jms.Connection`.
+  description: Oracle JMS Consumer
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -120,8 +111,8 @@
   links:
   - title: Java EE 7 - JMS Connections
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEM
-  message: 'Oracle JMS connections represent virtual connections with a JMS provider..
-    This reference should be replaced with the. Java. EE standard API: `javax.jms.Connection`.'
+  message: "\n Oracle JMS connections represent virtual connections with a JMS provider.\n\n
+    This reference should be replaced with the\n Java\n EE standard API: `javax.jms.Connection`.\n "
   ruleID: weblogic-jms-eap7-05000
   when:
     java.referenced:
@@ -131,8 +122,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: oracle.jms.AQjms(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: |
-    Oracle JMS {type}Message
+  description: Oracle JMS {type}Message
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -143,18 +133,16 @@
   links:
   - title: Java EE 7 - JMS Message API
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCES
-  message: 'Oracle JMS {{type}} messages represent the actual data passed through
-    JMS destinations.. This reference should be replaced. with the. Java. EE standard
-    API: `javax.jms.{{type}}Message`.'
+  message: "\n Oracle JMS {{type}} messages represent the actual data passed through
+    JMS destinations.\n\n This reference should be replaced\n with the\n Java\n EE
+    standard API: `javax.jms.{{type}}Message`.\n "
   ruleID: weblogic-jms-eap7-06000
   when:
     java.referenced:
       pattern: oracle.jms.AQjms(Text|Stream|Object|Map|Bytes)?Message
 - category: mandatory
   customVariables: []
-  description: |-
-    Oracle JMS Destination
-    Oracle JMS destinations are the objects a client uses to specify the target of messages it produces and the source of. messages it consumes.. This reference should be replaced with the. Java. EE standard API: `javax.jms.Destination`.
+  description: Oracle JMS Destination
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -165,9 +153,9 @@
   links:
   - title: Java EE 7 - JMS Destinations
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEL
-  message: 'Oracle JMS destinations are the objects a client uses to specify the target
-    of messages it produces and the source of. messages it consumes.. This reference
-    should be replaced with the. Java. EE standard API: `javax.jms.Destination`.'
+  message: "\n Oracle JMS destinations are the objects a client uses to specify the
+    target of messages it produces and the source of\n messages it consumes.\n\n This
+    reference should be replaced with the\n Java\n EE standard API: `javax.jms.Destination`.\n "
   ruleID: weblogic-jms-eap7-07000
   when:
     java.referenced:
@@ -177,8 +165,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: oracle.jms.AQjms(?P<type>(Topic|Queue)?)?ConnectionFactory
-  description: |
-    Oracle JMS {type} Connection Factory
+  description: Oracle JMS {type} Connection Factory
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -189,9 +176,9 @@
   links:
   - title: Java EE 7 - JMS Connection factories
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEK
-  message: 'Oracle {{type}}ConnectionFactory is an encapsulation of JMS servers to
-    which Connections can be created for message distribution.. This reference should
-    be replaced with the. Java. EE standard API: `javax.jms.{{type}}ConnectionFactory`.'
+  message: "\n Oracle {{type}}ConnectionFactory is an encapsulation of JMS servers
+    to which Connections can be created for message distribution.\n\n This reference
+    should be replaced with the\n Java\n EE standard API: `javax.jms.{{type}}ConnectionFactory`.\n "
   ruleID: weblogic-jms-eap7-08000
   when:
     java.referenced:
diff --git a/default/generated/eap7/95-weblogic-services.windup.yaml b/default/generated/eap7/95-weblogic-services.windup.yaml
index d074695a..613b5d9c 100644
--- a/default/generated/eap7/95-weblogic-services.windup.yaml
+++ b/default/generated/eap7/95-weblogic-services.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Startup Service
-    Replace this class with a class using the EJB 3.2 `@Singleton` and `@Startup` annotations.
+  description: WebLogic Startup Service
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -24,9 +22,7 @@
       pattern: weblogic.common.T3StartupDef
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic T3ServicesDef usage
-    `T3ServicesDef` provides access to core services of the container, such as Timers and Logging facilities.. Replace the services provided by this with a Singleton EJB (using the `@Singleton` annotation) that provides access to the equivalent services from JBoss EAP.
+  description: WebLogic T3ServicesDef usage
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -37,10 +33,10 @@
   links:
   - title: Java EE Tutorial - @Singleton Session Bean
     url: https://docs.oracle.com/javaee/7/tutorial/ejb-intro002.htm#GIPIM
-  message: '`T3ServicesDef` provides access to core services of the container, such
-    as Timers and Logging facilities.. Replace the services provided by this with
-    a Singleton EJB (using the `@Singleton` annotation) that provides access to the
-    equivalent services from JBoss EAP.'
+  message: "\n \n `T3ServicesDef` provides access to core services of the container,
+    such as Timers and Logging facilities.\n\n Replace the services provided by this
+    with a Singleton EJB (using the `@Singleton` annotation) that provides access
+    to the equivalent services from JBoss EAP.\n \n "
   ruleID: weblogic-services-eap7-02000
   when:
     java.referenced:
@@ -50,9 +46,7 @@
   - name: logger
     nameOfCaptureGroup: logger
     pattern: weblogic.(?P<logger>(i18n.)?logging.[^N])?.*
-  description: |-
-    WebLogic proprietary logging classes
-    Oracle WebLogic logging classes should be replaced with SLF4J, Log4J, or Java Logging.. Please refer to the [JBoss EAP 7 Development guide](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#logging) for more information on this.
+  description: WebLogic proprietary logging classes
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -63,9 +57,9 @@
   links:
   - title: JBoss EAP 7 Development Guide - Logging
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#logging
-  message: Oracle WebLogic logging classes should be replaced with SLF4J, Log4J, or
-    Java Logging.. Please refer to the [JBoss EAP 7 Development guide](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#logging)
-    for more information on this.
+  message: "\n \n Oracle WebLogic logging classes should be replaced with SLF4J, Log4J,
+    or Java Logging.\n\n Please refer to the [JBoss EAP 7 Development guide](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/development_guide/#logging)
+    for more information on this.\n \n "
   ruleID: weblogic-services-eap7-03000
   when:
     java.referenced:
diff --git a/default/generated/eap7/96-weblogic-webapp.windup.yaml b/default/generated/eap7/96-weblogic-webapp.windup.yaml
index 8d1e74f9..c0306056 100644
--- a/default/generated/eap7/96-weblogic-webapp.windup.yaml
+++ b/default/generated/eap7/96-weblogic-webapp.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Virtual directory mapping
-    Virtual directories supported in WebLogic are not supported in JBoss EAP.
+  description: WebLogic Virtual directory mapping
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -25,9 +23,7 @@
       xpath: //wl:virtual-directory-mapping
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLServlet` annotation with the Java EE standard `@WebServlet` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -39,9 +35,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLServlet` annotation with the Java
-    EE standard `@WebServlet` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLServlet` annotation with the
+    Java EE standard `@WebServlet` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-eap7-02000
   when:
     java.referenced:
@@ -49,9 +46,7 @@
       pattern: weblogic.servlet.annotation.WLServlet
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLInitParam` annotation with the Java EE standard `@WebInitParam` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -63,9 +58,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLInitParam` annotation with the Java
-    EE standard `@WebInitParam` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLInitParam` annotation with
+    the Java EE standard `@WebInitParam` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-eap7-03000
   when:
     java.referenced:
@@ -73,9 +69,7 @@
       pattern: weblogic.servlet.annotation.WLInitParam
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary servlet annotations
-    Replace the proprietary WebLogic `@WLFilter` annotation with the Java EE standard `@WebFilter` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html) for more information.
+  description: WebLogic proprietary servlet annotations
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -87,9 +81,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  message: Replace the proprietary WebLogic `@WLFilter` annotation with the Java EE
-    standard `@WebFilter` annotation.. See the [javax.servlet.annotation JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
-    for more information.
+  message: "\n \n Replace the proprietary WebLogic `@WLFilter` annotation with the
+    Java EE standard `@WebFilter` annotation.\n\n See the [javax.servlet.annotation
+    JavaDoc](http://docs.oracle.com/javaee/7/api/javax/servlet/annotation/package-summary.html)
+    for more information.\n \n "
   ruleID: weblogic-webapp-eap7-04000
   when:
     java.referenced:
@@ -97,9 +92,7 @@
       pattern: weblogic.servlet.annotation.WLFilter
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic ApplicationLifecycleEvent
-    WebLogic `ApplicationLifecycleEvent` must be replaced with standard Java EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped` beans or EJB's `@Startup` beans is required in order to propagate a custom event object because `ServletContextEvent` types are not extendible in the standard Java EE programming model.. Use a `javax.servlet.ServletContextListener` with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton` service bean.
+  description: WebLogic ApplicationLifecycleEvent
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -115,13 +108,13 @@
     url: http://docs.oracle.com/javaee/7/api/javax/servlet/ServletContextEvent.html
   - title: WebLogic custom ApplicationLifecycleEvent Documentation
     url: http://docs.oracle.com/cd/E13222_01/wls/docs90/programming/lifecycle.html
-  message: WebLogic `ApplicationLifecycleEvent` must be replaced with standard Java
-    EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped`
+  message: "\n \n WebLogic `ApplicationLifecycleEvent` must be replaced with standard
+    Java EE `ServletContextEvent`. Otherwise, a custom solution using CDI's `ApplicationScoped`
     beans or EJB's `@Startup` beans is required in order to propagate a custom event
     object because `ServletContextEvent` types are not extendible in the standard
-    Java EE programming model.. Use a `javax.servlet.ServletContextListener` with
+    Java EE programming model.\n\n Use a `javax.servlet.ServletContextListener` with
     `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton`
-    service bean.
+    service bean.\n \n "
   ruleID: weblogic-webapp-eap7-05000
   when:
     or:
@@ -136,9 +129,7 @@
         pattern: weblogic.application.ApplicationLifecycleEvent
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic ApplicationLifecycleListener
-    WebLogic `ApplicationLifecycleListener` must be replaced with standard Java EE `ServletContextListener` types. Otherwise, a solution using CDI's `ApplicationScoped` beans or EJB's `@Startup` beans is required.. Use a `javax.servlet.ServletContextListener` with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup` `@javax.ejb.Singleton` service bean.
+  description: WebLogic ApplicationLifecycleListener
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -155,11 +146,11 @@
     url: http://docs.oracle.com/javaee/7/api/javax/servlet/ServletContextEvent.html
   - title: WebLogic custom ApplicationLifecycleEvent Documentation
     url: http://docs.oracle.com/cd/E13222_01/wls/docs90/programming/lifecycle.html
-  message: WebLogic `ApplicationLifecycleListener` must be replaced with standard
+  message: "\n \n WebLogic `ApplicationLifecycleListener` must be replaced with standard
     Java EE `ServletContextListener` types. Otherwise, a solution using CDI's `ApplicationScoped`
-    beans or EJB's `@Startup` beans is required.. Use a `javax.servlet.ServletContextListener`
+    beans or EJB's `@Startup` beans is required.\n\n Use a `javax.servlet.ServletContextListener`
     with `@javax.annotation.servlet.WebListener`, or an EJB 3.1 `@javax.ejb.Startup`
-    `@javax.ejb.Singleton` service bean.
+    `@javax.ejb.Singleton` service bean.\n \n "
   ruleID: weblogic-webapp-eap7-06000
   when:
     or:
@@ -171,9 +162,7 @@
         pattern: weblogic.application.ApplicationLifecycleListener
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary security API
-    The usage of the WebLogic proprietary security API should be replaced by standard Java EE mechanisms or the ones provided by JBoss EAP.
+  description: WebLogic proprietary security API
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -192,9 +181,7 @@
       pattern: weblogic.security*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary security reference to weblogic.security.Security
-    Migrate to JBoss EAP 7: `org.jboss.security.SecurityContextAssociation`.
+  description: WebLogic proprietary security reference to weblogic.security.Security
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -215,9 +202,7 @@
       pattern: weblogic.security.Security
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary ServletAuthentication annotation
-    Oracle WebLogic Server provides a proprietary `ServletAuthentication` class to perform programmatic login.. In Red Hat JBoss EAP 7, you can use the standard Java EE servlet security 3.1 `HttpServletRequest.login()` method or you can define a `<security-constraint>` element in the web.xml file. You must also replace code that uses the Oracle WebLogic Server proprietary `ServletAuthentication` class.
+  description: WebLogic proprietary ServletAuthentication annotation
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -229,11 +214,12 @@
   links:
   - title: Migrate Oracle WebLogic programmatic login to JBoss EAP 7
     url: https://access.redhat.com/articles/1329213
-  message: Oracle WebLogic Server provides a proprietary `ServletAuthentication` class
-    to perform programmatic login.. In Red Hat JBoss EAP 7, you can use the standard
-    Java EE servlet security 3.1 `HttpServletRequest.login()` method or you can define
-    a `<security-constraint>` element in the web.xml file. You must also replace code
-    that uses the Oracle WebLogic Server proprietary `ServletAuthentication` class.
+  message: "\n \n Oracle WebLogic Server provides a proprietary `ServletAuthentication`
+    class to perform programmatic login.\n\n In Red Hat JBoss EAP 7, you can use the
+    standard Java EE servlet security 3.1 `HttpServletRequest.login()` method or you
+    can define a `<security-constraint>` element in the web.xml file. You must also
+    replace code that uses the Oracle WebLogic Server proprietary `ServletAuthentication`
+    class.\n \n "
   ruleID: weblogic-webapp-eap7-09000
   when:
     java.referenced:
diff --git a/default/generated/eap7/97-weblogic-webservices.windup.yaml b/default/generated/eap7/97-weblogic-webservices.windup.yaml
index 5c443bbc..6513009e 100644
--- a/default/generated/eap7/97-weblogic-webservices.windup.yaml
+++ b/default/generated/eap7/97-weblogic-webservices.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service implementation class
-    This web service stub uses the WebLogic proprietary web service implementation class ("weblogic.wsee.jaxrpc.ServiceImpl").. It might have been generated by a WebLogic proprietary tool.. This should be replaced using the standard Java EE JAX-WS framework. It could be regenerated using the JBoss web services tools.. Please refer to the [Developing JAX-WS Web Services](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_web_services_applications/#developing_jax_ws_web_services) guide for more information.
+  description: WebLogic proprietary web service implementation class
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -13,12 +11,12 @@
   links:
   - title: Developing JAX-WS Web Services
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_web_services_applications/#developing_jax_ws_web_services
-  message: This web service stub uses the WebLogic proprietary web service implementation
-    class ("weblogic.wsee.jaxrpc.ServiceImpl").. It might have been generated by a
-    WebLogic proprietary tool.. This should be replaced using the standard Java EE
-    JAX-WS framework. It could be regenerated using the JBoss web services tools..
-    Please refer to the [Developing JAX-WS Web Services](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_web_services_applications/#developing_jax_ws_web_services)
-    guide for more information.
+  message: "\n \n This web service stub uses the WebLogic proprietary web service
+    implementation class (\"weblogic.wsee.jaxrpc.ServiceImpl\").\n It might have been
+    generated by a WebLogic proprietary tool.\n\n This should be replaced using the
+    standard Java EE JAX-WS framework. It could be regenerated using the JBoss web
+    services tools.\n Please refer to the [Developing JAX-WS Web Services](https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_web_services_applications/#developing_jax_ws_web_services)
+    guide for more information.\n \n "
   ruleID: weblogic-webservices-eap7-01000
   when:
     java.referenced:
@@ -26,9 +24,7 @@
       pattern: weblogic.wsee.jaxrpc.ServiceImpl
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic asynchronous web service client
-    The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm) should be replaced using calls to the JAX-WS asynchronous API.. More information is available in the [JAX-WS Web Service Clients](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html).
+  description: WebLogic asynchronous web service client
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -42,18 +38,17 @@
     url: https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm
   - title: JAX-WS Web Service Clients
     url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html
-  message: The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm)
-    should be replaced using calls to the JAX-WS asynchronous API.. More information
-    is available in the [JAX-WS Web Service Clients](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html).
+  message: "\n \n The [WebLogic proprietary Asynchronous Web Service Client API](https://docs.oracle.com/cd/E23943_01/web.1111/e15184/asynch.htm)
+    should be replaced using calls to the JAX-WS asynchronous API.\n\n More information
+    is available in the [JAX-WS Web Service Clients](https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/sect-JAX-WS_Web_Service_Clients.html).\n
+    \n "
   ruleID: weblogic-webservices-eap7-02000
   when:
     java.referenced:
       pattern: weblogic.wsee.async.AsyncPreCallContext
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service authentication
-    Replace proprietary web-service authentication with JAX-WS standard calls. To attach authentication with JBoss EAP, simply use the following code:. ```java. URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL();. QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService");. Service service = Service.create(wsdlURL, qname);. port = (TestEndpoint)service.getPort(TestEndpoint.class);. BindingProvider bp = (BindingProvider)port;. bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "jsmith");. bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "PaSSw0rd");. ```
+  description: WebLogic proprietary web service authentication
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -65,14 +60,14 @@
   links:
   - title: Securing JAX-WS Web Services
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/developing_web_services_applications/#ws_sec_ws
-  message: Replace proprietary web-service authentication with JAX-WS standard calls.
-    To attach authentication with JBoss EAP, simply use the following code:. ```java.
-    URL wsdlURL = new File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL();.
-    QName qname = new QName("http://org.jboss.ws/jaxws/context", "TestEndpointService");.
-    Service service = Service.create(wsdlURL, qname);. port = (TestEndpoint)service.getPort(TestEndpoint.class);.
-    BindingProvider bp = (BindingProvider)port;. bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
-    "jsmith");. bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "PaSSw0rd");.
-    ```
+  message: "\n \n Replace proprietary web-service authentication with JAX-WS standard
+    calls. To attach authentication with JBoss EAP, simply use the following code:\n\n
+    ```java\n URL wsdlURL = new File(\"resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl\").toURL();\n
+    QName qname = new QName(\"http://org.jboss.ws/jaxws/context\", \"TestEndpointService\");\n
+    Service service = Service.create(wsdlURL, qname);\n port = (TestEndpoint)service.getPort(TestEndpoint.class);\n\n
+    BindingProvider bp = (BindingProvider)port;\n bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
+    \"jsmith\");\n bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, \"PaSSw0rd\");\n
+    ```\n \n "
   ruleID: weblogic-webservices-eap7-03000
   when:
     java.referenced:
@@ -80,9 +75,7 @@
       pattern: weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services API - weblogic.wsee.context.WebServiceContext
-    This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`. This usage will need to be replaced with the Java Enterprise Edition standard `javax.xml.WebServiceContext` interface.. Example code:. ```java. @Resource. private WebServiceContext webServiceContext;. ```
+  description: WebLogic proprietary web services API - weblogic.wsee.context.WebServiceContext
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -94,19 +87,17 @@
   links:
   - title: javax.xml.WebServiceContext Documentation
     url: http://docs.oracle.com/javaee/7/api/javax/xml/ws/WebServiceContext.html
-  message: This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`.
+  message: "\n \n This code uses the WebLogic specific class `weblogic.wsee.context.WebServiceContext`.
     This usage will need to be replaced with the Java Enterprise Edition standard
-    `javax.xml.WebServiceContext` interface.. Example code:. ```java. @Resource. private
-    WebServiceContext webServiceContext;. ```
+    `javax.xml.WebServiceContext` interface.\n\n Example code:\n\n ```java\n @Resource\n
+    private WebServiceContext webServiceContext;\n ```\n \n "
   ruleID: weblogic-webservices-eap7-04000
   when:
     java.referenced:
       pattern: weblogic.wsee.context.WebServiceContext
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services API - ContextNotFoundException
-    This exception (`weblogic.wsee.context.ContextNotFoundException`) is WebLogic specific and can be removed.
+  description: WebLogic proprietary web services API - ContextNotFoundException
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -116,17 +107,15 @@
   - weblogic
   - context
   links: []
-  message: This exception (`weblogic.wsee.context.ContextNotFoundException`) is WebLogic
-    specific and can be removed.
+  message: "\n This exception (`weblogic.wsee.context.ContextNotFoundException`) is
+    WebLogic specific and can be removed.\n "
   ruleID: weblogic-webservices-eap7-05000
   when:
     java.referenced:
       pattern: weblogic.wsee.context.ContextNotFoundException
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web services generated client classes
-    This class has been generated by a WebLogic web service client generator (ClientGen).. It could be replaced by an equivalent standard Java EE technology using for example the EAP 7 wsconsume tool, the wsgen tool or the CXF tools.
+  description: WebLogic proprietary web services generated client classes
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -144,9 +133,10 @@
     url: https://jax-ws.java.net/nonav/2.2.6/docs/ch04.html#tools-wsgen
   - title: Apache CXF tools
     url: https://cxf.apache.org/docs/tools.html
-  message: This class has been generated by a WebLogic web service client generator
-    (ClientGen).. It could be replaced by an equivalent standard Java EE technology
-    using for example the EAP 7 wsconsume tool, the wsgen tool or the CXF tools.
+  message: "\n \n This class has been generated by a WebLogic web service client generator
+    (ClientGen).\n\n It could be replaced by an equivalent standard Java EE technology
+    using for example the EAP 7 wsconsume tool, the wsgen tool or the CXF tools.\n
+    \n "
   ruleID: weblogic-webservices-eap7-06000
   when:
     or:
@@ -158,9 +148,7 @@
         pattern: weblogic.webservice*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary web service annotation @Transactional
-    Replace WebLogic proprietary web-service annotation `@Transactional` by the standard Java EE annotation `@TransactionAttribute`.
+  description: WebLogic proprietary web service annotation @Transactional
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -173,8 +161,8 @@
     url: https://docs.oracle.com/middleware/11119/wls/WSREF/annotations.htm#i1058163
   - title: JBoss EAP 7 - API TransactionAttribute
     url: https://access.redhat.com/webassets/avalon/d/red-hat-jboss-enterprise-application-platform/7.0.0/javadocs/javax/ejb/TransactionAttribute.html
-  message: Replace WebLogic proprietary web-service annotation `@Transactional` by
-    the standard Java EE annotation `@TransactionAttribute`.
+  message: "\n \n Replace WebLogic proprietary web-service annotation `@Transactional`
+    by the standard Java EE annotation `@TransactionAttribute`.\n \n "
   ruleID: weblogic-webservices-07000
   when:
     java.referenced:
diff --git a/default/generated/eap7/98-weblogic-xml-descriptors.windup.yaml b/default/generated/eap7/98-weblogic-xml-descriptors.windup.yaml
index d7ae4447..e1b72666 100644
--- a/default/generated/eap7/98-weblogic-xml-descriptors.windup.yaml
+++ b/default/generated/eap7/98-weblogic-xml-descriptors.windup.yaml
@@ -4,7 +4,7 @@
     is used to describe Oracle WebLogic Server EAR archives. Oracle WebLogic Server
     EAR configures some application settings through the `application-param` element.\n
     \                     These settings could be replaced with `context-param` elements
-    in Java EE Servlet `web.xml` descriptor.\n                    \n"
+    in Java EE Servlet `web.xml` descriptor.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -28,7 +28,7 @@
       namespaces: {}
       xpath: /*[local-name()='weblogic-application']
 - customVariables: []
-  description: |
+  description: |-
     WebLogic Entity EJB configuration
     WebLogic Entity EJB Configuration are used for RDBMS based persistence services.
   labels:
@@ -55,9 +55,7 @@
       xpath: /*[local-name()='weblogic-rdbms-jar']
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml) delay-updates-until-end-of-tx
-    The WebLogic `<delay-updates-until-end-of-tx>` configuration element, which defaults to `true`, is used for performance reasons to delay updates to the persistent store of all beans until the end of the transaction. When set to `false`, updates are sent to the database after each method invocation, but are not committed until the end of the transaction. This allows other processes to access the persisted data while the transaction is waiting to be completed.. In JBoss EAP 6+, you can achieve the same behavior by specifying the `<sync-on-commit-only>` in the jbosscmp-jdbc.xml file.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml) delay-updates-until-end-of-tx
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -73,14 +71,14 @@
   - title: Map delay-updates-until-end-of-tx element from weblogic-ejb-jar.xml Elements
       to the JBoss Enterprise Application Platform Equivalent
     url: https://access.redhat.com/articles/1326823
-  message: The WebLogic `<delay-updates-until-end-of-tx>` configuration element, which
-    defaults to `true`, is used for performance reasons to delay updates to the persistent
-    store of all beans until the end of the transaction. When set to `false`, updates
-    are sent to the database after each method invocation, but are not committed until
-    the end of the transaction. This allows other processes to access the persisted
-    data while the transaction is waiting to be completed.. In JBoss EAP 6+, you can
-    achieve the same behavior by specifying the `<sync-on-commit-only>` in the jbosscmp-jdbc.xml
-    file.
+  message: "\n \n The WebLogic `<delay-updates-until-end-of-tx>` configuration element,
+    which defaults to `true`, is used for performance reasons to delay updates to
+    the persistent store of all beans until the end of the transaction. When set to
+    `false`, updates are sent to the database after each method invocation, but are
+    not committed until the end of the transaction. This allows other processes to
+    access the persisted data while the transaction is waiting to be completed.\n\n
+    In JBoss EAP 6+, you can achieve the same behavior by specifying the `<sync-on-commit-only>`
+    in the jbosscmp-jdbc.xml file.\n \n "
   ruleID: weblogic-xml-descriptor-eap7-03000
   when:
     builtin.xml:
@@ -88,9 +86,7 @@
       xpath: //*[local-name()='delay-updates-until-end-of-tx']/text()
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml)
-    The elements of proprietary `weblogic-ejb-jar.xml` descriptor need to be mapped to the `jboss-ejb3.xml` one according to the attached knowledge article.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml)
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -125,9 +121,7 @@
         xpath: /wls:weblogic-ejb-jar
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Stateful Session Bean (SFSB)
-    Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`.. The equivalent usage is `@AccessTimeout(value= -1)`
+  description: WebLogic Stateful Session Bean (SFSB)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -140,8 +134,9 @@
   links:
   - title: Java EE 7 annotation @AccessTimeout
     url: http://docs.oracle.com/javaee/7/api/javax/ejb/AccessTimeout.html
-  message: Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`..
-    The equivalent usage is `@AccessTimeout(value= -1)`
+  message: |-
+    Replace WebLogic proprietary configuration by Java EE annotation `@AccessTimeout`.
+     The equivalent usage is `@AccessTimeout(value= -1)`
   ruleID: weblogic-xml-descriptor-eap7-06001
   when:
     builtin.xml:
@@ -150,6 +145,7 @@
       xpath: //*[local-name() = 'allow-concurrent-calls' and translate(text(),'TRUE','true')
         = 'true' ]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -169,6 +165,7 @@
         wl10: http://www.bea.com/ns/weblogic/weblogic-wsee-standaloneclient
       xpath: /weblogic-wsee-standaloneclient |/wl10:weblogic-wsee-standaloneclient
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -188,6 +185,7 @@
         jee: http://java.sun.com/xml/ns/j2ee
       xpath: /java-wsdl-mapping
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -209,9 +207,7 @@
       xpath: /webservice-policy-ref | /wl:webservice-policy-ref | /wl9:webservice-policy-ref
 - category: optional
   customVariables: []
-  description: |-
-    Webservice Type
-    WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor or to a Java EE standard Annotation based configuration. Reference the JBoss EAP product documentation for more information.
+  description: Webservice Type
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -221,9 +217,9 @@
   - descriptor
   - configuration
   links: []
-  message: WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor
+  message: "WebLogic webservices can be migrated to `jboss-webservices.xml` descriptor
     or to a Java EE standard Annotation based configuration. Reference the JBoss EAP
-    product documentation for more information.
+    product documentation for more information.\n "
   ruleID: weblogic-xml-descriptor-eap7-10000
   when:
     or:
@@ -247,7 +243,7 @@
     may be configured in the application deployment or JBoss server configuration
     files.\n\n                        For information on how to configure JBoss EAP
     JMS, please refer to the JBoss Enterprise Application Platform 7 messaging configuration
-    documentation.\n                    \n"
+    documentation.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -276,7 +272,7 @@
     may be configured in the application deployment or JBoss server configuration
     files.\n\n                        For more information on how to configure JBoss
     EAP, please refer to the Configuration Guide for JBoss Enterprise Application
-    Platform 7.\n                    \n"
+    Platform 7.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -305,6 +301,7 @@
       xpath: /bea:weblogic-web-app | /wlso:weblogic-web-app | /wls:weblogic-web-app
         | /weblogic-web-app
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -324,7 +321,7 @@
         wsdd: http://www.bea.com/servers/wls70
       xpath: /wsdd:type-mapping
 - customVariables: []
-  description: |
+  description: |-
     WebLogic services configuration
     WebLogic specific configuration of web services runtime parameters
   labels:
@@ -347,6 +344,7 @@
         wlw: http://www.bea.com/2003/03/wlw/config/
       xpath: /wlw:wlw-config
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -371,7 +369,7 @@
 - customVariables: []
   description: "WebLogic annotation manifest\n\n                        In this file,
     the value set for a property by a metadata annotation can be overridden. (It does
-    not override the values set by a setter method.)\n                    \n"
+    not override the values set by a setter method.)\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -393,7 +391,7 @@
 - customVariables: []
   description: "WebLogic plan.xml deployment descriptor\n\n                        WebLogic
     `plan.xml` deployment descriptor file provides a way to target the application
-    deployment for a specific environment.\n                    \n"
+    deployment for a specific environment.\n                    "
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
@@ -416,9 +414,7 @@
       xpath: /wls:deployment-plan
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic EJB XML (weblogic-ejb-jar.xml) trans-timeout-seconds
-    The WebLogic `<trans-timeout-seconds>` configuration element sets the maximum duration for an EJB's container-initiated transactions, in seconds, after which the transaction is rolled back.. In JBoss EAP 6+, you can achieve the same behavior by using the `TransactionTimeout` annotation.
+  description: WebLogic EJB XML (weblogic-ejb-jar.xml) trans-timeout-seconds
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -436,10 +432,10 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/administration_and_configuration_guide/#Session_Bean_Transaction_Timeout
   - title: How to set EJB transaction timeout in JBoss EAP 6
     url: https://access.redhat.com/solutions/90553
-  message: The WebLogic `<trans-timeout-seconds>` configuration element sets the maximum
-    duration for an EJB's container-initiated transactions, in seconds, after which
-    the transaction is rolled back.. In JBoss EAP 6+, you can achieve the same behavior
-    by using the `TransactionTimeout` annotation.
+  message: "\n \n The WebLogic `<trans-timeout-seconds>` configuration element sets
+    the maximum duration for an EJB's container-initiated transactions, in seconds,
+    after which the transaction is rolled back. \n\n In JBoss EAP 6+, you can achieve
+    the same behavior by using the `TransactionTimeout` annotation.\n \n "
   ruleID: weblogic-xml-descriptor-19000
   when:
     builtin.xml:
diff --git a/default/generated/eap7/99-weblogic.windup.yaml b/default/generated/eap7/99-weblogic.windup.yaml
index 282bf11a..2ec5c02d 100644
--- a/default/generated/eap7/99-weblogic.windup.yaml
+++ b/default/generated/eap7/99-weblogic.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Scheduled Job
-    WebLogic scheduled jobs should be migrated to use the standard EJB `javax.ejb.TimerService`.
+  description: WebLogic Scheduled Job
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -15,7 +13,8 @@
   links:
   - title: Java EE 7 - Using TimerService
     url: https://docs.oracle.com/javaee/7/tutorial/ejb-basicexamples004.htm
-  message: WebLogic scheduled jobs should be migrated to use the standard EJB `javax.ejb.TimerService`.
+  message: "\n \n WebLogic scheduled jobs should be migrated to use the standard EJB
+    `javax.ejb.TimerService`.\n \n "
   ruleID: weblogic-eap7-01000
   tag:
   - scheduler
@@ -29,9 +28,7 @@
       pattern: weblogic.time.common.Triggerable
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic StringUtils usage
-    Replace with the `StringUtils` class from Apache Commons.
+  description: WebLogic StringUtils usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -49,9 +46,7 @@
       pattern: weblogic.utils.StringUtils*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic specific Apache XML package
-    Code using this package should be replaced with code using the org.apache.xml package from [Apache Xerces](http://xerces.apache.org/).
+  description: WebLogic specific Apache XML package
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -59,8 +54,8 @@
   - konveyor.io/target=eap
   - weblogic
   links: []
-  message: Code using this package should be replaced with code using the org.apache.xml
-    package from [Apache Xerces](http://xerces.apache.org/).
+  message: "\n Code using this package should be replaced with code using the org.apache.xml
+    package from [Apache Xerces](http://xerces.apache.org/).\n "
   ruleID: weblogic-eap7-03000
   when:
     java.referenced:
@@ -71,9 +66,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: weblogic.transaction.(?P<classname>(Client)*TransactionManager)
-  description: |-
-    WebLogic TransactionManager usage
-    Replace with the Java EE standard [javax.transaction.TransactionManager](http://docs.oracle.com/javaee/7/api/javax/transaction/TransactionManager.html)
+  description: WebLogic TransactionManager usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -93,9 +86,7 @@
       pattern: weblogic.transaction.(Client)*TransactionManager
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TransactionManager usage of resume method
-    Replace with the Java EE standard method `javax.transaction.TransactionManager.resume(Transaction tx)`.
+  description: WebLogic TransactionManager usage of resume method
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -123,9 +114,7 @@
         pattern: weblogic.transaction.ClientTransactionManager.forceResume*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TransactionManager usage of suspend method
-    Replace with the Java EE standard `javax.transaction.TransactionManager.suspend()`
+  description: WebLogic TransactionManager usage of suspend method
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -152,9 +141,7 @@
         pattern: weblogic.transaction.ClientTransactionManager.forceSuspend*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic TxHelper usage
-    Remove the `weblogic.transaction.TxHelper` import statement.
+  description: WebLogic TxHelper usage
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -173,9 +160,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: weblogic.transaction.(?P<classname>(Client)*TxHelper.)?getTransactionManager\(\)
-  description: |-
-    WebLogic ClientTxHelper
-    Look up the Java Enterprise Edition `javax.transaction.TransactionManager` in JBoss EAP using the following code:. ```java. InitialContext context = new InitialContext();. TransactionManager transactionManager =. (TransactionManager)context.lookup("java:jboss/TransactionManager");. ```
+  description: WebLogic ClientTxHelper
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -184,10 +169,10 @@
   - weblogic
   - transactions
   links: []
-  message: Look up the Java Enterprise Edition `javax.transaction.TransactionManager`
-    in JBoss EAP using the following code:. ```java. InitialContext context = new
-    InitialContext();. TransactionManager transactionManager =. (TransactionManager)context.lookup("java:jboss/TransactionManager");.
-    ```
+  message: "\n \n Look up the Java Enterprise Edition `javax.transaction.TransactionManager`
+    in JBoss EAP using the following code:\n\n ```java\n InitialContext context =
+    new InitialContext();\n TransactionManager transactionManager =\n (TransactionManager)context.lookup(\"java:jboss/TransactionManager\");\n
+    ```\n \n "
   ruleID: weblogic-eap7-08000
   when:
     java.referenced:
@@ -195,9 +180,7 @@
       pattern: weblogic.transaction.(Client)*TxHelper.getTransactionManager*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary Clob JDBC object (OracleThinClob)
-    This Oracle and WebLogic proprietary code (`OracleThinClob`) should be replaced with the use of the java.sql.Clob interface.
+  description: WebLogic proprietary Clob JDBC object (OracleThinClob)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -210,17 +193,15 @@
     url: https://docs.oracle.com/database/121/JAJDB/oracle/jdbc/class-use/OracleClob.html
   - title: java.sql.Clob interface
     url: http://docs.oracle.com/javase/7/docs/api/java/sql/Clob.html
-  message: This Oracle and WebLogic proprietary code (`OracleThinClob`) should be
-    replaced with the use of the java.sql.Clob interface.
+  message: "\n This Oracle and WebLogic proprietary code (`OracleThinClob`) should
+    be replaced with the use of the java.sql.Clob interface.\n "
   ruleID: weblogic-eap7-09000
   when:
     java.referenced:
       pattern: weblogic.jdbc.vendor.oracle.OracleThinClob
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic JDBC code
-    This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`
+  description: WebLogic JDBC code
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -233,7 +214,7 @@
     url: https://docs.oracle.com/database/121/JAJDB/oracle/jdbc/class-use/OracleClob.html
   - title: java.sql.Clob interface
     url: http://docs.oracle.com/javase/7/docs/api/java/sql/Clob.html
-  message: This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`
+  message: "\n This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`\n "
   ruleID: weblogic-eap7-10000
   when:
     java.referenced:
@@ -241,9 +222,7 @@
       pattern: weblogic.jdbc.vendor.oracle.OracleThinClob.getCharacterOutputStream*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic proprietary logger (NonCatalogLogger)
-    The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and should be migrated to a supported logging framework,. such as the JDK Logger or JBoss Logging:. ```java. import java.util.logging.Logger;. Logger LOG = Logger.getLogger("MyLogger");. ```
+  description: WebLogic proprietary logger (NonCatalogLogger)
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -256,10 +235,10 @@
     url: https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html
   - title: Logging with JBoss EAP
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html/configuration_guide/logging_with_jboss_eap
-  message: The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and should
-    be migrated to a supported logging framework,. such as the JDK Logger or JBoss
-    Logging:. ```java. import java.util.logging.Logger;. Logger LOG = Logger.getLogger("MyLogger");.
-    ```
+  message: "\n \n The WebLogic `NonCatalogLogger` is not supported on JBoss EAP, and
+    should be migrated to a supported logging framework,\n such as the JDK Logger
+    or JBoss Logging:\n\n ```java\n import java.util.logging.Logger;\n Logger LOG
+    = Logger.getLogger(\"MyLogger\");\n ```\n \n "
   ruleID: weblogic-eap7-11000
   when:
     or:
@@ -271,9 +250,7 @@
         pattern: weblogic.i18n.logging.NonCatalogLogger*
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Oracle FCF JDBC property
-    Oracle Fast Connection Failover is specific property supported only by Oracle JDBC driver which provides support for their vendor's special features transparently to the application server in which they are deployed.. For example, one can supply a URL like this to the Oracle JDBC driver and the driver will provide transparent load-balancing and fail-over:. ```. <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>. ```
+  description: WebLogic Oracle FCF JDBC property
   effort: 1
   labels:
   - konveyor.io/source=weblogic
@@ -284,12 +261,12 @@
   links:
   - title: Implement Oracle Fast Connection Failover (FCF) in EAP
     url: https://access.redhat.com/articles/1329233
-  message: Oracle Fast Connection Failover is specific property supported only by
-    Oracle JDBC driver which provides support for their vendor's special features
-    transparently to the application server in which they are deployed.. For example,
+  message: "\n \n Oracle Fast Connection Failover is specific property supported only
+    by Oracle JDBC driver which provides support for their vendor's special features
+    transparently to the application server in which they are deployed.\n\n For example,
     one can supply a URL like this to the Oracle JDBC driver and the driver will provide
-    transparent load-balancing and fail-over:. ```. <xa-datasource-property name="URL">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>.
-    ```
+    transparent load-balancing and fail-over:\n ```\n <xa-datasource-property name=\"URL\">jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521))(ADDRESS=(PROTOCOL=TCP)(HOST=my.host.org)(PORT=1521)))(CONNECT_DATA=(SERVICE_NAME=servjboss)(failover_mode=(type=select)(method=basic)))</xa-datasource-property>\n
+    ```\n \n "
   ruleID: weblogic-eap7-12000
   when:
     builtin.xml:
@@ -297,9 +274,7 @@
       xpath: /jdbc-data-source/jdbc-driver-params/property/name[text()='FastConnectionFailoverEnabled']
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic side-by-side redeployment configuration
-    Oracle WebLogic Server includes a proprietary side-by-side production redeployment feature. For applications that meet certain requirements and restrictions, the new version of the application is deployed while the older version is still running.. The old and new applications must be running on the same server or cluster. The new version of the application accepts new web session requests while the older version finishes processing requests already in process. Upon completion of the existing session requests, the older version of the application is then undeployed.. In JBoss EAP, you can either deploy the new application to a secondary server group or cluster, or deploy the new application serially to the same clustered domain.
+  description: WebLogic side-by-side redeployment configuration
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -309,16 +284,16 @@
   links:
   - title: Replace WebLogic side-by-side production redeployment in EAP 6
     url: https://access.redhat.com/articles/1329253
-  message: Oracle WebLogic Server includes a proprietary side-by-side production redeployment
-    feature. For applications that meet certain requirements and restrictions, the
-    new version of the application is deployed while the older version is still running..
-    The old and new applications must be running on the same server or cluster. The
-    new version of the application accepts new web session requests while the older
-    version finishes processing requests already in process. Upon completion of the
-    existing session requests, the older version of the application is then undeployed..
-    In JBoss EAP, you can either deploy the new application to a secondary server
-    group or cluster, or deploy the new application serially to the same clustered
-    domain.
+  message: "\n \n Oracle WebLogic Server includes a proprietary side-by-side production
+    redeployment feature. For applications that meet certain requirements and restrictions,
+    the new version of the application is deployed while the older version is still
+    running.\n The old and new applications must be running on the same server or
+    cluster. The new version of the application accepts new web session requests while
+    the older version finishes processing requests already in process. Upon completion
+    of the existing session requests, the older version of the application is then
+    undeployed.\n\n In JBoss EAP, you can either deploy the new application to a secondary
+    server group or cluster, or deploy the new application serially to the same clustered
+    domain.\n \n "
   ruleID: weblogic-eap7-13000
   when:
     builtin.filecontent:
@@ -326,9 +301,7 @@
       pattern: 'Weblogic-Application-Version:'
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic Oracle Wallet
-    WebLogic administrators use wallets created by Oracle Wallet Manager to manage public key security credentials on application clients and servers.. These wallets must first be converted to standard Java KeyStore (JKS) entries that can then be used to configure the credentials in JBoss EAP 7.
+  description: WebLogic Oracle Wallet
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -338,10 +311,10 @@
   links:
   - title: Replace WebLogic Oracle Wallets When Migrating to EAP 6
     url: https://access.redhat.com/articles/1329073
-  message: WebLogic administrators use wallets created by Oracle Wallet Manager to
-    manage public key security credentials on application clients and servers.. These
-    wallets must first be converted to standard Java KeyStore (JKS) entries that can
-    then be used to configure the credentials in JBoss EAP 7.
+  message: "\n \n WebLogic administrators use wallets created by Oracle Wallet Manager
+    to manage public key security credentials on application clients and servers.\n\n
+    These wallets must first be converted to standard Java KeyStore (JKS) entries
+    that can then be used to configure the credentials in JBoss EAP 7.\n \n "
   ruleID: weblogic-eap7-15000
   when:
     builtin.filecontent:
@@ -349,9 +322,7 @@
       pattern: oracle.net.wallet_location
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic InitialContextFactory
-    `weblogic.jndi.WLInitialContextFactory` is an implementation of `InitialContextFactory` used to get object instances from JNDI.. The equivalent functionality needs to be configured on JBoss EAP 7 using `org.jboss.naming.remote.client.InitialContextFactory`. Then the context could be instanticated as follows: `InitialContext ctx = new InitialContext();`.
+  description: WebLogic InitialContextFactory
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -364,11 +335,11 @@
     url: https://access.redhat.com/solutions/161543
   - title: How to configure an EJB client in JBoss EAP 6
     url: https://access.redhat.com/solutions/396853
-  message: '`weblogic.jndi.WLInitialContextFactory` is an implementation of `InitialContextFactory`
-    used to get object instances from JNDI.. The equivalent functionality needs to
-    be configured on JBoss EAP 7 using `org.jboss.naming.remote.client.InitialContextFactory`.
+  message: "\n \n `weblogic.jndi.WLInitialContextFactory` is an implementation of
+    `InitialContextFactory` used to get object instances from JNDI.\n\n The equivalent
+    functionality needs to be configured on JBoss EAP 7 using `org.jboss.naming.remote.client.InitialContextFactory`.
     Then the context could be instanticated as follows: `InitialContext ctx = new
-    InitialContext();`.'
+    InitialContext();`.\n \n "
   ruleID: weblogic-eap7-016000
   when:
     builtin.filecontent:
@@ -376,9 +347,7 @@
       pattern: weblogic.jndi.WLInitialContextFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    WebLogic T3 JNDI binding
-    Weblogic’s implementation of the RMI specification uses a proprietary protocol known as T3. T3S is the version of the protocol over SSL.. `t3://` and `t3s://` URLs are used to configure a JNDI InitialContext within WebLogic.. The equivalent functionality needs to be configured in JBoss EAP 7.. This could be done either by using standard Java EE JNDI names or by using a WebLogic proprietary library if the connectivity to WebLogic server is still required.
+  description: WebLogic T3 JNDI binding
   effort: 3
   labels:
   - konveyor.io/source=weblogic
@@ -391,12 +360,12 @@
     url: https://docs.oracle.com/cd/E24329_01/web.1211/e24389/rmi_t3.htm#WLRMI143
   - title: Invoking EJBs deployed on WebLogic from EAP6
     url: https://access.redhat.com/solutions/1230143
-  message: Weblogic’s implementation of the RMI specification uses a proprietary protocol
-    known as T3. T3S is the version of the protocol over SSL.. `t3://` and `t3s://`
-    URLs are used to configure a JNDI InitialContext within WebLogic.. The equivalent
-    functionality needs to be configured in JBoss EAP 7.. This could be done either
-    by using standard Java EE JNDI names or by using a WebLogic proprietary library
-    if the connectivity to WebLogic server is still required.
+  message: "\n \n Weblogic’s implementation of the RMI specification uses a proprietary
+    protocol known as T3. T3S is the version of the protocol over SSL.\n `t3://` and
+    `t3s://` URLs are used to configure a JNDI InitialContext within WebLogic.\n\n
+    The equivalent functionality needs to be configured in JBoss EAP 7.\n This could
+    be done either by using standard Java EE JNDI names or by using a WebLogic proprietary
+    library if the connectivity to WebLogic server is still required.\n \n "
   ruleID: weblogic-eap7-017000
   when:
     builtin.filecontent:
diff --git a/default/generated/eap7/ruleset.yaml b/default/generated/eap7/ruleset.yaml
index 9679aee0..8f8267e2 100644
--- a/default/generated/eap7/ruleset.yaml
+++ b/default/generated/eap7/ruleset.yaml
@@ -1,3 +1,4 @@
-name: eap7/websphere
-description: Provides analysis of WebSphere proprietary classes and constructs that
-  may require individual attention when migrating to JBoss EAP 7+.
+name: eap7/eap72
+description: This ruleset provides analysis of Maven built applications that depend
+  on org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec artifact, a dependency that should
+  be removed when migrating to JBoss EAP 7.3 or later.
diff --git a/default/generated/eap8/105-eap8-faces.windup.yaml b/default/generated/eap8/105-eap8-faces.windup.yaml
index 51e6ce90..bcdfb125 100644
--- a/default/generated/eap8/105-eap8-faces.windup.yaml
+++ b/default/generated/eap8/105-eap8-faces.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Dependency on JSF artifacts must be updated
-    Dependency on JSF artifacts must be updated for EAP8 to Jakarta Faces 4.0.. Update dependency to `org.glassfish:jakarta.faces:4.0.0` or greater
+  description: Dependency on JSF artifacts must be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -16,8 +14,9 @@
     url: https://jakarta.ee/specifications/faces/4.0/
   - title: Jakarta Server Faces
     url: https://access.redhat.com/articles/6980265#faces
-  message: Dependency on JSF artifacts must be updated for EAP8 to Jakarta Faces 4.0..
-    Update dependency to `org.glassfish:jakarta.faces:4.0.0` or greater
+  message: |-
+    Dependency on JSF artifacts must be updated for EAP8 to Jakarta Faces 4.0.
+     Update dependency to `org.glassfish:jakarta.faces:4.0.0` or greater
   ruleID: eap8-faces-00001
   when:
     or:
@@ -29,9 +28,7 @@
         nameregex: com\.sun\.faces\..*
 - category: mandatory
   customVariables: []
-  description: |-
-    Source reference to `javax.faces.bean.ManagedProperty` must be updated
-    Source reference to `javax.faces.bean.ManagedProperty` must be updated.. Use 'jakarta.faces.annotation.ManagedProperty' along with `@Inject`.
+  description: Source reference to `javax.faces.bean.ManagedProperty` must be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -45,8 +42,9 @@
     url: https://jakarta.ee/specifications/platform/9/apidocs/jakarta/faces/bean/managedproperty
   - title: Faces Managed Beans
     url: https://access.redhat.com/articles/6980265#faces_managed_beans
-  message: Source reference to `javax.faces.bean.ManagedProperty` must be updated..
-    Use 'jakarta.faces.annotation.ManagedProperty' along with `@Inject`.
+  message: |-
+    Source reference to `javax.faces.bean.ManagedProperty` must be updated.
+     Use 'jakarta.faces.annotation.ManagedProperty' along with `@Inject`.
   ruleID: eap8-faces-00002
   when:
     or:
@@ -58,9 +56,7 @@
         pattern: javax.faces.bean.ManagedProperty
 - category: mandatory
   customVariables: []
-  description: |-
-    JSF ManagedBean has been removed
-    JSF ManagedBean has been removed.. Use CDI's `@jakarta.inject.Named(“foo”)` to replace JSF ManagedBeans.
+  description: JSF ManagedBean has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -76,8 +72,9 @@
     url: https://jakarta.ee/specifications/cdi/4.0/
   - title: Faces Managed Beans
     url: https://access.redhat.com/articles/6980265#faces_managed_beans
-  message: JSF ManagedBean has been removed.. Use CDI's `@jakarta.inject.Named(“foo”)`
-    to replace JSF ManagedBeans.
+  message: |-
+    JSF ManagedBean has been removed.
+     Use CDI's `@jakarta.inject.Named(“foo”)` to replace JSF ManagedBeans.
   ruleID: eap8-faces-00003
   when:
     or:
@@ -92,9 +89,7 @@
         xpath: //*/j:managed-bean
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `javax.faces.bean.ViewScoped` removed
-    Annotation `javax.faces.bean.ViewScoped` removed.. Use `jakarta.faces.view.ViewScoped` to replace it.
+  description: Annotation `javax.faces.bean.ViewScoped` removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -108,8 +103,9 @@
     url: https://jakarta.ee/specifications/faces/3.0/apidocs/jakarta/faces/view/viewscoped
   - title: Other Faces API Changes
     url: https://access.redhat.com/articles/6980265#faces_other
-  message: Annotation `javax.faces.bean.ViewScoped` removed.. Use `jakarta.faces.view.ViewScoped`
-    to replace it.
+  message: |-
+    Annotation `javax.faces.bean.ViewScoped` removed.
+     Use `jakarta.faces.view.ViewScoped` to replace it.
   ruleID: eap8-faces-00004
   when:
     java.referenced:
@@ -120,8 +116,7 @@
   - name: scope
     nameOfCaptureGroup: scope
     pattern: javax.faces.bean.(?P<scope>Application|Request|Session)?Scoped
-  description: |
-    Annotation `javax.faces.bean.{scope}Scoped` removed
+  description: Annotation `javax.faces.bean.{scope}Scoped` removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -135,8 +130,9 @@
     url: https://jakarta.ee/specifications/cdi/4.0/apidocs/jakarta.cdi/jakarta/enterprise/context/package-summary.html
   - title: Faces Managed Beans
     url: https://access.redhat.com/articles/6980265#faces_managed_beans
-  message: Annotation `javax.faces.bean.{{scope}}Scoped` removed.. Use `jakarta.enterprise.context.{{scope}}Scoped`
-    to replace it.
+  message: |-
+    Annotation `javax.faces.bean.{{scope}}Scoped` removed.
+     Use `jakarta.enterprise.context.{{scope}}Scoped` to replace it.
   ruleID: eap8-faces-00005
   when:
     java.referenced:
@@ -144,9 +140,7 @@
       pattern: javax.faces.bean.Application|Request|SessionScoped
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `javax.faces.bean.CustomScoped` removed
-    Annotation `javax.faces.bean.CustomScoped` removed.. Use `jakarta.enterprise.context.spi.Context` to replace it.
+  description: Annotation `javax.faces.bean.CustomScoped` removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -160,8 +154,9 @@
     url: https://jakarta.ee/specifications/cdi/4.0/apidocs/jakarta.cdi/jakarta/enterprise/context/spi/context
   - title: Faces Managed Beans
     url: https://access.redhat.com/articles/6980265#faces_managed_beans
-  message: Annotation `javax.faces.bean.CustomScoped` removed.. Use `jakarta.enterprise.context.spi.Context`
-    to replace it.
+  message: |-
+    Annotation `javax.faces.bean.CustomScoped` removed.
+     Use `jakarta.enterprise.context.spi.Context` to replace it.
   ruleID: eap8-faces-00006
   when:
     java.referenced:
@@ -169,9 +164,7 @@
       pattern: javax.faces.bean.CustomScoped
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation `javax.faces.bean.NoneScoped` removed
-    Annotation `javax.faces.bean.NoneScoped` removed.. Use `jakarta.enterprise.context.Dependent` to replace it.
+  description: Annotation `javax.faces.bean.NoneScoped` removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -185,8 +178,9 @@
     url: https://jakarta.ee/specifications/cdi/4.0/apidocs/jakarta.cdi/jakarta/enterprise/context/dependent
   - title: Faces Managed Beans
     url: https://access.redhat.com/articles/6980265#faces_managed_beans
-  message: Annotation `javax.faces.bean.NoneScoped` removed.. Use `jakarta.enterprise.context.Dependent`
-    to replace it.
+  message: |-
+    Annotation `javax.faces.bean.NoneScoped` removed.
+     Use `jakarta.enterprise.context.Dependent` to replace it.
   ruleID: eap8-faces-00007
   when:
     java.referenced:
@@ -194,9 +188,7 @@
       pattern: javax.faces.bean.NoneScoped
 - category: mandatory
   customVariables: []
-  description: |-
-    ResourceResolvers have been removed
-    ResourceResolvers have been removed in eap8.. Instead, implement a `jakarta.faces.application.ResourceHandler` and register the fully qualified class name via faces-config.xml/application/resource-handler element
+  description: ResourceResolvers have been removed
   effort: 3
   labels:
   - konveyor.io/source=eap6
@@ -210,9 +202,9 @@
     url: https://github.com/jakartaee/faces/issues/1583
   - title: Other Faces API Changes
     url: https://access.redhat.com/articles/6980265#faces_other
-  message: ResourceResolvers have been removed in eap8.. Instead, implement a `jakarta.faces.application.ResourceHandler`
-    and register the fully qualified class name via faces-config.xml/application/resource-handler
-    element
+  message: |-
+    ResourceResolvers have been removed in eap8.
+     Instead, implement a `jakarta.faces.application.ResourceHandler` and register the fully qualified class name via faces-config.xml/application/resource-handler element
   ruleID: eap8-faces-00008
   when:
     or:
@@ -222,9 +214,7 @@
         pattern: javax.faces.view.facelets.ResourceResolver
 - category: mandatory
   customVariables: []
-  description: |-
-    JSP support has been removed in Jakarta EE 10
-    JSP support has been removed in Jakarta EE 10. Facelets will remain as the only default view language, and views can also now be created solely using java.
+  description: JSP support has been removed in Jakarta EE 10
   effort: 5
   labels:
   - konveyor.io/source=eap6
diff --git a/default/generated/eap8/106-eap8-resteasy.windup.yaml b/default/generated/eap8/106-eap8-resteasy.windup.yaml
index f8b7404d..015f2879 100644
--- a/default/generated/eap8/106-eap8-resteasy.windup.yaml
+++ b/default/generated/eap8/106-eap8-resteasy.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The org.jboss.resteasy.resteasy-jettison-provider module has been removed
-    The `org.jboss.resteasy.resteasy-jettison-provider` module has been removed. There is no documented solution for this issue.
+  description: The org.jboss.resteasy.resteasy-jettison-provider module has been removed
   effort: 13
   labels:
   - konveyor.io/source=eap6
@@ -25,9 +23,8 @@
         pattern: org.jboss.resteasy.resteasy-jettison-provider
 - category: mandatory
   customVariables: []
-  description: |-
-    The org.jboss.resteasy resteasy-jettison-provider artifact has been removed
-    The `org.jboss.resteasy:resteasy-jettison-provider` artifact has been removed. There is no documented solution for this issue.
+  description: The org.jboss.resteasy resteasy-jettison-provider artifact has been
+    removed
   effort: 13
   labels:
   - konveyor.io/source=eap6
@@ -46,9 +43,7 @@
       name: org.jboss.resteasy.resteasy-jettison-provider
 - category: mandatory
   customVariables: []
-  description: |-
-    The org.jboss.resteasy.resteasy-yaml-provider module has been removed
-    The `org.jboss.resteasy.resteasy-yaml-provider` module has been removed. There is no documented solution for this issue.
+  description: The org.jboss.resteasy.resteasy-yaml-provider module has been removed
   effort: 13
   labels:
   - konveyor.io/source=eap6
@@ -71,9 +66,7 @@
         pattern: org.jboss.resteasy.resteasy-yaml-provider
 - category: mandatory
   customVariables: []
-  description: |-
-    The org.jboss.resteasy resteasy-yaml-provider artifact has been removed
-    The `org.jboss.resteasy:resteasy-yaml-provider` artifact has been removed. There is no documented solution for this issue.
+  description: The org.jboss.resteasy resteasy-yaml-provider artifact has been removed
   effort: 13
   labels:
   - konveyor.io/source=eap6
@@ -92,9 +85,7 @@
       name: org.jboss.resteasy.resteasy-yaml-provider
 - category: mandatory
   customVariables: []
-  description: |-
-    The org.jboss.resteasy resteasy-spring artifact has been renamed
-    The `org.jboss.resteasy:resteasy-spring` artifact has been renamed to `org.jboss.resteasy.spring:resteasy-spring`
+  description: The org.jboss.resteasy resteasy-spring artifact has been renamed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -112,9 +103,7 @@
       name: org.jboss.resteasy.resteasy-spring
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.resteasy.spi.StringConverter has been removed
-    `org.jboss.resteasy.spi.StringConverter` has been removed. Replace with `jakarta.ws.rs.ext.ParamConverter`
+  description: org.jboss.resteasy.spi.StringConverter has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -137,9 +126,7 @@
         pattern: org.jboss.resteasy.spi.StringConverter
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.resteasy.spi.AsynchronousResponse has been removed
-    `org.jboss.resteasy.spi.AsynchronousResponse` has been removed. Replace with `jakarta.ws.rs.container.AsyncResponse`
+  description: org.jboss.resteasy.spi.AsynchronousResponse has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -165,9 +152,7 @@
         pattern: org.jboss.resteasy.spi.AsynchronousResponse
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.resteasy.annotations.Suspend has been removed
-    `org.jboss.resteasy.annotations.Suspend` has been removed. Replace with `jakarta.ws.rs.container.Suspended`
+  description: org.jboss.resteasy.annotations.Suspend has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -190,9 +175,7 @@
         pattern: org.jboss.resteasy.annotations.Suspend
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.resteasy.core.ResourceInvoker interface has been removed
-    `org.jboss.resteasy.core.ResourceInvoker` interface have been removed. Replace with `org.jboss.resteasy.spi.ResourceInvoker`.
+  description: org.jboss.resteasy.core.ResourceInvoker interface has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -212,9 +195,7 @@
       pattern: org.jboss.resteasy.core.ResourceInvoker
 - category: mandatory
   customVariables: []
-  description: |-
-    org.jboss.resteasy.plugins.interceptors.encoding classes has been removed
-    `org.jboss.resteasy.plugins.interceptors.encoding` classes have been removed. Replace with the equivalent `org.jboss.resteasy.plugins.interceptors` classes. Or remove the manual registration of the interceptors and set the system property `resteasy.allowGzip=true`.
+  description: org.jboss.resteasy.plugins.interceptors.encoding classes has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -237,9 +218,7 @@
       pattern: org.jboss.resteasy.plugins.interceptors.encoding*
 - category: optional
   customVariables: []
-  description: |-
-    The org.jboss.resteasy.resteasy-jaxrs module has been deprecated
-    The `org.jboss.resteasy.resteasy-jaxrs` module has been deprecated and split into 4 new modules, specifically `org.jboss.resteasy.resteasy-client`, `org.jboss.resteasy.resteasy-client-spi`,`org.jboss.resteasy.resteasy-core` and `org.jboss.resteasy.resteasy-core-spi`
+  description: The org.jboss.resteasy.resteasy-jaxrs module has been deprecated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -249,9 +228,9 @@
   - konveyor.io/target=eap
   - eap8
   links: []
-  message: The `org.jboss.resteasy.resteasy-jaxrs` module has been deprecated and
+  message: "The `org.jboss.resteasy.resteasy-jaxrs` module has been deprecated and
     split into 4 new modules, specifically `org.jboss.resteasy.resteasy-client`, `org.jboss.resteasy.resteasy-client-spi`,`org.jboss.resteasy.resteasy-core`
-    and `org.jboss.resteasy.resteasy-core-spi`
+    and `org.jboss.resteasy.resteasy-core-spi` \n "
   ruleID: eap8-resteasy-00011
   when:
     or:
diff --git a/default/generated/eap8/107-eap8-xml-binding.windup.yaml b/default/generated/eap8/107-eap8-xml-binding.windup.yaml
index 6136334f..954b7c81 100644
--- a/default/generated/eap8/107-eap8-xml-binding.windup.yaml
+++ b/default/generated/eap8/107-eap8-xml-binding.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Implementation class packages must be updated
-    Implementation class packages must be updated to Jakarta XML Binding 4.0 for EAP8.. Update package paths  from `com.sun.xml.bind.*` to `org.glassfish.jaxb.runtime.*`
+  description: Implementation class packages must be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -17,8 +15,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: Implementation class packages must be updated to Jakarta XML Binding 4.0
-    for EAP8.. Update package paths  from `com.sun.xml.bind.*` to `org.glassfish.jaxb.runtime.*`
+  message: |-
+    Implementation class packages must be updated to Jakarta XML Binding 4.0 for EAP8.
+     Update package paths from `com.sun.xml.bind.*` to `org.glassfish.jaxb.runtime.*`
   ruleID: eap8-xml-binding-00001
   when:
     or:
@@ -30,9 +29,7 @@
         pattern: com.sun.xml.bind.v2*
 - category: mandatory
   customVariables: []
-  description: |-
-    Marshaller property package names must be updated
-    Marshaller property package names must be updated to Jakarta XML Binding 4.0 for EAP8.. Change the property constant name from `com.sun.xml.bind.*` to `org.glassfish.jaxb`
+  description: Marshaller property package names must be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -42,9 +39,9 @@
   - konveyor.io/target=eap
   - eap8
   links: []
-  message: Marshaller property package names must be updated to Jakarta XML Binding
-    4.0 for EAP8.. Change the property constant name from `com.sun.xml.bind.*` to
-    `org.glassfish.jaxb`
+  message: |-
+    Marshaller property package names must be updated to Jakarta XML Binding 4.0 for EAP8.
+     Change the property constant name from `com.sun.xml.bind.*` to `org.glassfish.jaxb`
   ruleID: eap8-xml-binding-00002
   when:
     as: setPropertiesMethodCalls
@@ -53,9 +50,7 @@
       pattern: javax.xml.bind.Marshaller.setProperty*
 - category: mandatory
   customVariables: []
-  description: |-
-    The URI in the JAXB binding file should be updated
-    The URI in JAXB binding files should be updated to Jakarta XML Binding 4.0 for EAP8.. The uri must change from `http://java.sun.com/xml/ns/jaxb` to `https://jakarta.ee/xml/ns/jaxb`
+  description: The URI in the JAXB binding file should be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -70,8 +65,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: The URI in JAXB binding files should be updated to Jakarta XML Binding
-    4.0 for EAP8.. The uri must change from `http://java.sun.com/xml/ns/jaxb` to `https://jakarta.ee/xml/ns/jaxb`
+  message: |-
+    The URI in JAXB binding files should be updated to Jakarta XML Binding 4.0 for EAP8.
+     The uri must change from `http://java.sun.com/xml/ns/jaxb` to `https://jakarta.ee/xml/ns/jaxb`
   ruleID: eap8-xml-binding-00003
   when:
     builtin.filecontent:
@@ -79,9 +75,7 @@
       pattern: http://java.sun.com/xml/ns/jaxb
 - category: mandatory
   customVariables: []
-  description: |-
-    Deprecated steps in the implementation lookup algorithm have been removed
-    Deprecated steps in the implementation lookup algorithm have been removed in Jakarta XML Binding 4.0 for EAP8.. Use of the removed JAXBContext implementation discovery mechanisms should be replaced by one of the supported mechanisms discussed in the links.
+  description: Deprecated steps in the implementation lookup algorithm have been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -98,10 +92,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: Deprecated steps in the implementation lookup algorithm have been removed
-    in Jakarta XML Binding 4.0 for EAP8.. Use of the removed JAXBContext implementation
-    discovery mechanisms should be replaced by one of the supported mechanisms discussed
-    in the links.
+  message: |-
+    Deprecated steps in the implementation lookup algorithm have been removed in Jakarta XML Binding 4.0 for EAP8.
+     Use of the removed JAXBContext implementation discovery mechanisms should be replaced by one of the supported mechanisms discussed in the links.
   ruleID: eap8-xml-binding-00004
   when:
     or:
@@ -114,9 +107,7 @@
   - name: mapClassname
     nameOfCaptureGroup: mapClassname
     pattern: javax.xml.bind.JAXBContext.newInstance(.*)
-  description: |-
-    Searches for implementation class names via properties have been dropped
-    Searches for implementation class names through `javax.xml.bind.context.factory` and `javax.xml.bind.JAXBContext` properties have been dropped in Jakarta XML Binding 4.0 for EAP8.. Use of the removed JAXBContext implementation discovery mechanisms should be replaced by one of the supported mechanisms discussed in the links.
+  description: Searches for implementation class names via properties have been dropped
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -126,10 +117,9 @@
   - konveyor.io/target=eap
   - eap8
   links: []
-  message: Searches for implementation class names through `javax.xml.bind.context.factory`
-    and `javax.xml.bind.JAXBContext` properties have been dropped in Jakarta XML Binding
-    4.0 for EAP8.. Use of the removed JAXBContext implementation discovery mechanisms
-    should be replaced by one of the supported mechanisms discussed in the links.
+  message: |-
+    Searches for implementation class names through `javax.xml.bind.context.factory` and `javax.xml.bind.JAXBContext` properties have been dropped in Jakarta XML Binding 4.0 for EAP8.
+     Use of the removed JAXBContext implementation discovery mechanisms should be replaced by one of the supported mechanisms discussed in the links.
   ruleID: eap8-xml-binding-00005
   when:
     as: instanceMethods
@@ -138,9 +128,7 @@
       pattern: javax.xml.bind.JAXBContext.newInstance*
 - category: mandatory
   customVariables: []
-  description: |-
-    Usage of this Validator interface or retrieval method should be removed
-    Usage of this Validator interface or retrieval method should be removed.. Passing a schema to `jakarta.xml.bind.Marshaller.setSchema(Schema)` or  `jakarta.xml.bind.UnMarshaller.setSchema(Schema)` is the replacement.
+  description: Usage of this Validator interface or retrieval method should be removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -155,9 +143,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: Usage of this Validator interface or retrieval method should be removed..
-    Passing a schema to `jakarta.xml.bind.Marshaller.setSchema(Schema)` or  `jakarta.xml.bind.UnMarshaller.setSchema(Schema)`
-    is the replacement.
+  message: |-
+    Usage of this Validator interface or retrieval method should be removed.
+     Passing a schema to `jakarta.xml.bind.Marshaller.setSchema(Schema)` or `jakarta.xml.bind.UnMarshaller.setSchema(Schema)` is the replacement.
   ruleID: eap8-xml-binding-00006
   when:
     or:
@@ -168,9 +156,8 @@
         pattern: javax.xml.bind.JAXBContext.createValidator*
 - category: potential
   customVariables: []
-  description: |-
-    Implementation or use by the application of the javax.xml.bind.Marshaller setAdapter() method may need to be updated
-    Implementation or use by the application of the `javax.xml.bind.Marshaller` `setAdapter()` method may need to be updated. to conform to the more fully specified generic type signatures in Jakarta Xml Binding 4.0.
+  description: Implementation or use by the application of the javax.xml.bind.Marshaller
+    setAdapter() method may need to be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -185,9 +172,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: Implementation or use by the application of the `javax.xml.bind.Marshaller`
-    `setAdapter()` method may need to be updated. to conform to the more fully specified
-    generic type signatures in Jakarta Xml Binding 4.0.
+  message: |-
+    Implementation or use by the application of the `javax.xml.bind.Marshaller` `setAdapter()` method may need to be updated
+     to conform to the more fully specified generic type signatures in Jakarta Xml Binding 4.0.
   ruleID: eap8-xml-binding-00007
   when:
     or:
@@ -196,9 +183,7 @@
         pattern: javax.xml.bind.Marshaller.setAdapter*
 - category: mandatory
   customVariables: []
-  description: |-
-    Outdated JAXB dependency
-    Pom dependency to outdated xml binding version must be updated to Jakarta XML Binding 4.0 for EAP8.
+  description: Outdated JAXB dependency
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -222,9 +207,8 @@
       upperbound: 4.0.1
 - category: potential
   customVariables: []
-  description: |-
-    Implementation or use by the application of the javax.xml.bind.Marshaller `getAdapter() method may need to be updated
-    Implementation or use by the application of the `javax.xml.bind.Marshaller` `getAdapter()` method may need to be updated. to conform to the more fully specified generic type signatures in Jakarta Xml Binding 4.0.
+  description: Implementation or use by the application of the javax.xml.bind.Marshaller
+    `getAdapter() method may need to be updated
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -239,9 +223,9 @@
   - title: 'JBoss EAP Application Migration from Jakarta EE 8 to EE 10: Jakarta XML
       Binding'
     url: https://access.redhat.com/articles/6980265#jaxb
-  message: Implementation or use by the application of the `javax.xml.bind.Marshaller`
-    `getAdapter()` method may need to be updated. to conform to the more fully specified
-    generic type signatures in Jakarta Xml Binding 4.0.
+  message: |-
+    Implementation or use by the application of the `javax.xml.bind.Marshaller` `getAdapter()` method may need to be updated
+     to conform to the more fully specified generic type signatures in Jakarta Xml Binding 4.0.
   ruleID: eap8-xml-binding-00009
   when:
     or:
diff --git a/default/generated/eap8/108-eap8.ejb.windup.yaml b/default/generated/eap8/108-eap8.ejb.windup.yaml
index 6e88d652..1224fd68 100644
--- a/default/generated/eap8/108-eap8.ejb.windup.yaml
+++ b/default/generated/eap8/108-eap8.ejb.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Methods relying on `java.security.Identity` removed
-    Methods relying on `java.security.Identity` have been removed from the Jakarta Enterprise Beans 4.0 specification and api.. Use `Principal.getCallerPrincipal()` instead.
+  description: Methods relying on `java.security.Identity` removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -14,9 +12,9 @@
   links:
   - title: Jakarta Enterprise Beans 4.0 specification
     url: https://jakarta.ee/specifications/enterprise-beans/4.0/
-  message: Methods relying on `java.security.Identity` have been removed from the
-    Jakarta Enterprise Beans 4.0 specification and api.. Use `Principal.getCallerPrincipal()`
-    instead.
+  message: |-
+    Methods relying on `java.security.Identity` have been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+     Use `Principal.getCallerPrincipal()` instead.
   ruleID: eap8-ejb-00001
   when:
     or:
@@ -28,9 +26,7 @@
         pattern: javax.ejb.EJBContext.isCallerInRole*
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.ejb.EJBContext.getEnvironment() method removed
-    Method was deprecated and has now been removed from the Jakarta Enterprise Beans 4.0 specification and api.. Use the JNDI naming context `java:comp/env` to access enterprise bean's environment.
+  description: javax.ejb.EJBContext.getEnvironment() method removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -42,9 +38,9 @@
   links:
   - title: Jakarta Enterprise Beans 4.0 specification
     url: https://jakarta.ee/specifications/enterprise-beans/4.0/
-  message: Method was deprecated and has now been removed from the Jakarta Enterprise
-    Beans 4.0 specification and api.. Use the JNDI naming context `java:comp/env`
-    to access enterprise bean's environment.
+  message: |-
+    Method was deprecated and has now been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+     Use the JNDI naming context `java:comp/env` to access enterprise bean's environment.
   ruleID: eap8-ejb-00002
   when:
     java.referenced:
@@ -52,9 +48,7 @@
       pattern: javax.ejb.EJBContext.getEnvironment*
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.ejb.SessionContext.getMessageContext() method removed
-    Methods relying on Jakarta XML RPC have been removed from the Jakarta Enterprise Beans 4.0 specification and api.
+  description: javax.ejb.SessionContext.getMessageContext() method removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
diff --git a/default/generated/eap8/109-empty-beans-xml.windup.yaml b/default/generated/eap8/109-empty-beans-xml.windup.yaml
index 1bacdfea..59813935 100644
--- a/default/generated/eap8/109-empty-beans-xml.windup.yaml
+++ b/default/generated/eap8/109-empty-beans-xml.windup.yaml
@@ -1,8 +1,7 @@
 - category: potential
   customVariables: []
-  description: |-
-    Use the `all` CDI bean discovery mode if the application has beans without bean defining annotations
-    Add a `beans` element with a `bean-discovery-mode='all'` attribute to an empty beans.xml file if the application has beans without bean defining annotations
+  description: Use the `all` CDI bean discovery mode if the application has beans
+    without bean defining annotations
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -14,8 +13,8 @@
   links:
   - title: Jakarta Contexts and Dependency Injection Bean Discovery
     url: https://access.redhat.com/articles/6980265#cdi_bean_discovery
-  message: Add a `beans` element with a `bean-discovery-mode='all'` attribute to an
-    empty beans.xml file if the application has beans without bean defining annotations
+  message: 'Add a `beans` element with a `bean-discovery-mode=''all''` attribute to
+    an empty beans.xml file if the application has beans without bean defining annotations '
   ruleID: empty-beans-xml-00001
   when:
     and:
diff --git a/default/generated/eap8/110-hibernate-6.2.windup.yaml b/default/generated/eap8/110-hibernate-6.2.windup.yaml
index af0ecbb3..de10ec8a 100644
--- a/default/generated/eap8/110-hibernate-6.2.windup.yaml
+++ b/default/generated/eap8/110-hibernate-6.2.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    EntityPersister#multiload method has changed
-    This method has changed from `EntityPersister#multiload(Object[] ids, SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions)` to `EntityPersister#lock(Object[] ids, EventSource session, MultiIdLoadOptions loadOptions)`.. Both EventSource and SharedSessionContractImplementor are contracts of `SessionImpl` so they can be easily swapped.. Methods `isEventSource` and `asEventSource` can also be used to ease the transition, available on the `SharedSessionContractImplementor` contract.
+  description: EntityPersister#multiload method has changed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6.2+
@@ -14,12 +12,13 @@
   links:
   - title: Hibernate 6 migration guide - Changes in integration contracts (SPIs)
     url: https://docs.jboss.org/hibernate/orm/6.2/migration-guide/migration-guide.html#spi-multiLoad
-  message: This method has changed from `EntityPersister#multiload(Object[] ids, SharedSessionContractImplementor
-    session, MultiIdLoadOptions loadOptions)` to `EntityPersister#lock(Object[] ids,
-    EventSource session, MultiIdLoadOptions loadOptions)`.. Both EventSource and SharedSessionContractImplementor
-    are contracts of `SessionImpl` so they can be easily swapped.. Methods `isEventSource`
-    and `asEventSource` can also be used to ease the transition, available on the
-    `SharedSessionContractImplementor` contract.
+  message: "\n This method has changed from `EntityPersister#multiload(Object[] ids,
+    SharedSessionContractImplementor session, MultiIdLoadOptions loadOptions)` to
+    `EntityPersister#lock(Object[] ids, EventSource session, MultiIdLoadOptions loadOptions)`.\n
+    Both EventSource and SharedSessionContractImplementor are contracts of `SessionImpl`
+    so they can be easily swapped.\n Methods `isEventSource` and `asEventSource` can
+    also be used to ease the transition, available on the `SharedSessionContractImplementor`
+    contract.\n "
   ruleID: hibernate-6.2-00010
   when:
     java.referenced:
@@ -27,9 +26,7 @@
       pattern: org.hibernate.persister.entity.EntityPersister.multiload*
 - category: mandatory
   customVariables: []
-  description: |-
-    Executable#afterDeserialize method has changed
-    This method has changed from `Executable#afterDeserialize(SharedSessionContractImplementor session)` to `Executable#afterDeserialize(EventSource eventSource)`.. Both EventSource and SharedSessionContractImplementor are contracts of `SessionImpl` so they can be easily swapped.. Methods `isEventSource` and `asEventSource` can also be used to ease the transition, available on the `SharedSessionContractImplementor` contract.
+  description: Executable#afterDeserialize method has changed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6.2+
@@ -41,11 +38,11 @@
   links:
   - title: Hibernate 6 migration guide - Changes in integration contracts (SPIs)
     url: https://docs.jboss.org/hibernate/orm/6.2/migration-guide/migration-guide.html#spi-afterDeserialize
-  message: This method has changed from `Executable#afterDeserialize(SharedSessionContractImplementor
-    session)` to `Executable#afterDeserialize(EventSource eventSource)`.. Both EventSource
+  message: "\n This method has changed from `Executable#afterDeserialize(SharedSessionContractImplementor
+    session)` to `Executable#afterDeserialize(EventSource eventSource)`.\n Both EventSource
     and SharedSessionContractImplementor are contracts of `SessionImpl` so they can
-    be easily swapped.. Methods `isEventSource` and `asEventSource` can also be used
-    to ease the transition, available on the `SharedSessionContractImplementor` contract.
+    be easily swapped.\n Methods `isEventSource` and `asEventSource` can also be used
+    to ease the transition, available on the `SharedSessionContractImplementor` contract.\n "
   ruleID: hibernate-6.2-00020
   when:
     java.referenced:
@@ -53,9 +50,7 @@
       pattern: org.hibernate.action.spi.Executable.afterDeserialize*
 - category: mandatory
   customVariables: []
-  description: |-
-    JdbcType#getJdbcRecommendedJavaTypeMapping() method has changed
-    The return type of `JdbcType#getJdbcRecommendedJavaTypeMapping()` was changed from `BasicJavaType` to `JavaType`.
+  description: JdbcType#getJdbcRecommendedJavaTypeMapping() method has changed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6.2+
@@ -67,8 +62,8 @@
   links:
   - title: Hibernate 6 migration guide - Changes in integration contracts (SPIs)
     url: https://docs.jboss.org/hibernate/orm/6.2/migration-guide/migration-guide.html#spi-JdbcType
-  message: The return type of `JdbcType#getJdbcRecommendedJavaTypeMapping()` was changed
-    from `BasicJavaType` to `JavaType`.
+  message: "\n The return type of `JdbcType#getJdbcRecommendedJavaTypeMapping()` was
+    changed from `BasicJavaType` to `JavaType`.\n "
   ruleID: hibernate-6.2-00030
   when:
     java.referenced:
@@ -79,9 +74,7 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: org.hibernate.cfg.(?P<className>(AbstractPropertyHolder|AccessType|AnnotatedClassType|AnnotationBinder|AttributeConversionInfo|AttributeConverterDefinition|BaselineSessionEventsListenerBuilder|BinderHelper|CannotForceNonNullableException|ClassPropertyHolder|CollectionPropertyHolder|ColumnsBuilder|ComponentPropertyHolder|EJB3DTDEntityResolver|Ejb3Column|Ejb3DiscriminatorColumn|Ejb3JoinColumn|ExternalSessionFactoryConfig|IndexColumn|InheritanceState|JPAIndexHolder|NotYetImplementedException|ObjectNameSource|PropertyContainer|PropertyData|PropertyHolder|PropertyHolderBuilder|PropertyInferredData|PropertyPreloadedData|Settings|ToOneBinder|UniqueConstraintHolder|WrappedInferredData|annotations.ArrayBinder|annotations.BagBinder|annotations.CollectionBinder|annotations.CustomizableColumns|annotations.EntityBinder|annotations.HCANNHelper|annotations.IdBagBinder|annotations.ListBinder|annotations.MapBinder|annotations.MapKeyColumnDelegator|annotations.MapKeyJoinColumnDelegator|annotations.NamedEntityGraphDefinition|annotations.NamedProcedureCallDefinition|annotations.Nullability|annotations.PrimitiveArrayBinder|annotations.PropertyBinder|annotations.QueryBinder|annotations.QueryHintDefinition|annotations.SetBinder|annotations.SimpleValueBinder|annotations.TableBinder|annotations.reflection.AttributeConverterDefinitionCollector|annotations.reflection.ClassLoaderAccessLazyImpl|annotations.reflection.PersistentAttributeFilter|annotations.reflection.internal.JPAXMLOverriddenAnnotationReader|annotations.reflection.internal.JPAXMLOverriddenMetadataProvider|annotations.reflection.internal.PropertyMappingElementCollector|annotations.reflection.internal.XMLContext|annotations.reflection.package-info|beanvalidation.ActivationContext|beanvalidation.BeanValidationEventListener|beanvalidation.BeanValidationIntegrator|beanvalidation.DuplicationStrategyImpl|beanvalidation.GroupsPerOperation|beanvalidation.HibernateTraversableResolver|beanvalidation.IntegrationException|beanvalidation.TypeSafeActivator|beanvalidation.ValidationMode))
-  description: |-
-    Class {class-name} within the org.hibernate.cfg package has been moved
-    This class within `org.hibernate.cfg` has been moved; see link for more information.
+  description: Class {class-name} within the org.hibernate.cfg package has been moved
   effort: 1
   labels:
   - konveyor.io/target=hibernate6.2+
@@ -93,8 +86,8 @@
   links:
   - title: Hibernate 6 migration guide - API/SPI/Internal distinction
     url: https://docs.jboss.org/hibernate/orm/6.2/migration-guide/migration-guide.html#api-internal-cfg
-  message: This class within `org.hibernate.cfg` has been moved; see link for more
-    information.
+  message: "\n This class within `org.hibernate.cfg` has been moved; see link for
+    more information.\n "
   ruleID: hibernate-6.2-00040
   when:
     java.referenced:
@@ -104,9 +97,8 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: org.hibernate.loader.(?P<className>(AbstractEntityJoinWalker|BasicLoader|CollectionAliases|ColumnEntityAliases|DefaultEntityAliases|EntityAliases|GeneratedCollectionAliases|JoinWalker|Loader|OuterJoinLoader|OuterJoinableAssociation|collection.BasicCollectionJoinWalker|collection.BasicCollectionLoader|collection.BatchingCollectionInitializer|collection.BatchingCollectionInitializerBuilder|collection.CollectionInitializer|collection.CollectionJoinWalker|collection.CollectionLoader|collection.DynamicBatchingCollectionInitializerBuilder|collection.LegacyBatchingCollectionInitializerBuilder|collection.OneToManyJoinWalker|collection.OneToManyLoader|collection.PaddedBatchingCollectionInitializerBuilder|collection.SubselectCollectionLoader|collection.SubselectOneToManyLoader|collection.plan.AbstractBatchingCollectionInitializerBuilder|collection.plan.AbstractLoadPlanBasedCollectionInitializer|collection.plan.BatchingCollectionInitializer|collection.plan.CollectionLoader|collection.plan.LegacyBatchingCollectionInitializerBuilder|criteria.ComponentCollectionCriteriaInfoProvider|criteria.CriteriaInfoProvider|criteria.CriteriaJoinWalker|criteria.CriteriaLoader|criteria.CriteriaQueryTranslator|criteria.EntityCriteriaInfoProvider|criteria.ScalarCollectionCriteriaInfoProvider|custom.CollectionFetchReturn|custom.CollectionReturn|custom.ColumnCollectionAliases|custom.ConstructorResultColumnProcessor|custom.ConstructorReturn|custom.CustomLoader|custom.CustomQuery|custom.EntityFetchReturn|custom.FetchReturn|custom.JdbcResultMetadata|custom.NonScalarResultColumnProcessor|custom.NonScalarReturn|custom.NonUniqueDiscoveredSqlAliasException|custom.ResultColumnProcessor|custom.ResultRowProcessor|custom.Return|custom.RootReturn|custom.ScalarResultColumnProcessor|custom.ScalarReturn|custom.sql.NamedParamBinder|custom.sql.PositionalParamBinder|custom.sql.SQLCustomQuery|custom.sql.SQLQueryParser|custom.sql.SQLQueryReturnProcessor|entity.AbstractEntityLoader|entity.BatchingEntityLoaderBuilder|entity.CacheEntityLoaderHelper|entity.CascadeEntityJoinWalker|entity.CascadeEntityLoader|entity.CollectionElementLoader|entity.EntityJoinWalker|entity.EntityLoader|entity.NaturalIdEntityJoinWalker|entity.NaturalIdType|entity.UniqueEntityLoader|entity.plan.AbstractBatchingEntityLoaderBuilder|entity.plan.AbstractLoadPlanBasedEntityLoader|entity.plan.BatchingEntityLoader|entity.plan.DynamicBatchingEntityLoader|entity.plan.DynamicBatchingEntityLoaderBuilder|entity.plan.EntityLoader|entity.plan.LegacyBatchingEntityLoaderBuilder|entity.plan.MultiEntityLoadingSupport|entity.plan.PaddedBatchingEntityLoader|entity.plan.PaddedBatchingEntityLoaderBuilder|hql.QueryLoader|plan.build.internal.AbstractEntityGraphVisitationStrategy|plan.build.internal.AbstractLoadPlanBuildingAssociationVisitationStrategy|plan.build.internal.CascadeStyleLoadPlanBuildingAssociationVisitationStrategy|plan.build.internal.FetchGraphLoadPlanBuildingStrategy|plan.build.internal.FetchStyleLoadPlanBuildingAssociationVisitationStrategy|plan.build.internal.LoadGraphLoadPlanBuildingStrategy|plan.build.internal.LoadPlanImpl|plan.build.internal.returns.AbstractAnyReference|plan.build.internal.returns.AbstractCollectionReference|plan.build.internal.returns.AbstractCompositeEntityIdentifierDescription|plan.build.internal.returns.AbstractCompositeFetch|plan.build.internal.returns.AbstractCompositeReference|plan.build.internal.returns.AbstractEntityReference|plan.build.internal.returns.AbstractExpandingFetchSource|plan.build.internal.returns.AnyAttributeFetchImpl|plan.build.internal.returns.BidirectionalEntityReferenceImpl|plan.build.internal.returns.CollectionAttributeFetchImpl|plan.build.internal.returns.CollectionFetchableElementAnyGraph|plan.build.internal.returns.CollectionFetchableElementCompositeGraph|plan.build.internal.returns.CollectionFetchableElementEntityGraph|plan.build.internal.returns.CollectionFetchableIndexAnyGraph|plan.build.internal.returns.CollectionFetchableIndexCompositeGraph|plan.build.internal.returns.CollectionFetchableIndexEntityGraph|plan.build.internal.returns.CollectionReturnImpl|plan.build.internal.returns.CompositeAttributeFetchImpl|plan.build.internal.returns.EncapsulatedEntityIdentifierDescription|plan.build.internal.returns.EntityAttributeFetchImpl|plan.build.internal.returns.EntityReturnImpl|plan.build.internal.returns.NestedCompositeAttributeFetchImpl|plan.build.internal.returns.NonEncapsulatedEntityIdentifierDescription|plan.build.internal.returns.ScalarReturnImpl|plan.build.internal.returns.SimpleEntityIdentifierDescriptionImpl|plan.build.internal.spaces.AbstractExpandingSourceQuerySpace|plan.build.internal.spaces.AbstractQuerySpace|plan.build.internal.spaces.CollectionQuerySpaceImpl|plan.build.internal.spaces.CompositePropertyMapping|plan.build.internal.spaces.CompositeQuerySpaceImpl|plan.build.internal.spaces.EntityQuerySpaceImpl|plan.build.internal.spaces.JoinHelper|plan.build.internal.spaces.JoinImpl|plan.build.internal.spaces.QuerySpaceHelper|plan.build.internal.spaces.QuerySpacesImpl|plan.build.spi.ExpandingCollectionQuerySpace|plan.build.spi.ExpandingCompositeQuerySpace|plan.build.spi.ExpandingEntityIdentifierDescription|plan.build.spi.ExpandingEntityQuerySpace|plan.build.spi.ExpandingFetchSource|plan.build.spi.ExpandingQuerySpace|plan.build.spi.ExpandingQuerySpaces|plan.build.spi.LoadPlanBuildingAssociationVisitationStrategy|plan.build.spi.LoadPlanBuildingContext|plan.build.spi.LoadPlanTreePrinter|plan.build.spi.MetamodelDrivenLoadPlanBuilder|plan.build.spi.QuerySpaceTreePrinter|plan.build.spi.ReturnGraphTreePrinter|plan.build.spi.TreePrinterHelper|plan.exec.internal.AbstractCollectionLoadQueryDetails|plan.exec.internal.AbstractLoadPlanBasedLoader|plan.exec.internal.AbstractLoadQueryDetails|plan.exec.internal.AliasResolutionContextImpl|plan.exec.internal.BasicCollectionLoadQueryDetails|plan.exec.internal.BatchingLoadQueryDetailsFactory|plan.exec.internal.CollectionReferenceAliasesImpl|plan.exec.internal.EntityLoadQueryDetails|plan.exec.internal.EntityReferenceAliasesImpl|plan.exec.internal.FetchStats|plan.exec.internal.LoadQueryJoinAndFetchProcessor|plan.exec.internal.OneToManyLoadQueryDetails|plan.exec.internal.RootHelper|plan.exec.process.internal.AbstractRowReader|plan.exec.process.internal.CollectionReferenceInitializerImpl|plan.exec.process.internal.CollectionReturnReader|plan.exec.process.internal.EntityReferenceInitializerImpl|plan.exec.process.internal.EntityReturnReader|plan.exec.process.internal.HydratedEntityRegistration|plan.exec.process.internal.ResultSetProcessingContextImpl|plan.exec.process.internal.ResultSetProcessorHelper|plan.exec.process.internal.ResultSetProcessorImpl|plan.exec.process.spi.CollectionReferenceInitializer|plan.exec.process.spi.EntityReferenceInitializer|plan.exec.process.spi.ReaderCollector|plan.exec.process.spi.ResultSetProcessingContext|plan.exec.process.spi.ResultSetProcessor|plan.exec.process.spi.ResultSetProcessorResolver|plan.exec.process.spi.ReturnReader|plan.exec.process.spi.RowReader|plan.exec.process.spi.ScrollableResultSetProcessor|plan.exec.query.internal.QueryBuildingParametersImpl|plan.exec.query.internal.SelectStatementBuilder|plan.exec.query.spi.NamedParameterContext|plan.exec.query.spi.QueryBuildingParameters|plan.exec.spi.AliasResolutionContext|plan.exec.spi.CollectionReferenceAliases|plan.exec.spi.EntityReferenceAliases|plan.exec.spi.LoadQueryDetails|plan.exec.spi.LockModeResolver|plan.spi.AnyAttributeFetch|plan.spi.AttributeFetch|plan.spi.BidirectionalEntityReference|plan.spi.CollectionAttributeFetch|plan.spi.CollectionFetchableElement|plan.spi.CollectionFetchableIndex|plan.spi.CollectionQuerySpace|plan.spi.CollectionReference|plan.spi.CollectionReturn|plan.spi.CompositeAttributeFetch|plan.spi.CompositeFetch|plan.spi.CompositeQuerySpace|plan.spi.EntityFetch|plan.spi.EntityIdentifierDescription|plan.spi.EntityQuerySpace|plan.spi.EntityReference|plan.spi.EntityReturn|plan.spi.Fetch|plan.spi.FetchSource|plan.spi.Join|plan.spi.JoinDefinedByMetadata|plan.spi.LoadPlan|plan.spi.QuerySpace|plan.spi.QuerySpaceUidNotRegisteredException|plan.spi.QuerySpaces|plan.spi.Return|plan.spi.ScalarReturn|spi.AfterLoadAction))
-  description: |-
-    Class {class-name} within the org.hibernate.loader package has been moved
-    This class within `org.hibernate.loader` has been moved; see link for more information.
+  description: Class {class-name} within the org.hibernate.loader package has been
+    moved
   effort: 1
   labels:
   - konveyor.io/target=hibernate6.2+
@@ -118,8 +110,8 @@
   links:
   - title: Hibernate 6 migration guide - API/SPI/Internal distinction
     url: https://docs.jboss.org/hibernate/orm/6.2/migration-guide/migration-guide.html#api-internal-loader
-  message: This class within `org.hibernate.loader` has been moved; see link for more
-    information.
+  message: "\n This class within `org.hibernate.loader` has been moved; see link for
+    more information.\n "
   ruleID: hibernate-6.2-00050
   when:
     java.referenced:
diff --git a/default/generated/eap8/111-hibernate-search-6.1.windup.yaml b/default/generated/eap8/111-hibernate-search-6.1.windup.yaml
index 68f846b6..8ead40ff 100644
--- a/default/generated/eap8/111-hibernate-search-6.1.windup.yaml
+++ b/default/generated/eap8/111-hibernate-search-6.1.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate Search 6.1.* now requires using Hibernate ORM versions from the 5.6.x family.
-    Hibernate Search 6.1.x now requires using Hibernate ORM versions from the 5.6.x family.
+  description: Hibernate Search 6.1.* now requires using Hibernate ORM versions from
+    the 5.6.x family.
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -35,9 +34,8 @@
           name: org.hibernate.search.hibernate-search-mapper-orm
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource has moved
-    `org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource` has been moved to `org.hibernate.search.engine.cfg.ConfigurationPropertySource`.
+  description: org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource has
+    moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -50,8 +48,8 @@
   links:
   - title: Hibernate Search 6.1 - Migration Guide from 6.0
     url: https://docs.jboss.org/hibernate/search/6.1/migration/html_single/#spi
-  message: '`org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource` has
-    been moved to `org.hibernate.search.engine.cfg.ConfigurationPropertySource`.'
+  message: "\n `org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource` has
+    been moved to `org.hibernate.search.engine.cfg.ConfigurationPropertySource`.\n "
   ruleID: hibernate-search-6.1-00020
   when:
     or:
@@ -59,9 +57,8 @@
         pattern: org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer has moved
-    `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer` moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurer` and is now an API.
+  description: org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer
+    has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -74,9 +71,9 @@
   links:
   - title: Hibernate Search 6.1 - Migration Guide from 6.0
     url: https://docs.jboss.org/hibernate/search/6.1/migration/html_single/#spi
-  message: '`org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer`
+  message: "\n `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer`
     moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurer`
-    and is now an API.'
+    and is now an API.\n "
   ruleID: hibernate-search-6.1-00030
   when:
     or:
@@ -84,9 +81,8 @@
         pattern: org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext has moved
-    `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext` moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurationContext` and is now an API.
+  description: org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext
+    has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -99,9 +95,9 @@
   links:
   - title: Hibernate Search 6.1 - Migration Guide from 6.0
     url: https://docs.jboss.org/hibernate/search/6.1/migration/html_single/#spi
-  message: '`org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext`
+  message: "\n `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext`
     moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurationContext`
-    and is now an API.'
+    and is now an API.\n "
   ruleID: hibernate-search-6.1-00040
   when:
     or:
@@ -109,9 +105,7 @@
         pattern: org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.engine.common.timing.spi.Deadline has moved
-    `org.hibernate.search.engine.common.timing.spi.Deadline` moved to `org.hibernate.search.engine.common.timing.Deadline` and is now API.
+  description: org.hibernate.search.engine.common.timing.spi.Deadline has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -133,9 +127,8 @@
         pattern: org.hibernate.search.engine.common.timing.spi.Deadline
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlanExecutionReport has moved
-    `org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlanExecutionReport` is now `org.hibernate.search.engine.backend.work.execution.spi.MultiEntityOperationExecutionReport`.
+  description: org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlanExecutionReport
+    has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -157,9 +150,7 @@
         pattern: org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlanExecutionReport
 - category: mandatory
   customVariables: []
-  description: |-
-    URLEncodedString#fromJsonString was removed
-    `URLEncodedString#fromJsonString` must be removed.
+  description: URLEncodedString#fromJsonString was removed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -181,9 +172,7 @@
         pattern: org.hibernate.search.backend.elasticsearch.util.spi.URLEncodedString.fromJSon*
 - category: mandatory
   customVariables: []
-  description: |-
-    FieldPaths#absolutize(String, String, String) has been removed
-    `FieldPaths#absolutize(String, String, String)` must be removed.
+  description: FieldPaths#absolutize(String, String, String) has been removed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -206,9 +195,7 @@
           java.lang.String, java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    IndexManagerImplementor#createIndexingPlan has changed
-    `IndexManagerImplementor#createIndexingPlan` no longer expects an `EntityReferenceFactory` parameter.
+  description: IndexManagerImplementor#createIndexingPlan has changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -231,9 +218,7 @@
         pattern: org.hibernate.search.engine.backend.index.spi.IndexManagerImplementor.createIndexingPlan*
 - category: mandatory
   customVariables: []
-  description: |-
-    IndexIndexingPlan#executeAndReport has changed
-    `IndexIndexingPlan#executeAndReport` now expects an `EntityReferenceFactory` parameter.
+  description: IndexIndexingPlan#executeAndReport has changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -256,9 +241,7 @@
         pattern: org.hibernate.search.engine.backend.work.execution.spi.IndexIndexingPlan.executeAndReport*
 - category: mandatory
   customVariables: []
-  description: |-
-    IndexSchemaObjectNodeBuilder has changed
-    `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaObjectNodeBuilder` is now `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexCompositeNodeBuilder`
+  description: IndexSchemaObjectNodeBuilder has changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -280,9 +263,7 @@
         pattern: org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaObjectNodeBuilder
 - category: mandatory
   customVariables: []
-  description: |-
-    IndexSchemaObjectNodeBuilder has changed
-    `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaObjectFieldNodeBuilder` is now `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexObjectFieldBuilder`
+  description: IndexSchemaObjectNodeBuilder has changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -304,9 +285,7 @@
         pattern: org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaObjectFieldNodeBuilder
 - category: mandatory
   customVariables: []
-  description: |-
-    IndexSchemaObjectNodeBuilder has changed
-    `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaRootNodeBuilder` is now `org.hibernate.search.engine.backend.document.model.dsl.spi.IndexRootBuilder`
+  description: IndexSchemaObjectNodeBuilder has changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -328,9 +307,7 @@
         pattern: org.hibernate.search.engine.backend.document.model.dsl.spi.IndexSchemaObjectFieldNodeBuilder
 - category: optional
   customVariables: []
-  description: |-
-    FromDocumentFieldValueConverter has been deprecated
-    `FromDocumentFieldValueConverter` has been deprecated, implement `FromDocumentValueConverter` instead.
+  description: FromDocumentFieldValueConverter has been deprecated
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -352,9 +329,7 @@
       pattern: org.hibernate.search.engine.backend.types.converter.FromDocumentFieldValueConverter
 - category: optional
   customVariables: []
-  description: |-
-    ToDocumentFieldValueConverter has been deprecated
-    `ToDocumentFieldValueConverter` has been deprecated, implement `ToDocumentValueConverter` instead.
+  description: ToDocumentFieldValueConverter has been deprecated
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -376,9 +351,7 @@
       pattern: org.hibernate.search.engine.backend.types.converter.ToDocumentFieldValueConverter
 - category: optional
   customVariables: []
-  description: |-
-    MassIndexingFailureHandler has been deprecated
-    `org.hibernate.search.mapper.orm.massindexing.MassIndexingFailureHandler` has been deprecated, implement `org.hibernate.search.mapper.pojo.massindexing.MassIndexingFailureHandler` instead.
+  description: MassIndexingFailureHandler has been deprecated
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -400,9 +373,7 @@
       pattern: org.hibernate.search.mapper.orm.massindexing.MassIndexingFailureHandler
 - category: optional
   customVariables: []
-  description: |-
-    MassIndexingMonitor has been deprecated
-    `org.hibernate.search.mapper.orm.massindexing.MassIndexingMonitor` has been deprecated, implement `org.hibernate.search.mapper.pojo.massindexing.MassIndexingMonitor` instead.
+  description: MassIndexingMonitor has been deprecated
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -424,9 +395,7 @@
       pattern: org.hibernate.search.mapper.orm.massindexing.MassIndexingMonitor
 - category: optional
   customVariables: []
-  description: |-
-    Deprecated configuration settings
-    Property has been deprecated: use the new configuration property that accepts `true`/`false` instead. See `HibernateOrmMapperSettings#AUTOMATIC_INDEXING_ENABLED`.
+  description: Deprecated configuration settings
   effort: 1
   labels:
   - konveyor.io/target=eap8+
diff --git a/default/generated/eap8/112-hibernate-search.windup.yaml b/default/generated/eap8/112-hibernate-search.windup.yaml
index 67e5948b..a4c7fb73 100644
--- a/default/generated/eap8/112-hibernate-search.windup.yaml
+++ b/default/generated/eap8/112-hibernate-search.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Constants for Hibernate Search configuration property keys have changed
-    In Hibernate Search 6, constants are provided through classes whose name ends with Settings. Follow link for more details.
+  description: Constants for Hibernate Search configuration property keys have changed
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -26,9 +24,7 @@
         pattern: org.hibernate.search.elasticsearch.cfg.ElasticsearchEnvironment
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.analyzer not available anymore
-    This property is not available anymore. To override the default analyzer, define a custom analyzer named default. See link.
+  description: Property hibernate.search.analyzer not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -52,9 +48,7 @@
       pattern: hibernate.search.analyzer
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.autoregister_listeners not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.enabled`.
+  description: Property hibernate.search.autoregister_listeners not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -76,9 +70,7 @@
       pattern: hibernate.search.autoregister_listeners
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.batch_size not available anymore
-    No direct equivalent in Hibernate Search 6. This property was not documented in Hibernate Search 5. For the specific use case of batch processes, know that upon Hibernate ORM session flushes,. Hibernate Search 6 will automatically turn entities to documents and hold documents in memory until the transaction commit.. See links for more information.
+  description: Property hibernate.search.batch_size not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -93,11 +85,11 @@
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
   - title: 'Hibernate Search 6: Manual Indexing'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#manual-index-changes
-  message: No direct equivalent in Hibernate Search 6. This property was not documented
+  message: "\n No direct equivalent in Hibernate Search 6. This property was not documented
     in Hibernate Search 5. For the specific use case of batch processes, know that
-    upon Hibernate ORM session flushes,. Hibernate Search 6 will automatically turn
-    entities to documents and hold documents in memory until the transaction commit..
-    See links for more information.
+    upon Hibernate ORM session flushes,\n Hibernate Search 6 will automatically turn
+    entities to documents and hold documents in memory until the transaction commit.\n\n
+    See links for more information.\n "
   ruleID: hibernate-search-00040
   when:
     builtin.filecontent:
@@ -105,9 +97,8 @@
       pattern: hibernate.search.batch_size
 - category: mandatory
   customVariables: []
-  description: |-
-    The syntax for configuring AWS authentication changed in Hibernate Search 6.
-    AWS configuration properties must change from `hibernate.search.default.elasticsearch.aws.*` to `hibernate.search.backend.aws.*`.. See link for more information about credential configuration changes.
+  description: The syntax for configuring AWS authentication changed in Hibernate
+    Search 6.
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -120,9 +111,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: AWS configuration properties must change from `hibernate.search.default.elasticsearch.aws.*`
-    to `hibernate.search.backend.aws.*`.. See link for more information about credential
-    configuration changes.
+  message: "\n AWS configuration properties must change from `hibernate.search.default.elasticsearch.aws.*`
+    to `hibernate.search.backend.aws.*`.\n See link for more information about credential
+    configuration changes.\n "
   ruleID: hibernate-search-00050
   when:
     builtin.filecontent:
@@ -130,9 +121,7 @@
       pattern: hibernate.search.default.elasticsearch.aws..*
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.batch_size not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.connection_timeout`.
+  description: Property hibernate.search.batch_size not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -154,9 +143,8 @@
       pattern: hibernate.search.default.elasticsearch.connection_timeout
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.discovery.default_scheme not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.default.elasticsearch.discovery.default_scheme`.
+  description: Property hibernate.search.default.elasticsearch.discovery.default_scheme
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -178,9 +166,8 @@
       pattern: hibernate.search.default.elasticsearch.discovery.default_scheme
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.discovery.enabled not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.discovery.enabled`.
+  description: Property hibernate.search.default.elasticsearch.discovery.enabled not
+    available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -202,9 +189,8 @@
       pattern: hibernate.search.default.elasticsearch.discovery.enabled
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.discovery.refresh_interval not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.discovery.refresh_interval`.
+  description: Property hibernate.search.default.elasticsearch.discovery.refresh_interval
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -226,9 +212,8 @@
       pattern: hibernate.search.default.elasticsearch.discovery.refresh_interval
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.elasticsearch.dynamic_mapping not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.dynamic_mapping` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.dynamic_mapping` (per-index).
+  description: Property hibernate.search.*.elasticsearch.dynamic_mapping not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -241,9 +226,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
-    Search 6 equivalent: `hibernate.search.backend.dynamic_mapping` (for global defaults).
-    or `hibernate.search.backend.indexes.<index-name>.dynamic_mapping` (per-index).'
+  message: "This property is not available anymore. Substitute with the Hibernate
+    Search 6 equivalent: `hibernate.search.backend.dynamic_mapping` (for global defaults)\n
+    or `hibernate.search.backend.indexes.<index-name>.dynamic_mapping` (per-index).\n "
   ruleID: hibernate-search-00100
   when:
     builtin.filecontent:
@@ -251,9 +236,8 @@
       pattern: hibernate.search..*.elasticsearch.dynamic_mapping
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.host not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.uris`.
+  description: Property hibernate.search.default.elasticsearch.host not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -275,9 +259,8 @@
       pattern: hibernate.search.default.elasticsearch.host
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.elasticsearch.index_management_wait_timeout not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.schema_management.minimal_required_status_wait_timeout` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status_wait_timeout` (per-index).
+  description: Property hibernate.search.*.elasticsearch.index_management_wait_timeout
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -290,10 +273,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.schema_management.minimal_required_status_wait_timeout`
-    (for global defaults). or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status_wait_timeout`
-    (per-index).'
+    (for global defaults)\n or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status_wait_timeout`
+    (per-index).\n "
   ruleID: hibernate-search-00110
   when:
     builtin.filecontent:
@@ -301,9 +284,8 @@
       pattern: hibernate.search..*.elasticsearch.index_management_wait_timeout
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.elasticsearch.index_schema_management_strategy not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.schema_management.strategy` (for global defaults). There is no equivalent for per-index configuration.
+  description: Property hibernate.search.*.elasticsearch.index_schema_management_strategy
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -326,9 +308,8 @@
       pattern: hibernate.search..*.elasticsearch.index_schema_management_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.max_total_connection_per_route not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.max_connections_per_route`.
+  description: Property hibernate.search.default.elasticsearch.max_total_connection_per_route
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -350,9 +331,8 @@
       pattern: hibernate.search.default.elasticsearch.max_total_connection_per_route
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.max_total_connection not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.max_connections`.
+  description: Property hibernate.search.default.elasticsearch.max_total_connection
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -374,9 +354,8 @@
       pattern: hibernate.search.default.elasticsearch.max_total_connection
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.password not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.password`.
+  description: Property hibernate.search.default.elasticsearch.password not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -398,9 +377,8 @@
       pattern: hibernate.search.default.elasticsearch.password
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.path_prefix not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.path_prefix`.
+  description: Property hibernate.search.default.elasticsearch.path_prefix not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -422,9 +400,8 @@
       pattern: hibernate.search.default.elasticsearch.path_prefix
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.read_timeout not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.read_timeout`.
+  description: Property hibernate.search.default.elasticsearch.read_timeout not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -446,9 +423,8 @@
       pattern: hibernate.search.default.elasticsearch.read_timeout
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.elasticsearch.refresh_after_write not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.automatic_indexing.synchronization.strategy` (for global defaults). There is no equivalent for per-index configuration.
+  description: Property hibernate.search.*.elasticsearch.refresh_after_write not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -471,9 +447,8 @@
       pattern: hibernate.search..*.elasticsearch.refresh_after_write
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.request_timeout not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.request_timeout`.
+  description: Property hibernate.search.default.elasticsearch.request_timeout not
+    available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -495,9 +470,8 @@
       pattern: hibernate.search.default.elasticsearch.request_timeout
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.elasticsearch.required_index_status not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.schema_management.minimal_required_status` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status` (per-index).
+  description: Property hibernate.search.*.elasticsearch.required_index_status not
+    available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -510,10 +484,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.schema_management.minimal_required_status`
-    (for global defaults). or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status`
-    (per-index).'
+    (for global defaults)\n or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status`
+    (per-index).\n "
   ruleID: hibernate-search-00210
   when:
     builtin.filecontent:
@@ -521,9 +495,8 @@
       pattern: hibernate.search..*.elasticsearch.required_index_status
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default.elasticsearch.username not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.username`.
+  description: Property hibernate.search.default.elasticsearch.username not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -545,9 +518,7 @@
       pattern: hibernate.search.default.elasticsearch.username
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.exclusive_index_use not available anymore
-    This property is not available anymore. There is no substitute in Hibernate Search 6.
+  description: Property hibernate.search.*.exclusive_index_use not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -569,9 +540,7 @@
       pattern: hibernate.search..*.exclusive_index_use
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.directory_provider not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.directory.type` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.directory.type` (per-index).
+  description: Property hibernate.search.*.directory_provider not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -584,9 +553,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
-    Search 6 equivalent: `hibernate.search.backend.directory.type` (for global defaults).
-    or `hibernate.search.backend.indexes.<index-name>.directory.type` (per-index).'
+  message: "This property is not available anymore. Substitute with the Hibernate
+    Search 6 equivalent: `hibernate.search.backend.directory.type` (for global defaults)\n
+    or `hibernate.search.backend.indexes.<index-name>.directory.type` (per-index).\n "
   ruleID: hibernate-search-00240
   when:
     builtin.filecontent:
@@ -594,9 +563,7 @@
       pattern: hibernate.search..*.directory_provider
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.indexBase not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.directory.root` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.directory.root` (per-index).
+  description: Property hibernate.search.*.indexBase not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -609,9 +576,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
-    Search 6 equivalent: `hibernate.search.backend.directory.root` (for global defaults).
-    or `hibernate.search.backend.indexes.<index-name>.directory.root` (per-index).'
+  message: "This property is not available anymore. Substitute with the Hibernate
+    Search 6 equivalent: `hibernate.search.backend.directory.root` (for global defaults)\n
+    or `hibernate.search.backend.indexes.<index-name>.directory.root` (per-index).\n "
   ruleID: hibernate-search-00250
   when:
     builtin.filecontent:
@@ -619,9 +586,7 @@
       pattern: hibernate.search..*.indexBase
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.indexName not available anymore
-    No equivalent in Hibernate Search 6. The name of an index can still be customized in the mapping, using. @Indexed(name = ...), or with the programmatic equivalent.
+  description: Property hibernate.search.*.indexName not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -634,9 +599,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: No equivalent in Hibernate Search 6. The name of an index can still be
-    customized in the mapping, using. @Indexed(name = ...), or with the programmatic
-    equivalent.
+  message: "No equivalent in Hibernate Search 6. The name of an index can still be
+    customized in the mapping, using\n @Indexed(name = ...), or with the programmatic
+    equivalent.\n "
   ruleID: hibernate-search-00260
   when:
     builtin.filecontent:
@@ -644,9 +609,7 @@
       pattern: hibernate.search..*.indexName
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.index_flush_interval not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.io.commit_interval` (for global defaults). or `hibernate.search.backend.indexes.<index name>.io.commit_interval` (per-index).
+  description: Property hibernate.search.*.index_flush_interval not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -659,10 +622,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.io.commit_interval` (for global
-    defaults). or `hibernate.search.backend.indexes.<index name>.io.commit_interval`
-    (per-index).'
+    defaults)\n or `hibernate.search.backend.indexes.<index name>.io.commit_interval`
+    (per-index).\n "
   ruleID: hibernate-search-00270
   when:
     builtin.filecontent:
@@ -670,9 +633,7 @@
       pattern: hibernate.search..*.index_flush_interval
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.index_metadata_complete not available anymore
-    No equivalent in Hibernate Search 6. This property was not documented in Hibernate Search 5.
+  description: Property hibernate.search.*.index_metadata_complete not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -694,9 +655,7 @@
       pattern: hibernate.search..*.index_metadata_complete
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.indexmanager not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.type` (for global defaults).. No equivalent for the per-index configuration. See link for more information.
+  description: Property hibernate.search.*.indexmanager not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -709,9 +668,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
-    Search 6 equivalent: `hibernate.search.backend.type` (for global defaults).. No
-    equivalent for the per-index configuration. See link for more information.'
+  message: "This property is not available anymore. Substitute with the Hibernate
+    Search 6 equivalent: `hibernate.search.backend.type` (for global defaults).\n
+    No equivalent for the per-index configuration. See link for more information.\n "
   ruleID: hibernate-search-00290
   when:
     builtin.filecontent:
@@ -719,9 +678,7 @@
       pattern: hibernate.search..*.indexmanager
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.indexwriter not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.io.writer` or `hibernate.search.backend.io.merge` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.io.writer` or `hibernate.search.backend.indexes.<index-name>.io.merge` (per-index).
+  description: Property hibernate.search.*.indexwriter not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -734,10 +691,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.io.writer` or `hibernate.search.backend.io.merge`
-    (for global defaults). or `hibernate.search.backend.indexes.<index-name>.io.writer`
-    or `hibernate.search.backend.indexes.<index-name>.io.merge` (per-index).'
+    (for global defaults)\n or `hibernate.search.backend.indexes.<index-name>.io.writer`
+    or `hibernate.search.backend.indexes.<index-name>.io.merge` (per-index).\n "
   ruleID: hibernate-search-00300
   when:
     builtin.filecontent:
@@ -745,9 +702,7 @@
       pattern: hibernate.search..*.indexwriter
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.locking_strategy not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.directory.locking.strategy` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.directory.locking.strategy` (per-index).
+  description: Property hibernate.search.*.locking_strategy not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -762,10 +717,10 @@
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
   - title: Hibernate Search 6 - Locking Strategy
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-configuration-directory-locking-strategy
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.directory.locking.strategy` (for
-    global defaults). or `hibernate.search.backend.indexes.<index-name>.directory.locking.strategy`
-    (per-index).'
+    global defaults)\n or `hibernate.search.backend.indexes.<index-name>.directory.locking.strategy`
+    (per-index).\n "
   ruleID: hibernate-search-00310
   when:
     builtin.filecontent:
@@ -773,9 +728,7 @@
       pattern: hibernate.search..*.locking_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.max_queue_length not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.indexing.queue_size` (for global defaults). or `hibernate.search.backend.indexes.<index-name>.indexing.queue_size` (per-index).
+  description: Property hibernate.search.*.max_queue_length not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -788,10 +741,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Configuration Property Reference'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
-  message: 'This property is not available anymore. Substitute with the Hibernate
+  message: "This property is not available anymore. Substitute with the Hibernate
     Search 6 equivalent: `hibernate.search.backend.indexing.queue_size` (for global
-    defaults). or `hibernate.search.backend.indexes.<index-name>.indexing.queue_size`
-    (per-index).'
+    defaults)\n or `hibernate.search.backend.indexes.<index-name>.indexing.queue_size`
+    (per-index).\n "
   ruleID: hibernate-search-00320
   when:
     builtin.filecontent:
@@ -799,9 +752,7 @@
       pattern: hibernate.search..*.max_queue_length
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.default_null_token not available anymore
-    No equivalent in Hibernate Search 6. In most cases, you won’t need to use indexNullAs anymore. Where indexNullAs is still needed, define the token explicitly for each index field. See links for more info.
+  description: Property hibernate.search.default_null_token not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -826,9 +777,7 @@
       pattern: hibernate.search.default_null_token
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.reader not available anymore
-    No direct equivalent in Hibernate Search 6. To enable async reader refresh, set hibernate.search.backend.io.refresh_interval or hibernate.search.backend.indexes.<index-name>.io.refresh_interval. to a strictly positive value (in milliseconds). See links for more information. Custom reader strategies are no longer supported.
+  description: Property hibernate.search.*.reader not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -843,10 +792,10 @@
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#configuration-property-reference
   - title: Hibernate Search 6 - Reference Documentation
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-io-refresh
-  message: No direct equivalent in Hibernate Search 6. To enable async reader refresh,
-    set hibernate.search.backend.io.refresh_interval or hibernate.search.backend.indexes.<index-name>.io.refresh_interval.
+  message: "\n No direct equivalent in Hibernate Search 6. To enable async reader
+    refresh, set hibernate.search.backend.io.refresh_interval or hibernate.search.backend.indexes.<index-name>.io.refresh_interval\n
     to a strictly positive value (in milliseconds). See links for more information.
-    Custom reader strategies are no longer supported.
+    Custom reader strategies are no longer supported.\n "
   ruleID: hibernate-search-00340
   when:
     builtin.filecontent:
@@ -854,9 +803,7 @@
       pattern: hibernate.search..*.reader
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.retry_marker_lookup not available anymore
-    This property is not available anymore. The filesystem-slave directory provider is no longer supported. See links for more information.
+  description: Property hibernate.search.*.retry_marker_lookup not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -880,9 +827,7 @@
       pattern: hibernate.search..*.retry_marker_lookup
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.sharding_strategy not available anymore
-    This property is not available anymore. Sharding is configured differently. See links for more information.
+  description: Property hibernate.search.*.sharding_strategy not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -906,9 +851,7 @@
       pattern: hibernate.search..*.sharding_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.similarity not available anymore
-    This property is not available anymore. The similarity is configured through the analysis configurer. See links for more information.
+  description: Property hibernate.search.*.similarity not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -932,9 +875,7 @@
       pattern: hibernate.search..*.similarity
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.worker.backend not available anymore
-    This property is not available anymore. The JMS/JGroups backends are no longer supported. See links for more information.
+  description: Property hibernate.search.*.worker.backend not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -958,9 +899,7 @@
       pattern: hibernate.search..*.worker.backend
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.worker.execution not available anymore
-    This property is not available anymore. Setting hibernate.search.automatic_indexing.synchronization.strategy to async or sync will produce results similar to setting hibernate.search.<index-name>.worker.execution to the same value. See links for more information.
+  description: Property hibernate.search.*.worker.execution not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -985,9 +924,7 @@
       pattern: hibernate.search..*.worker.execution
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.*.worker not available anymore
-    This property is not available anymore. The JMS/JGroups backends are no longer supported. See links for more information.
+  description: Property hibernate.search.*.worker not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1011,9 +948,8 @@
       pattern: hibernate.search..*.worker
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.elasticsearch.analysis_definition_provider not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.analysis.configurer`.
+  description: Property hibernate.search.elasticsearch.analysis_definition_provider
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1037,9 +973,8 @@
       pattern: hibernate.search.elasticsearch.analysis_definition_provider
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.elasticsearch.log.json_pretty_printing not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.log.json_pretty_printing`.
+  description: Property hibernate.search.elasticsearch.log.json_pretty_printing not
+    available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1061,9 +996,8 @@
       pattern: hibernate.search.elasticsearch.log.json_pretty_printing
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.elasticsearch.scroll_backtracking_window_size not available anymore
-    This property is not available anymore: scrolling is forward-only. See links for more information.
+  description: Property hibernate.search.elasticsearch.scroll_backtracking_window_size
+    not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1087,9 +1021,8 @@
       pattern: hibernate.search.elasticsearch.scroll_backtracking_window_size
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.elasticsearch.scroll_fetch_size not available anymore
-    This property is not available anymore. When using Hibernate Search APIs, the "chunk size" is an argument to the scroll method. When using the Hibernate ORM or JPA adapters, the "chunk size" is set to the same value as the fetch size. See links for more information.
+  description: Property hibernate.search.elasticsearch.scroll_fetch_size not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1115,9 +1048,8 @@
       pattern: hibernate.search.elasticsearch.scroll_fetch_size
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.elasticsearch.scroll_timeout not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.scroll_timeout`.
+  description: Property hibernate.search.elasticsearch.scroll_timeout not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1139,9 +1071,7 @@
       pattern: hibernate.search.elasticsearch.scroll_timeout
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.enable_dirty_check not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.automatic_indexing.enable_dirty_check`.
+  description: Property hibernate.search.enable_dirty_check not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1163,9 +1093,7 @@
       pattern: hibernate.search.enable_dirty_check
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.error_handler not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.background_failure_handler`. A different interface should be implemented: see links for more information.
+  description: Property hibernate.search.error_handler not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1190,9 +1118,8 @@
       pattern: hibernate.search.error_handler
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.filter.cache_docidresults.size not available anymore
-    This property is not available anymore. There's no equivalent for Hibernate Search 6. If you need caching for some of your Lucene queries, consider upgrading directly to Hibernate Search 6.1, which provides configurable Low-level hit caching. See link for more information.
+  description: Property hibernate.search.filter.cache_docidresults.size not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1220,9 +1147,7 @@
       pattern: hibernate.search.filter.cache_docidresults.size
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.filter.cache_strategy not available anymore
-    This property is not available anymore. There's no equivalent for Hibernate Search 6. If you need caching for some of your Lucene queries, consider upgrading directly to Hibernate Search 6.1, which provides configurable Low-level hit caching. See link for more information.
+  description: Property hibernate.search.filter.cache_strategy not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1250,9 +1175,7 @@
       pattern: hibernate.search.filter.cache_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.generate_statistics not available anymore
-    This property is not available anymore. There's no equivalent for Hibernate Search 6. No equivalent in Hibernate Search 6. See links for more information.
+  description: Property hibernate.search.generate_statistics not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1276,9 +1199,7 @@
       pattern: hibernate.search.generate_statistics
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.index_uninverting_allowed not available anymore
-    Index uninverting was deprecated in Hibernate Search 5 due to poor performance and is no longer allowed. All index fields that you want to sort on must be marked as sortable. See links for more information.
+  description: Property hibernate.search.index_uninverting_allowed not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1303,9 +1224,7 @@
       pattern: hibernate.search.index_uninverting_allowed
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.indexing_strategy not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.automatic_indexing.strategy`. Set to `none` to get the equivalent of `hibernate.search.indexing_strategy = manual` in Hibernate Search 5.
+  description: Property hibernate.search.indexing_strategy not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1329,9 +1248,7 @@
       pattern: hibernate.search.indexing_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.jmx_bean_suffix not available anymore
-    This property is not available anymore. See links for more information.
+  description: Property hibernate.search.jmx_bean_suffix not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1354,9 +1271,7 @@
       pattern: hibernate.search.jmx_bean_suffix
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.jmx_enabled not available anymore
-    This property is not available anymore. See links for more information.
+  description: Property hibernate.search.jmx_enabled not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1379,9 +1294,7 @@
       pattern: hibernate.search.jmx_enabled
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.error_handler not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.analysis.configurer`. A different interface should be implemented: see links for more information.
+  description: Property hibernate.search.error_handler not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1406,9 +1319,7 @@
       pattern: hibernate.search.lucene.analysis_definition_provider
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.lucene_version not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.backend.lucene_version`.
+  description: Property hibernate.search.lucene_version not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1430,9 +1341,7 @@
       pattern: hibernate.search.lucene_version
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.model_mapping not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.mapping.configurer`. A different interface should be implemented: see links for more information.
+  description: Property hibernate.search.model_mapping not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1457,9 +1366,8 @@
       pattern: hibernate.search.model_mapping
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.query.database_retrieval_method not available anymore
-    This property is no available anymore. No equivalent in Hibernate Search 6: entities are always loaded with a query.
+  description: Property hibernate.search.query.database_retrieval_method not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1481,9 +1389,8 @@
       pattern: hibernate.search.query.database_retrieval_method
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.query.object_lookup_method not available anymore
-    This property is not available anymore. Substitute with the Hibernate Search 6 equivalent: `hibernate.search.query.loading.cache_lookup.strategy`.
+  description: Property hibernate.search.query.object_lookup_method not available
+    anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1507,9 +1414,7 @@
       pattern: hibernate.search.query.object_lookup_method
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.similarity not available anymore
-    This property is not available anymore. There is no direct equivalent in Hibernate Search 6: the similarity is configured through the analysis configurer. The default similarity changed when this property is not configured: see links for more information.
+  description: Property hibernate.search.similarity not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1535,9 +1440,7 @@
       pattern: hibernate.search.similarity
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.search.worker.* not available anymore
-    This property is not available anymore. No equivalent to the concept of "worker" in Hibernate Search 6:. automatic indexing is always performed on transaction commit or, when there is no transaction, on session flush.. Also, transactional backends, for example the JMS backend, are no longer supported. See links for more information.
+  description: Property hibernate.search.worker.* not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1554,11 +1457,10 @@
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#mapper-orm-indexing-automatic-concepts
   - title: 'Hibernate Search 5 to 6 Migration: Backends'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#search-5-backends
-  message: This property is not available anymore. No equivalent to the concept of
-    "worker" in Hibernate Search 6:. automatic indexing is always performed on transaction
-    commit or, when there is no transaction, on session flush.. Also, transactional
-    backends, for example the JMS backend, are no longer supported. See links for
-    more information.
+  message: |-
+    This property is not available anymore. No equivalent to the concept of "worker" in Hibernate Search 6:
+     automatic indexing is always performed on transaction commit or, when there is no transaction, on session flush.
+     Also, transactional backends, for example the JMS backend, are no longer supported. See links for more information.
   ruleID: hibernate-search-00610
   when:
     builtin.filecontent:
@@ -1566,9 +1468,7 @@
       pattern: hibernate.search.worker..*
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Analyzer not available anymore
-    In Hibernate Search 5, it was possible to apply an @Analyzer annotation to a class or property, so that the corresponding analyzer would be used by default for any index field declared in this scope.. There is no equivalent to that feature in Hibernate Search 6: all fields must specify their analyzer explicitly using @FullTextField(analyzer = "myAnalyzer"), or rely on the (global) default analyzer.. Also, still in Hibernate Search 5, @Analyzer could point directly to a class extending org.apache.lucene.analysis.Analyzer, for example with @Analyzer(impl = StandardAnalyzer.class).. This is no longer possible: analyzers are now always referenced by their name. However, you can assign a name to a given analyzer instance using the Lucene analysis configurer.
+  description: Annotation @Analyzer not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1581,16 +1481,16 @@
   links:
   - title: 'Hibernate Search 6 Reference: Custom analyzers and normalizers'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-analysis-analyzers
-  message: 'In Hibernate Search 5, it was possible to apply an @Analyzer annotation
+  message: "\n In Hibernate Search 5, it was possible to apply an @Analyzer annotation
     to a class or property, so that the corresponding analyzer would be used by default
-    for any index field declared in this scope.. There is no equivalent to that feature
+    for any index field declared in this scope.\n There is no equivalent to that feature
     in Hibernate Search 6: all fields must specify their analyzer explicitly using
-    @FullTextField(analyzer = "myAnalyzer"), or rely on the (global) default analyzer..
+    @FullTextField(analyzer = \"myAnalyzer\"), or rely on the (global) default analyzer.\n
     Also, still in Hibernate Search 5, @Analyzer could point directly to a class extending
-    org.apache.lucene.analysis.Analyzer, for example with @Analyzer(impl = StandardAnalyzer.class)..
+    org.apache.lucene.analysis.Analyzer, for example with @Analyzer(impl = StandardAnalyzer.class).\n
     This is no longer possible: analyzers are now always referenced by their name.
     However, you can assign a name to a given analyzer instance using the Lucene analysis
-    configurer.'
+    configurer.\n "
   ruleID: hibernate-search-00620
   when:
     java.referenced:
@@ -1598,9 +1498,7 @@
       pattern: org.hibernate.search.annotations.Analyzer
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @AnalyzerDef(s) not available anymore
-    Annotation-based analyzer definitions are no longer supported.. Instead, implement an analysis configurer: see links for Lucene and Elasticsearch replacements.
+  description: Annotation @AnalyzerDef(s) not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1615,8 +1513,8 @@
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-analysis-analyzers
   - title: 'Hibernate Search 6 Reference: Elasticsearch analyzers and normalizers'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-elasticsearch-analysis-analyzers
-  message: 'Annotation-based analyzer definitions are no longer supported.. Instead,
-    implement an analysis configurer: see links for Lucene and Elasticsearch replacements.'
+  message: "\n Annotation-based analyzer definitions are no longer supported.\n Instead,
+    implement an analysis configurer: see links for Lucene and Elasticsearch replacements.\n "
   ruleID: hibernate-search-00630
   when:
     or:
@@ -1628,9 +1526,7 @@
         pattern: org.hibernate.search.annotations.AnalyzerDefs
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @AnalyzerDiscriminator not available anymore
-    `@AnalyzerDiscriminator` has no direct equivalent in Hibernate Search 6: the analyzer assigned to each field is static and cannot change at runtime, because that results in unreliable matches and in scoring issues.. Instead, Hibernate Search 6 allows declaring multiple index fields for a single property, and putting the content of that property in a different field depending on a discriminator. Then, when searching, you can target all fields at once.. See link for more information.
+  description: Annotation @AnalyzerDiscriminator not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1643,12 +1539,12 @@
   links:
   - title: 'Hibernate Search 6 Reference: Mapping multiple alternatives'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#mapper-orm-alternatives
-  message: '`@AnalyzerDiscriminator` has no direct equivalent in Hibernate Search
+  message: "\n `@AnalyzerDiscriminator` has no direct equivalent in Hibernate Search
     6: the analyzer assigned to each field is static and cannot change at runtime,
-    because that results in unreliable matches and in scoring issues.. Instead, Hibernate
+    because that results in unreliable matches and in scoring issues.\n Instead, Hibernate
     Search 6 allows declaring multiple index fields for a single property, and putting
     the content of that property in a different field depending on a discriminator.
-    Then, when searching, you can target all fields at once.. See link for more information.'
+    Then, when searching, you can target all fields at once.\n See link for more information.\n "
   ruleID: hibernate-search-00640
   when:
     java.referenced:
@@ -1656,9 +1552,7 @@
       pattern: org.hibernate.search.annotations.AnalyzerDiscriminator
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Boost not available anymore
-    Index-time boosting was deprecated in Hibernate Search 5. It is no longer available in Hibernate Search 6.. Instead, rely on query-time boosting. See link for more information.
+  description: Annotation @Boost not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1671,9 +1565,9 @@
   links:
   - title: 'Hibernate Search 6 Reference: Query-time boosting'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#search-dsl-predicate-common-boost
-  message: Index-time boosting was deprecated in Hibernate Search 5. It is no longer
-    available in Hibernate Search 6.. Instead, rely on query-time boosting. See link
-    for more information.
+  message: "\n Index-time boosting was deprecated in Hibernate Search 5. It is no
+    longer available in Hibernate Search 6.\n Instead, rely on query-time boosting.
+    See link for more information.\n "
   ruleID: hibernate-search-00650
   when:
     java.referenced:
@@ -1681,9 +1575,7 @@
       pattern: org.hibernate.search.annotations.Boost
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @CacheFromIndex not available anymore
-    This annotation was deprecated and non-functional in Hibernate Search 5. It is no longer available in Hibernate Search 6.
+  description: Annotation @CacheFromIndex not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1694,8 +1586,8 @@
   - hibernate
   - eap8
   links: []
-  message: This annotation was deprecated and non-functional in Hibernate Search 5.
-    It is no longer available in Hibernate Search 6.
+  message: "\n This annotation was deprecated and non-functional in Hibernate Search
+    5. It is no longer available in Hibernate Search 6.\n "
   ruleID: hibernate-search-00660
   when:
     java.referenced:
@@ -1703,9 +1595,7 @@
       pattern: org.hibernate.search.annotations.CacheFromIndex
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @CalendarBridge not available anymore
-    `@CalendarBridge` is not necessary to index Calendar values: you can simply apply @GenericField to a property of type Calendar, and an appropriate default bridge will be used.. See link for more information.
+  description: Annotation @CalendarBridge not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1718,9 +1608,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @CalendarBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#calendarbridge
-  message: '`@CalendarBridge` is not necessary to index Calendar values: you can simply
-    apply @GenericField to a property of type Calendar, and an appropriate default
-    bridge will be used.. See link for more information.'
+  message: "\n `@CalendarBridge` is not necessary to index Calendar values: you can
+    simply apply @GenericField to a property of type Calendar, and an appropriate
+    default bridge will be used.\n See link for more information.\n "
   ruleID: hibernate-search-00670
   when:
     java.referenced:
@@ -1728,9 +1618,7 @@
       pattern: org.hibernate.search.annotations.CalendarBridge
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @CharFilterDef not available anymore
-    Annotation-based analyzer definitions are no longer supported. See link for more information.
+  description: Annotation @CharFilterDef not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1743,8 +1631,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @CharFilterDef'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#charfilterdef
-  message: Annotation-based analyzer definitions are no longer supported. See link
-    for more information.
+  message: "\n Annotation-based analyzer definitions are no longer supported. See
+    link for more information.\n "
   ruleID: hibernate-search-00680
   when:
     java.referenced:
@@ -1752,9 +1640,7 @@
       pattern: org.hibernate.search.annotations.CharFilterDef
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @ClassBridge(s) not available anymore
-    The bridge API was completely reworked in Hibernate Search 6. See link for more information.
+  description: Annotation @ClassBridge(s) not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1767,8 +1653,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Bridges'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#bridges
-  message: The bridge API was completely reworked in Hibernate Search 6. See link
-    for more information.
+  message: "\n The bridge API was completely reworked in Hibernate Search 6. See link
+    for more information.\n "
   ruleID: hibernate-search-00690
   when:
     or:
@@ -1780,9 +1666,7 @@
         pattern: org.hibernate.search.annotations.ClassBridges
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @ContainedIn not available anymore
-    @ContainedIn is no longer necessary in Hibernate Search 6.. Hibernate Search 6 infers indexing dependencies from the mapping, and raises errors at bootstrap when the equivalent of @ContainedIn cannot be applied automatically (for example an @IndexedEmbedded association with no inverse side).. Thus, the recommended approach when migrating is to simply remove all @ContainedIn annotations, then deal with the bootstrap errors, if any.
+  description: Annotation @ContainedIn not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1796,12 +1680,12 @@
   - title: 'Hibernate Search 5 to 6 Migration: Automatic indexing across associations
       by defaults'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#automatic-indexing-across-associations-by-default
-  message: '@ContainedIn is no longer necessary in Hibernate Search 6.. Hibernate
+  message: "\n @ContainedIn is no longer necessary in Hibernate Search 6.\n Hibernate
     Search 6 infers indexing dependencies from the mapping, and raises errors at bootstrap
     when the equivalent of @ContainedIn cannot be applied automatically (for example
-    an @IndexedEmbedded association with no inverse side).. Thus, the recommended
+    an @IndexedEmbedded association with no inverse side).\n Thus, the recommended
     approach when migrating is to simply remove all @ContainedIn annotations, then
-    deal with the bootstrap errors, if any.'
+    deal with the bootstrap errors, if any.\n "
   ruleID: hibernate-search-00700
   when:
     java.referenced:
@@ -1809,9 +1693,7 @@
       pattern: org.hibernate.search.annotations.ContainedIn
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @DateBridge not available anymore
-    @DateBridge is not necessary to index Date values: you can simply apply @GenericField to a property of type java.util.Date, java.sql.Date, java.sql.Time or java.sql.Timestamp, and an appropriate default bridge will be used.. See link for more information.
+  description: Annotation @DateBridge not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1824,10 +1706,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @DateBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#datebridge
-  message: '@DateBridge is not necessary to index Date values: you can simply apply
+  message: "\n @DateBridge is not necessary to index Date values: you can simply apply
     @GenericField to a property of type java.util.Date, java.sql.Date, java.sql.Time
-    or java.sql.Timestamp, and an appropriate default bridge will be used.. See link
-    for more information.'
+    or java.sql.Timestamp, and an appropriate default bridge will be used.\n See link
+    for more information.\n "
   ruleID: hibernate-search-00710
   when:
     java.referenced:
@@ -1835,9 +1717,7 @@
       pattern: org.hibernate.search.annotations.DateBridge
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @DocumentId has moved
-    `@DocumentId` is still available in Hibernate Search 6, but moved to a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId`.. However, it no longer exposes a name attribute, because the document ID is no longer an index field, and thus it does not need a name.
+  description: Annotation @DocumentId has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1850,10 +1730,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @DocumentId'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#documentid
-  message: '`@DocumentId` is still available in Hibernate Search 6, but moved to a
-    different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId`..
+  message: "\n `@DocumentId` is still available in Hibernate Search 6, but moved to
+    a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId`.\n
     However, it no longer exposes a name attribute, because the document ID is no
-    longer an index field, and thus it does not need a name.'
+    longer an index field, and thus it does not need a name.\n "
   ruleID: hibernate-search-00720
   when:
     java.referenced:
@@ -1861,9 +1741,7 @@
       pattern: org.hibernate.search.annotations.DocumentId
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @DynamicBoost not available anymore
-    Index-time boosting was deprecated in Hibernate Search 5. It is no longer available in Hibernate Search 6.. Instead, rely on query-time boosting. See link for more information.
+  description: Annotation @DynamicBoost not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1876,9 +1754,9 @@
   links:
   - title: 'Hibernate Search 6 Reference: Boosting the score of a predicate'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#search-dsl-predicate-common-boost
-  message: Index-time boosting was deprecated in Hibernate Search 5. It is no longer
-    available in Hibernate Search 6.. Instead, rely on query-time boosting. See link
-    for more information.
+  message: "\n Index-time boosting was deprecated in Hibernate Search 5. It is no
+    longer available in Hibernate Search 6.\n Instead, rely on query-time boosting.
+    See link for more information.\n "
   ruleID: hibernate-search-00730
   when:
     java.referenced:
@@ -1886,9 +1764,7 @@
       pattern: org.hibernate.search.annotations.DynamicBoost
 - category: mandatory
   customVariables: []
-  description: |-
-    Facets have changed
-    Facets are now called aggregations, which are a generalization of the concept of faceting. See link for more information.
+  description: Facets have changed
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1901,8 +1777,8 @@
   links:
   - title: 'Hibernate Search 6 Reference: @Facet(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#facet
-  message: Facets are now called aggregations, which are a generalization of the concept
-    of faceting. See link for more information.
+  message: "\n Facets are now called aggregations, which are a generalization of the
+    concept of faceting. See link for more information.\n "
   ruleID: hibernate-search-00740
   when:
     or:
@@ -1914,9 +1790,7 @@
         pattern: org.hibernate.search.annotations.Facets
 - category: mandatory
   customVariables: []
-  description: |-
-    The @Field(s) annotation has been split into multiple annotations
-    The @Field annotation was split into multiple annotations, specific to each field type. See link for more information.
+  description: The @Field(s) annotation has been split into multiple annotations
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -1929,8 +1803,8 @@
   links:
   - title: 'Hibernate Search 6 Reference: @Field(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#field
-  message: The @Field annotation was split into multiple annotations, specific to
-    each field type. See link for more information.
+  message: "\n The @Field annotation was split into multiple annotations, specific
+    to each field type. See link for more information.\n "
   ruleID: hibernate-search-00750
   when:
     or:
@@ -1942,9 +1816,7 @@
         pattern: org.hibernate.search.annotations.Fields
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @FieldBridge not available anymore
-    The bridge API was completely reworked in Hibernate Search 6. See link for more information.
+  description: Annotation @FieldBridge not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1957,8 +1829,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Bridges'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#bridges
-  message: The bridge API was completely reworked in Hibernate Search 6. See link
-    for more information.
+  message: "\n The bridge API was completely reworked in Hibernate Search 6. See link
+    for more information.\n "
   ruleID: hibernate-search-00760
   when:
     java.referenced:
@@ -1966,9 +1838,7 @@
       pattern: org.hibernate.search.annotations.FieldBridge
 - category: mandatory
   customVariables: []
-  description: |-
-    The @FullTextFilterDef(s) annotation is not available anymore
-    Full-text filters have no direct equivalent in Hibernate Search 6. See link for more information.
+  description: The @FullTextFilterDef(s) annotation is not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -1981,8 +1851,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Full-text filter'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#full-text-filter
-  message: Full-text filters have no direct equivalent in Hibernate Search 6. See
-    link for more information.
+  message: "\n Full-text filters have no direct equivalent in Hibernate Search 6.
+    See link for more information.\n "
   ruleID: hibernate-search-00770
   when:
     or:
@@ -1994,9 +1864,7 @@
         pattern: org.hibernate.search.annotations.FullTextFilterDefs
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Indexed has moved
-    `@Indexed` is still available in Hibernate Search 6, but moved to a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed`.. However, there are some related changes that must be addressed - see link for more information.
+  description: Annotation @Indexed has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2009,10 +1877,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Indexed'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#indexed
-  message: '`@Indexed` is still available in Hibernate Search 6, but moved to a different
-    package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed`..
+  message: "\n `@Indexed` is still available in Hibernate Search 6, but moved to a
+    different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed`.\n
     However, there are some related changes that must be addressed - see link for
-    more information.'
+    more information.\n "
   ruleID: hibernate-search-00780
   when:
     java.referenced:
@@ -2020,9 +1888,7 @@
       pattern: org.hibernate.search.annotations.Indexed
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @IndexedEmbedded has moved
-    `@IndexedEmbedded` is still available in Hibernate Search 6, but moved to a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded`.. Some other changes within the annotation have been made. For more information, see the link.
+  description: Annotation @IndexedEmbedded has moved
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2035,10 +1901,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @IndexedEmbedded'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#indexedembeded
-  message: '`@IndexedEmbedded` is still available in Hibernate Search 6, but moved
-    to a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded`..
+  message: "\n `@IndexedEmbedded` is still available in Hibernate Search 6, but moved
+    to a different package: `org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded`.\n
     Some other changes within the annotation have been made. For more information,
-    see the link.'
+    see the link.\n "
   ruleID: hibernate-search-00790
   when:
     java.referenced:
@@ -2046,9 +1912,7 @@
       pattern: org.hibernate.search.annotations.IndexedEmbedded
 - category: mandatory
   customVariables: []
-  description: |-
-    The @Key annotation is not available anymore
-    `@Key` has no equivalent in Hibernate Search 6.
+  description: The @Key annotation is not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2061,7 +1925,7 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Full-text filter'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#full-text-filter
-  message: '`@Key` has no equivalent in Hibernate Search 6.'
+  message: "\n `@Key` has no equivalent in Hibernate Search 6.\n "
   ruleID: hibernate-search-00800
   when:
     java.referenced:
@@ -2069,9 +1933,7 @@
       pattern: org.hibernate.search.annotations.Key
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Latitude has moved
-    `@Latitude` is still available in Hibernate Search 6, but moved to a different package: `org.hibernate.search.annotations.Latitude`.
+  description: Annotation @Latitude has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2084,8 +1946,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Latitude'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#latitude
-  message: '`@Latitude` is still available in Hibernate Search 6, but moved to a different
-    package: `org.hibernate.search.annotations.Latitude`.'
+  message: "\n `@Latitude` is still available in Hibernate Search 6, but moved to
+    a different package: `org.hibernate.search.annotations.Latitude`.\n "
   ruleID: hibernate-search-00810
   when:
     java.referenced:
@@ -2093,9 +1955,7 @@
       pattern: org.hibernate.search.annotations.Latitude
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Longitude has moved
-    `@Longitude` is still available in Hibernate Search 6, but moved to a different package: `org.hibernate.search.annotations.Longitude`.
+  description: Annotation @Longitude has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2108,8 +1968,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Longitude'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#longitude
-  message: '`@Longitude` is still available in Hibernate Search 6, but moved to a
-    different package: `org.hibernate.search.annotations.Longitude`.'
+  message: "\n `@Longitude` is still available in Hibernate Search 6, but moved to
+    a different package: `org.hibernate.search.annotations.Longitude`.\n "
   ruleID: hibernate-search-00820
   when:
     java.referenced:
@@ -2117,9 +1977,7 @@
       pattern: org.hibernate.search.annotations.Longitude
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Longitude has moved
-    In Hibernate Search 5, `@Normalizer` could point directly to a class extending `org.apache.lucene.analysis.Analyzer`, for example with `@Normalizer(impl = MyNormalizer.class)`.. This is no longer possible: normalizers are now always referenced by their name. However, you can assign a name to a given normalizer instance using the Lucene analysis configurer.
+  description: Annotation @Longitude has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2132,11 +1990,11 @@
   links:
   - title: 'Hibernate Search 6 Reference: Lucene analysis configurer'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-analysis-analyzers
-  message: 'In Hibernate Search 5, `@Normalizer` could point directly to a class extending
-    `org.apache.lucene.analysis.Analyzer`, for example with `@Normalizer(impl = MyNormalizer.class)`..
-    This is no longer possible: normalizers are now always referenced by their name.
-    However, you can assign a name to a given normalizer instance using the Lucene
-    analysis configurer.'
+  message: "\n In Hibernate Search 5, `@Normalizer` could point directly to a class
+    extending `org.apache.lucene.analysis.Analyzer`, for example with `@Normalizer(impl
+    = MyNormalizer.class)`.\n This is no longer possible: normalizers are now always
+    referenced by their name. However, you can assign a name to a given normalizer
+    instance using the Lucene analysis configurer.\n "
   ruleID: hibernate-search-00830
   when:
     java.referenced:
@@ -2144,9 +2002,7 @@
       pattern: org.hibernate.search.annotations.Normalizer
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @NormalizerDef(s) not available anymore
-    Annotation-based analyzer definitions are no longer supported.. Instead, implement an analysis configurer: see links for Lucene and Elasticsearch
+  description: Annotation @NormalizerDef(s) not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2161,8 +2017,8 @@
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-lucene-analysis-analyzers
   - title: 'Hibernate Search 6 Reference: Elasticsearch analyzers and normalizers'
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#backend-elasticsearch-analysis-analyzers
-  message: 'Annotation-based analyzer definitions are no longer supported.. Instead,
-    implement an analysis configurer: see links for Lucene and Elasticsearch'
+  message: "\n Annotation-based analyzer definitions are no longer supported.\n Instead,
+    implement an analysis configurer: see links for Lucene and Elasticsearch\n "
   ruleID: hibernate-search-00840
   when:
     or:
@@ -2174,9 +2030,7 @@
         pattern: org.hibernate.search.annotations.NormalizerDefs
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @NumericField(s) not available anymore
-    @NumericField no longer exists in Hibernate Search 6.. Numeric types are indexed as numeric values by default, so this annotation can simply be removed.
+  description: Annotation @NumericField(s) not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2187,8 +2041,8 @@
   - hibernate
   - eap8
   links: []
-  message: '@NumericField no longer exists in Hibernate Search 6.. Numeric types are
-    indexed as numeric values by default, so this annotation can simply be removed.'
+  message: "\n @NumericField no longer exists in Hibernate Search 6.\n Numeric types
+    are indexed as numeric values by default, so this annotation can simply be removed.\n "
   ruleID: hibernate-search-00850
   when:
     or:
@@ -2200,9 +2054,7 @@
         pattern: org.hibernate.search.annotations.NumericFields
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @ProvidedId is no longer available
-    `@ProvidedId` was deprecated in Hibernate Search 5. It no longer exists in Hibernate Search 6.
+  description: Annotation @ProvidedId is no longer available
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2213,8 +2065,8 @@
   - hibernate
   - eap8
   links: []
-  message: '`@ProvidedId` was deprecated in Hibernate Search 5. It no longer exists
-    in Hibernate Search 6.'
+  message: "\n `@ProvidedId` was deprecated in Hibernate Search 5. It no longer exists
+    in Hibernate Search 6.\n "
   ruleID: hibernate-search-00860
   when:
     java.referenced:
@@ -2222,9 +2074,7 @@
       pattern: org.hibernate.search.annotations.ProvidedId
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @SortableField(s) not available anymore
-    @SortableField(s) no longer exists in Hibernate Search 6. Instead, use @*Field.sortable.
+  description: Annotation @SortableField(s) not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2237,8 +2087,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @SortableField(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#sortablefield
-  message: '@SortableField(s) no longer exists in Hibernate Search 6. Instead, use
-    @*Field.sortable.'
+  message: "\n @SortableField(s) no longer exists in Hibernate Search 6. Instead,
+    use @*Field.sortable.\n "
   ruleID: hibernate-search-00870
   when:
     or:
@@ -2250,9 +2100,7 @@
         pattern: org.hibernate.search.annotations.SortableFields
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @Spatial(s) not available anymore
-    @Spatial has no direct equivalent in Hibernate Search 6.. Check link for a quick reference of how to convert a @Spatial annotation to Hibernate Search 6.
+  description: Annotation @Spatial(s) not available anymore
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2265,9 +2113,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Spatial'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#spatial
-  message: '@Spatial has no direct equivalent in Hibernate Search 6.. Check link for
-    a quick reference of how to convert a @Spatial annotation to Hibernate Search
-    6.'
+  message: "\n @Spatial has no direct equivalent in Hibernate Search 6.\n Check link
+    for a quick reference of how to convert a @Spatial annotation to Hibernate Search
+    6.\n "
   ruleID: hibernate-search-00880
   when:
     or:
@@ -2279,9 +2127,7 @@
         pattern: org.hibernate.search.annotations.Spatials
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @TikaBridge is no longer available
-    @TikaBridge has no equivalent in Hibernate Search 6 yet.
+  description: Annotation @TikaBridge is no longer available
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2294,7 +2140,7 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @TikaBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#tikabridge
-  message: '@TikaBridge has no equivalent in Hibernate Search 6 yet.'
+  message: "\n @TikaBridge has no equivalent in Hibernate Search 6 yet.\n "
   ruleID: hibernate-search-00890
   when:
     java.referenced:
@@ -2302,9 +2148,7 @@
       pattern: org.hibernate.search.annotations.TikaBridge
 - category: mandatory
   customVariables: []
-  description: |-
-    Annotation @AnalyzerDef(s) not available anymore
-    Annotation-based analyzer definitions are no longer supported.. See links for more information.
+  description: Annotation @AnalyzerDef(s) not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2319,8 +2163,8 @@
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#tokenfilterdef
   - title: 'Hibernate Search 5 to 6 Migration: @TokenizerDef'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#tokenizerdef
-  message: Annotation-based analyzer definitions are no longer supported.. See links
-    for more information.
+  message: "\n Annotation-based analyzer definitions are no longer supported.\n See
+    links for more information.\n "
   ruleID: hibernate-search-00900
   when:
     or:
@@ -2332,9 +2176,7 @@
         pattern: org.hibernate.search.annotations.TokenizerDef
 - category: mandatory
   customVariables: []
-  description: |-
-    FullTextEntityManager and FullTextSession removed
-    The equivalent to Hibernate Search 5’s `FullTextEntityManager/FullTextSession` is Hibernate Search 6’s `SearchSession`. Check link for guide. to switch implementation to `SearchSession`.
+  description: FullTextEntityManager and FullTextSession removed
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2347,9 +2189,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: FullTextEntityManager/FullTextSession'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#fulltextsession
-  message: The equivalent to Hibernate Search 5’s `FullTextEntityManager/FullTextSession`
-    is Hibernate Search 6’s `SearchSession`. Check link for guide. to switch implementation
-    to `SearchSession`.
+  message: "\n The equivalent to Hibernate Search 5’s `FullTextEntityManager/FullTextSession`
+    is Hibernate Search 6’s `SearchSession`. Check link for guide\n to switch implementation
+    to `SearchSession`.\n "
   ruleID: hibernate-search-00910
   when:
     or:
@@ -2359,9 +2201,7 @@
         pattern: org.hibernate.search.FullTextSession
 - category: mandatory
   customVariables: []
-  description: |-
-    Full text queries now done via SDL - FullTextQueries have changed
-    Search APIs have changed significantly in order to implement several improvements. The recommended way to build search. queries in Hibernate Search 6 is through the Hibernate Search DSL. See link for a thorough explanation and examples.
+  description: Full text queries now done via SDL - FullTextQueries have changed
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2374,9 +2214,10 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: FullTextQuery'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searching-fulltextquery
-  message: Search APIs have changed significantly in order to implement several improvements.
-    The recommended way to build search. queries in Hibernate Search 6 is through
-    the Hibernate Search DSL. See link for a thorough explanation and examples.
+  message: "\n Search APIs have changed significantly in order to implement several
+    improvements. The recommended way to build search\n queries in Hibernate Search
+    6 is through the Hibernate Search DSL. See link for a thorough explanation and
+    examples.\n "
   ruleID: hibernate-search-00920
   when:
     or:
@@ -2386,9 +2227,8 @@
         pattern: org.hibernate.search.jpa.FullTextQuery
 - category: mandatory
   customVariables: []
-  description: |-
-    Full text queries now done via SDL - Lucene queries replaced with search predicates
-    Lucene queries are replaced with Lucene-independent "search predicates" in Hibernate Search 6. See link for guide and examples.
+  description: Full text queries now done via SDL - Lucene queries replaced with search
+    predicates
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2401,17 +2241,16 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: org.apache.lucene.search.Query -> SearchPredicate'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#queries
-  message: Lucene queries are replaced with Lucene-independent "search predicates"
-    in Hibernate Search 6. See link for guide and examples.
+  message: "\n Lucene queries are replaced with Lucene-independent \"search predicates\"
+    in Hibernate Search 6. See link for guide and examples.\n "
   ruleID: hibernate-search-00930
   when:
     java.referenced:
       pattern: org.apache.lucene.search.Query
 - category: mandatory
   customVariables: []
-  description: |-
-    Full text queries now done via DSL - Sort fields replaced with search sorts
-    Lucene sort fields are replaced with Lucene-independent "search sorts" in Hibernate Search 6. Follow the link for more info and examples.
+  description: Full text queries now done via DSL - Sort fields replaced with search
+    sorts
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2425,8 +2264,8 @@
   - title: 'Hibernate Search 5 to 6 Migration: org.apache.lucene.search.Sort/SortField
       -> SearchSort'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#sorts
-  message: Lucene sort fields are replaced with Lucene-independent "search sorts"
-    in Hibernate Search 6. Follow the link for more info and examples.
+  message: "\n Lucene sort fields are replaced with Lucene-independent \"search sorts\"
+    in Hibernate Search 6. Follow the link for more info and examples.\n "
   ruleID: hibernate-search-00940
   when:
     or:
@@ -2436,9 +2275,7 @@
         pattern: org.apache.lucene.search.SortField
 - category: mandatory
   customVariables: []
-  description: |-
-    ProjectionConstants no longer available
-    The `ProjectionConstants` are no longer available, and Hibernate Search 6's DSL must be used instead to build `SearchProjection` objects. Follow link for more information and examples.
+  description: ProjectionConstants no longer available
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2451,9 +2288,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Projections'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#projections
-  message: The `ProjectionConstants` are no longer available, and Hibernate Search
+  message: "\n The `ProjectionConstants` are no longer available, and Hibernate Search
     6's DSL must be used instead to build `SearchProjection` objects. Follow link
-    for more information and examples.
+    for more information and examples.\n "
   ruleID: hibernate-search-00950
   when:
     or:
@@ -2463,9 +2300,7 @@
         pattern: org.hibernate.search.elasticsearch.ElasticsearchProjectionConstants
 - category: mandatory
   customVariables: []
-  description: |-
-    Full text queries now done via SDL - Facets now called aggregations
-    Facets are now called aggregations, which are a generalization of the concept of faceting. See link for more information and examples.
+  description: Full text queries now done via SDL - Facets now called aggregations
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2478,8 +2313,8 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Facets'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searching-facet
-  message: Facets are now called aggregations, which are a generalization of the concept
-    of faceting. See link for more information and examples.
+  message: "\n Facets are now called aggregations, which are a generalization of the
+    concept of faceting. See link for more information and examples.\n "
   ruleID: hibernate-search-00960
   when:
     or:
@@ -2491,9 +2326,7 @@
         pattern: org.hibernate.search*facet*
 - category: mandatory
   customVariables: []
-  description: |-
-    ErrorHandler API no longer available
-    The ErrorHandler interface and API have been replaced with the `FailureHandler` interface, and the related configuration properties changed. See link for more information and examples.
+  description: ErrorHandler API no longer available
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2506,9 +2339,9 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: ErrorHandler'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#error-handler
-  message: The ErrorHandler interface and API have been replaced with the `FailureHandler`
+  message: "\n The ErrorHandler interface and API have been replaced with the `FailureHandler`
     interface, and the related configuration properties changed. See link for more
-    information and examples.
+    information and examples.\n "
   ruleID: hibernate-search-00970
   when:
     or:
@@ -2520,9 +2353,7 @@
         pattern: org.hibernate.search*errorhandl*
 - category: mandatory
   customVariables: []
-  description: |-
-    The @Factory annotation is not available anymore
-    The @Factory annotation does not exist in Hibernate Search 6 anymore. It is encouraged instead to rely on a proper dependency injection framework if such a feature is needed.. This can be done by referencing the bean name instead of referencing the bean class in your Hibernate Search mapping/configuration. See link for more information.
+  description: The @Factory annotation is not available anymore
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2535,11 +2366,11 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Factory'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#factory
-  message: The @Factory annotation does not exist in Hibernate Search 6 anymore. It
-    is encouraged instead to rely on a proper dependency injection framework if such
-    a feature is needed.. This can be done by referencing the bean name instead of
-    referencing the bean class in your Hibernate Search mapping/configuration. See
-    link for more information.
+  message: "\n The @Factory annotation does not exist in Hibernate Search 6 anymore.
+    It is encouraged instead to rely on a proper dependency injection framework if
+    such a feature is needed.\n This can be done by referencing the bean name instead
+    of referencing the bean class in your Hibernate Search mapping/configuration.
+    See link for more information.\n "
   ruleID: hibernate-search-00980
   when:
     java.referenced:
@@ -2547,9 +2378,7 @@
       pattern: org.hibernate.search.annotations.Factory
 - category: mandatory
   customVariables: []
-  description: |-
-    org.hibernate.search.exception.SearchException has been moved
-    `org.hibernate.search.exception.SearchException` has been moved to `org.hibernate.search.util.common.SearchException`.
+  description: org.hibernate.search.exception.SearchException has been moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2562,16 +2391,15 @@
   links:
   - title: 'Hibernate Search 5 to 6 Migration: SearchException'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searchexception
-  message: '`org.hibernate.search.exception.SearchException` has been moved to `org.hibernate.search.util.common.SearchException`.'
+  message: "\n `org.hibernate.search.exception.SearchException` has been moved to
+    `org.hibernate.search.util.common.SearchException`.\n "
   ruleID: hibernate-search-00990
   when:
     java.referenced:
       pattern: org.hibernate.search.exception.SearchException
 - category: mandatory
   customVariables: []
-  description: |-
-    Sharding has changed in Hibernate Search 6
-    Static sharding is still available in Hibernate Search 6, but it works differently, so the Hibernate Search 5 APIs are no longer available.. To implement static sharding in Hibernate Search 6, refer to the link.
+  description: Sharding has changed in Hibernate Search 6
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2584,9 +2412,9 @@
   links:
   - title: Hibernate Search 6 Reference - Sharding and routing
     url: https://docs.jboss.org/hibernate/search/6.0/reference/en-US/html_single/#concepts-sharding-routing
-  message: Static sharding is still available in Hibernate Search 6, but it works
-    differently, so the Hibernate Search 5 APIs are no longer available.. To implement
-    static sharding in Hibernate Search 6, refer to the link.
+  message: "\n Static sharding is still available in Hibernate Search 6, but it works
+    differently, so the Hibernate Search 5 APIs are no longer available.\n To implement
+    static sharding in Hibernate Search 6, refer to the link.\n "
   ruleID: hibernate-search-01000
   when:
     or:
@@ -2598,9 +2426,7 @@
         pattern: org.hibernate.search.store.ShardIdentifierProviderTemplate
 - category: mandatory
   customVariables: []
-  description: |-
-    SearchFactory is no longer available
-    The equivalent to Hibernate Search 5’s SearchFactory is Hibernate Search 6’s SearchMapping, but some operations are more conveniently accessible directly from SearchSession.. Check the link for more information and examples.
+  description: SearchFactory is no longer available
   effort: 3
   labels:
   - konveyor.io/target=eap8+
@@ -2613,18 +2439,16 @@
   links:
   - title: Hibernate Search 6 Reference - SearchFactory
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#_searchfactory
-  message: The equivalent to Hibernate Search 5’s SearchFactory is Hibernate Search
+  message: "\n The equivalent to Hibernate Search 5’s SearchFactory is Hibernate Search
     6’s SearchMapping, but some operations are more conveniently accessible directly
-    from SearchSession.. Check the link for more information and examples.
+    from SearchSession.\n Check the link for more information and examples.\n "
   ruleID: hibernate-search-01010
   when:
     java.referenced:
       pattern: org.hibernate.search*SearchFactory
 - category: mandatory
   customVariables: []
-  description: |-
-    MassIndexer has moved
-    The MassIndexer mostly stays the same in Hibernate Search 6, but it moved to a different package: `org.hibernate.search.mapper.orm.massindexing.MassIndexer`.. There are some other changes that can be checked by following the link.
+  description: MassIndexer has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2637,18 +2461,16 @@
   links:
   - title: Hibernate Search 6 Reference - MassIndexer
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#massindexer
-  message: 'The MassIndexer mostly stays the same in Hibernate Search 6, but it moved
-    to a different package: `org.hibernate.search.mapper.orm.massindexing.MassIndexer`..
-    There are some other changes that can be checked by following the link.'
+  message: "\n The MassIndexer mostly stays the same in Hibernate Search 6, but it
+    moved to a different package: `org.hibernate.search.mapper.orm.massindexing.MassIndexer`.\n
+    There are some other changes that can be checked by following the link.\n "
   ruleID: hibernate-search-01020
   when:
     java.referenced:
       pattern: org.hibernate.search.MassIndexer
 - category: mandatory
   customVariables: []
-  description: |-
-    MassIndexer has moved
-    The mass indexing Batch (JSR-352) job mostly stays the same in Hibernate Search 6, but `MassIndexingJob` moved to a different package: `org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob`.
+  description: MassIndexer has moved
   effort: 1
   labels:
   - konveyor.io/target=eap8+
@@ -2661,17 +2483,15 @@
   links:
   - title: Hibernate Search 6 Reference - MassIndexingJob
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#jsr352
-  message: 'The mass indexing Batch (JSR-352) job mostly stays the same in Hibernate
-    Search 6, but `MassIndexingJob` moved to a different package: `org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob`.'
+  message: "\n The mass indexing Batch (JSR-352) job mostly stays the same in Hibernate
+    Search 6, but `MassIndexingJob` moved to a different package: `org.hibernate.search.batch.jsr352.core.massindexing.MassIndexingJob`.\n "
   ruleID: hibernate-search-01030
   when:
     java.referenced:
       pattern: org.hibernate.search.jsr352.massindexing.MassIndexingJob
 - category: mandatory
   customVariables: []
-  description: |-
-    Dependency must be migrated from Hibernate Search 5 to 6
-    Hibernate Search 6 uses the groupId `org.hibernate.search` and all dependencies must be updated
+  description: Dependency must be migrated from Hibernate Search 5 to 6
   effort: 1
   labels:
   - konveyor.io/target=eap8+
diff --git a/default/generated/eap8/113-hibernate6.windup.yaml b/default/generated/eap8/113-hibernate6.windup.yaml
index f2d73ce8..c2c6f060 100644
--- a/default/generated/eap8/113-hibernate6.windup.yaml
+++ b/default/generated/eap8/113-hibernate6.windup.yaml
@@ -1,8 +1,7 @@
 - category: potential
   customVariables: []
-  description: |-
-    Implicit name determination for sequences and tables associated with identifier generation has changed
-    The way in which Hibernate determines implicit names for sequences and tables associated with identifier generation has changed in 6.0 which may affect migrating applications.. As of 6.0, Hibernate by default creates a sequence per entity hierarchy instead of a single sequence hibernate_sequence.. Due to this change, users that previously used `@GeneratedValue(strategy = GenerationStrategy.AUTO)` or simply `@GeneratedValue` (since `AUTO` is the default), need to ensure that the database now contains sequences for every entity, named `<entity name>_seq`. For an entity Person, a sequence person_seq is expected to exist.. It’s best to run hbm2ddl (e.g. by temporarily setting `hbm2ddl.auto=create`) to obtain a list of DDL statements for the sequences.
+  description: Implicit name determination for sequences and tables associated with
+    identifier generation has changed
   effort: 3
   labels:
   - konveyor.io/target=hibernate6+
@@ -15,16 +14,16 @@
   - title: Hibernate ORM 6 migration guide - Implicit Identifier Sequence and Table
       Name
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#implicit-identifier-sequence-and-table-name
-  message: The way in which Hibernate determines implicit names for sequences and
-    tables associated with identifier generation has changed in 6.0 which may affect
-    migrating applications.. As of 6.0, Hibernate by default creates a sequence per
-    entity hierarchy instead of a single sequence hibernate_sequence.. Due to this
-    change, users that previously used `@GeneratedValue(strategy = GenerationStrategy.AUTO)`
+  message: "\n The way in which Hibernate determines implicit names for sequences
+    and tables associated with identifier generation has changed in 6.0 which may
+    affect migrating applications. \n As of 6.0, Hibernate by default creates a sequence
+    per entity hierarchy instead of a single sequence hibernate_sequence. \n Due to
+    this change, users that previously used `@GeneratedValue(strategy = GenerationStrategy.AUTO)`
     or simply `@GeneratedValue` (since `AUTO` is the default), need to ensure that
     the database now contains sequences for every entity, named `<entity name>_seq`.
-    For an entity Person, a sequence person_seq is expected to exist.. It’s best to
-    run hbm2ddl (e.g. by temporarily setting `hbm2ddl.auto=create`) to obtain a list
-    of DDL statements for the sequences.
+    For an entity Person, a sequence person_seq is expected to exist. \n It’s best
+    to run hbm2ddl (e.g. by temporarily setting `hbm2ddl.auto=create`) to obtain a
+    list of DDL statements for the sequences.\n "
   ruleID: hibernate-00005
   when:
     java.referenced:
@@ -35,9 +34,7 @@
   - name: annotation
     nameOfCaptureGroup: annotation
     pattern: org.hibernate.annotations.(?P<annotation>(AnyMetaDef|AnyMetaDefs|TypeDef|TypeDefs))
-  description: |-
-    String-based approaches for specifying Types to use have been removed
-    As part of the Hibernate ORM 6.0 release, mapping annotations have been modernised and made more type-safe. These annotations must be removed. See the User Guide for details about mapping your domain model.
+  description: String-based approaches for specifying Types to use have been removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -51,9 +48,9 @@
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#type-system
   - title: Hibernate ORM 6 user guide - Domain model
     url: https://docs.jboss.org/hibernate/orm/6.0/userguide/html_single/Hibernate_User_Guide.html#domain-model
-  message: As part of the Hibernate ORM 6.0 release, mapping annotations have been
-    modernised and made more type-safe. These annotations must be removed. See the
-    User Guide for details about mapping your domain model.
+  message: "\n As part of the Hibernate ORM 6.0 release, mapping annotations have
+    been modernised and made more type-safe. These annotations must be removed. See
+    the User Guide for details about mapping your domain model.\n "
   ruleID: hibernate-00010
   when:
     java.referenced:
@@ -63,9 +60,7 @@
   - name: annotation
     nameOfCaptureGroup: annotation
     pattern: org.hibernate.annotations.(?P<annotation>(CollectionType|ParamDef|Type))
-  description: |-
-    String-based approaches for specifying Types to use have been removed
-    As part of the Hibernate ORM 6.0 release, mapping annotations have been modernised and made more type-safe. Annotation attributes accepting types as String have been removed. See the User Guide for details about mapping your domain model.
+  description: String-based approaches for specifying Types to use have been removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -79,9 +74,10 @@
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#type-system
   - title: Hibernate ORM 6 user guide - Domain model
     url: https://docs.jboss.org/hibernate/orm/6.0/userguide/html_single/Hibernate_User_Guide.html#domain-model
-  message: As part of the Hibernate ORM 6.0 release, mapping annotations have been
-    modernised and made more type-safe. Annotation attributes accepting types as String
-    have been removed. See the User Guide for details about mapping your domain model.
+  message: "\n As part of the Hibernate ORM 6.0 release, mapping annotations have
+    been modernised and made more type-safe. Annotation attributes accepting types
+    as String have been removed. See the User Guide for details about mapping your
+    domain model.\n "
   ruleID: hibernate6-00020
   when:
     java.referenced:
@@ -89,9 +85,7 @@
       pattern: org.hibernate.annotations.(CollectionType|ParamDef|Type)
 - category: mandatory
   customVariables: []
-  description: |-
-    Basic mappings are no longer configurable through the BasicType contract
-    Basic mappings are no longer configurable through the BasicType contract. Instead, users configure the different aspects of mapping the basic value to the database. See migration guide for more details.
+  description: Basic mappings are no longer configurable through the BasicType contract
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -113,9 +107,7 @@
       pattern: org.hibernate.type.BasicType
 - category: mandatory
   customVariables: []
-  description: |-
-    StandardBasicTypes class now exposes fields of type BasicTypeReference
-    The `StandardBasicTypes` class previously exposed `BasicType` instance fields, which now have been replaced with fields of the type `BasicTypeReference`.
+  description: StandardBasicTypes class now exposes fields of type BasicTypeReference
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -135,9 +127,7 @@
       pattern: org.hibernate.type.StandardBasicTypes
 - category: mandatory
   customVariables: []
-  description: |-
-    Renaming of JavaTypeDescriptor contract
-    The interface `org.hibernate.type.descriptor.java.JavaTypeDescriptor` must be renamed to `org.hibernate.type.descriptor.java.JavaType`.
+  description: Renaming of JavaTypeDescriptor contract
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -157,9 +147,7 @@
       pattern: org.hibernate.type.descriptor.java.JavaTypeDescriptor
 - category: mandatory
   customVariables: []
-  description: |-
-    Renaming of SqlTypeDescriptor contract
-    The interface `org.hibernate.type.descriptor.sql.SqlTypeDescriptor` has been renamed to `org.hibernate.type.descriptor.jdbc.JdbcType`.
+  description: Renaming of SqlTypeDescriptor contract
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -179,9 +167,7 @@
       pattern: org.hibernate.type.descriptor.sql.SqlTypeDescriptor
 - category: mandatory
   customVariables: []
-  description: |-
-    The CompositeUserType interface has been reimplemented
-    The CompositeUserType interface was re-implemented to be able to model user types as proper embeddable types. See the migration guide for more information.
+  description: The CompositeUserType interface has been reimplemented
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -201,9 +187,7 @@
       pattern: org.hibernate.usertype.CompositeUserType
 - category: mandatory
   customVariables: []
-  description: |-
-    Property hibernate.hql.bulk_id_strategy has changed
-    The configuration property `hibernate.hql.bulk_id_strategy` was changed to `hibernate.query.mutation_strategy` which now refers to classes or objects implementing `org.hibernate.query.sqm.mutation.spi.SqmMultiTableMutationStrategy`.
+  description: Property hibernate.hql.bulk_id_strategy has changed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -225,9 +209,7 @@
       pattern: hibernate.hql.bulk_id_strategy
 - category: mandatory
   customVariables: []
-  description: |-
-    Stream#close() must be called explicitly to close the underlying resources
-    `jakarta.persistence.Query#getResultStream()` and `org.hibernate.query.Query#stream()` no longer return a Stream decorator. In order to close the underlying IO resources, it is now necessary to explicitly call the `Stream#close()` method.. This change makes the Streams returned by Hibernate behave as defined in the JDK Stream documentation, which is quite explicit about the need for an explicit call to close by the user to avoid resource leakages.
+  description: Stream#close() must be called explicitly to close the underlying resources
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -239,12 +221,12 @@
   links:
   - title: Hibernate ORM 6 migration guide - Stream
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#stream
-  message: '`jakarta.persistence.Query#getResultStream()` and `org.hibernate.query.Query#stream()`
+  message: "\n `jakarta.persistence.Query#getResultStream()` and `org.hibernate.query.Query#stream()`
     no longer return a Stream decorator. In order to close the underlying IO resources,
-    it is now necessary to explicitly call the `Stream#close()` method.. This change
+    it is now necessary to explicitly call the `Stream#close()` method.\n This change
     makes the Streams returned by Hibernate behave as defined in the JDK Stream documentation,
     which is quite explicit about the need for an explicit call to close by the user
-    to avoid resource leakages.'
+    to avoid resource leakages.\n "
   ruleID: hibernate6-00090
   when:
     or:
@@ -256,9 +238,7 @@
         pattern: org.hibernate.query.Query.stream*
 - category: mandatory
   customVariables: []
-  description: |-
-    The signature of the Interceptor#onSave method has been changed
-    The signature of the `Interceptor#onSave` method has been changed to account for the general change in expected identifier type from `Serializable` to `Object`. See migration guide for more information.
+  description: The signature of the Interceptor#onSave method has been changed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -280,9 +260,7 @@
       pattern: org.hibernate.Interceptor.onSave*
 - category: mandatory
   customVariables: []
-  description: |-
-    The contents of the loader.collection package have been restructured
-    The contents of the `loader.collection` package were restructured into `loader.ast.spi` and `loader.ast.internal` as well as adapted to the SQM API.
+  description: The contents of the loader.collection package have been restructured
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -303,9 +281,7 @@
       pattern: org.hibernate.loader.collection*
 - category: mandatory
   customVariables: []
-  description: |-
-    The contents of the loader.custom package have been moved
-    The contents of the `loader.custom` package were adapted and moved to `query.sql`.
+  description: The contents of the loader.custom package have been moved
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -325,9 +301,8 @@
       pattern: org.hibernate.loader.custom*
 - category: mandatory
   customVariables: []
-  description: |-
-    The contents of the loader.entity and loader.plan packages have been removed
-    The contents of `loader.entity` and `loader.plan` were removed
+  description: The contents of the loader.entity and loader.plan packages have been
+    removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -351,9 +326,7 @@
         pattern: org.hibernate.loader.plan*
 - category: mandatory
   customVariables: []
-  description: |-
-    The contents of sql.ordering have moved
-    The contents of `sql.ordering` were adapted and moved to `metamodel.mapping.ordering.ast`.
+  description: The contents of sql.ordering have moved
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -376,9 +349,8 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: org.hibernate.sql.(?P<className>(ANSICaseFragment|ANSIJoinFragment|CacheJoinFragment|CaseFragment|ConditionFragment|DecodeCaseFragment|DerbyCaseFragment|DisjunctionFragment|HSQLCaseFragment|InsertSelect|JoinFragment|JoinType|MckoiCaseFragment|OracleJoinFragment|QueryJoinFragment|QuerySelect|Select|SelectExpression|SelectFragment|SelectValues|Sybase11JoinFragment))
-  description: |-
-    Some classes of the sql package that were previously used for building SQL were removed
-    Classes of the sql package that were previously used for building SQL, but aren’t needed anymore, were removed. The SQL generation is now fully handled through the `SqlAstTranslator` which a `Dialect` exposes a factory for.
+  description: Some classes of the sql package that were previously used for building
+    SQL were removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -399,9 +371,7 @@
       pattern: org.hibernate.sql.(ANSICaseFragment|ANSIJoinFragment|CacheJoinFragment|CaseFragment|ConditionFragment|DecodeCaseFragment|DerbyCaseFragment|DisjunctionFragment|HSQLCaseFragment|InsertSelect|JoinFragment|JoinType|MckoiCaseFragment|OracleJoinFragment|QueryJoinFragment|QuerySelect|Select|SelectExpression|SelectFragment|SelectValues|Sybase11JoinFragment)
 - category: mandatory
   customVariables: []
-  description: |-
-    Support for basic property mappings with multiple columns was removed
-    In Hibernate 6.0 the support for basic property mappings with multiple columns was removed. The only use case for that was when a `CompositeUserType` was in use, which was reworked to now work on top of components.
+  description: Support for basic property mappings with multiple columns was removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -431,9 +401,7 @@
         xpath: //*/h:property[count(h:column) > 1]
 - category: mandatory
   customVariables: []
-  description: |-
-    Legacy Hibernate Criteria API has been removed
-    The legacy Hibernate Criteria API which was deprecated back in Hibernate 5.x and removed in 6.0. Usually, all queries using the legacy API can be modeled with the JPA Criteria API. In some cases it is necessary to use the Hibernate JPA Criteria extensions.
+  description: Legacy Hibernate Criteria API has been removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -456,9 +424,7 @@
       pattern: org.hibernate.criterion*
 - category: mandatory
   customVariables: []
-  description: |-
-    The Query#iterate() method has been removed
-    The Query#iterate() method has been removed. See link for alternatives.
+  description: The Query#iterate() method has been removed
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -478,9 +444,8 @@
       pattern: org.hibernate.query.Query.iterate*
 - category: mandatory
   customVariables: []
-  description: |-
-    Using NativeQuery to call SQL functions and procedures is no longer supported
-    Using `NativeQuery` to call SQL functions and procedures is no longer supported. `org.hibernate.procedure.ProcedureCall` or `jakarta.persistence.StoredProcedureQuery` should be used instead. `@NamedNativeQuery` references defining execution of procedure or functions should be migrated to use `@NamedStoredProcedureQuery` instead.
+  description: Using NativeQuery to call SQL functions and procedures is no longer
+    supported
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -514,9 +479,8 @@
         xpath: //*/h:sql-query[@callable = 'true']
 - category: mandatory
   customVariables: []
-  description: |-
-    Using NativeQuery to call SQL functions and procedures is no longer supported
-    The fetch all properties clause was removed from the HQL language without a replacement. See link for replacement info.
+  description: Using NativeQuery to call SQL functions and procedures is no longer
+    supported
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -544,9 +508,8 @@
         xpath: //text()[contains(., 'fetch all properties')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate no longer provides built-in support for integrating itself with JMX environments
-    Hibernate no longer provides built-in support for integrating itself with JMX environments.
+  description: Hibernate no longer provides built-in support for integrating itself
+    with JMX environments
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -567,9 +530,8 @@
       pattern: org.hibernate.jmx*
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate no longer provides built-in support for integrating itself with JACC environments
-    Hibernate no longer provides built-in support for integrating itself with JACC environments.
+  description: Hibernate no longer provides built-in support for integrating itself
+    with JACC environments
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -590,9 +552,7 @@
       pattern: org.hibernate*Jacc*
 - category: mandatory
   customVariables: []
-  description: |-
-    Removed hibernate classloader properties
-    These properties are deprecated: use `hibernate.classLoaders` instead.
+  description: Removed hibernate classloader properties
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -612,9 +572,7 @@
       pattern: hibernate.classLoader.(application|resources|hibernate|environment)
 - category: mandatory
   customVariables: []
-  description: |-
-    Removed hibernate properties
-    This property has been removed: use `jakarta.persistence.create-database-schemas` or `hibernate.hbm2ddl.create_namespaces` instead
+  description: Removed hibernate properties
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -635,9 +593,7 @@
       pattern: hibernate.hbm2dll.create_namespaces
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.ejb.metamodel.population
-    This property has been removed: please use `hibernate.jpa.metamodel.population` instead
+  description: Renamed hibernate property hibernate.ejb.metamodel.population
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -658,9 +614,7 @@
       pattern: hibernate.ejb.metamodel.population
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.ejb.cfgfile
-    This property has been removed: please use `hibernate.cfg_xml_file` instead
+  description: Renamed hibernate property hibernate.ejb.cfgfile
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -680,9 +634,7 @@
       pattern: hibernate.ejb.cfgfile
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.ejb.xml_files
-    This property has been removed: please use `hibernate.orm_xml_files` instead
+  description: Renamed hibernate property hibernate.ejb.xml_files
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -702,9 +654,7 @@
       pattern: hibernate.ejb.xml_files
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.hbmxml.files
-    This property has been removed: please use `hibernate.hbm_xml_files` instead
+  description: Renamed hibernate property hibernate.hbmxml.files
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -724,9 +674,7 @@
       pattern: hibernate.hbmxml.files
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.ejb.loaded.classes
-    This property has been removed: please use `hibernate.loaded_classes` instead
+  description: Renamed hibernate property hibernate.ejb.loaded.classes
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -747,8 +695,7 @@
       pattern: hibernate.ejb.loaded.classes
 - category: mandatory
   customVariables: []
-  description: |
-    Renamed hibernate property hibernate.ejb.{property}
+  description: Renamed hibernate property hibernate.ejb.{property}
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -768,9 +715,7 @@
       pattern: hibernate.ejb.(persistenceUnitName|discard_pc_on_close|session_factory_observer|identifier_generator_strategy_provider|classcache|collectioncache|event)
 - category: mandatory
   customVariables: []
-  description: |-
-    Renamed hibernate property hibernate.ejb.entitymanager_factory_name
-    This property has been removed: please use `hibernate.session_factory_name` instead
+  description: Renamed hibernate property hibernate.ejb.entitymanager_factory_name
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -791,9 +736,7 @@
       pattern: hibernate.ejb.entitymanager_factory_name
 - category: potential
   customVariables: []
-  description: |-
-    Community dialects moved to a separate module
-    As of Hibernate 6.0, some dialect classes that are maintained by vendors or individuals, as opposed to the Hibernate team, have been moved to a separate Maven artifact: `org.hibernate.orm:hibernate-community-dialects`.. Note that the new artifact is not included in the EAP 8 distribution and will have to be added manually.
+  description: Community dialects moved to a separate module
   effort: 1
   labels:
   - konveyor.io/target=hibernate6+
@@ -805,11 +748,11 @@
   links:
   - title: Hibernate ORM 6 migration guide - Community dialects
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#community-dialects-moved-to-a-separate-module
-  message: 'As of Hibernate 6.0, some dialect classes that are maintained by vendors
+  message: "\n As of Hibernate 6.0, some dialect classes that are maintained by vendors
     or individuals, as opposed to the Hibernate team, have been moved to a separate
-    Maven artifact: `org.hibernate.orm:hibernate-community-dialects`.. Note that the
-    new artifact is not included in the EAP 8 distribution and will have to be added
-    manually.'
+    Maven artifact: `org.hibernate.orm:hibernate-community-dialects`.\n\n Note that
+    the new artifact is not included in the EAP 8 distribution and will have to be
+    added manually.\n "
   ruleID: hibernate6-00270
   when:
     or:
diff --git a/default/generated/eap8/114-jakarta-cdi.windup.yaml b/default/generated/eap8/114-jakarta-cdi.windup.yaml
index 4e845295..28afe12e 100644
--- a/default/generated/eap8/114-jakarta-cdi.windup.yaml
+++ b/default/generated/eap8/114-jakarta-cdi.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Method javax.enterprise.inject.spi.Bean.isNullable() has been removed
-    Replace this method call with `false` (which is the value that CDI implementations have returned for many years now).
+  description: Method javax.enterprise.inject.spi.Bean.isNullable() has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -22,9 +20,8 @@
       pattern: javax.enterprise.inject.spi.Bean.isNullable*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method jakarta.enterprise.inject.spi.BeanManager.createInjectionTarget(AnnotatedType) has been removed.
-    Replace this method call with with BeanManager.getInjectionTargetFactory(AnnotatedType) and use the returned factory to create injection targets.
+  description: Method jakarta.enterprise.inject.spi.BeanManager.createInjectionTarget(AnnotatedType)
+    has been removed.
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -46,9 +43,8 @@
       pattern: jakarta.enterprise.inject.spi.BeanManager.createInjectionTarget*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method jakarta.enterprise.inject.spi.BeanManager.fireEvent(Object, Annotation) has been removed.
-    jakarta.enterprise.inject.spi.BeanManager.fireEvent(Object, Annotation) has been removed. Use BeanManager.getEvent() as an entry point to a similar API.
+  description: Method jakarta.enterprise.inject.spi.BeanManager.fireEvent(Object,
+    Annotation) has been removed.
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -70,9 +66,8 @@
       pattern: jakarta.enterprise.inject.spi.BeanManager.fireEvent*
 - category: potential
   customVariables: []
-  description: |-
-    Method javax.enterprise.inject.spi.BeforeBeanDiscovery.addAnnotatedType(AnnotatedType) has been removed
-    If you application is calling method BeforeBeanDiscovery.addAnnotatedType(AnnotatedType) replace it with BeforeBeanDiscovery.addAnnotatedType(AnnotatedType, (String) null)
+  description: Method javax.enterprise.inject.spi.BeforeBeanDiscovery.addAnnotatedType(AnnotatedType)
+    has been removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
diff --git a/default/generated/eap8/115-jakarta-el.windup.yaml b/default/generated/eap8/115-jakarta-el.windup.yaml
index 6d151e6a..c9902143 100644
--- a/default/generated/eap8/115-jakarta-el.windup.yaml
+++ b/default/generated/eap8/115-jakarta-el.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The incorrectly spelled javax.el.MethodExpression.isParmetersProvided() method has been removed
-    The incorrectly spelled `javax.el.MethodExpression.isParmetersProvided()` method has been removed. Use `MethodExpression.isParametersProvided()` instead.
+  description: The incorrectly spelled javax.el.MethodExpression.isParmetersProvided()
+    method has been removed
   effort: 1
   labels:
   - konveyor.io/target=eap8
@@ -18,9 +17,8 @@
       pattern: javax.el.MethodExpression.isParmetersProvided*
 - category: mandatory
   customVariables: []
-  description: |-
-    The incorrectly spelled jakarta.el.MethodExpression.isParmetersProvided() method has been removed
-    The incorrectly spelled `jakarta.el.MethodExpression.isParmetersProvided()` method has been removed. Use `MethodExpression.isParametersProvided()` instead.
+  description: The incorrectly spelled jakarta.el.MethodExpression.isParmetersProvided()
+    method has been removed
   effort: 1
   labels:
   - konveyor.io/target=eap8
diff --git a/default/generated/eap8/116-jakarta-faces.windup.yaml b/default/generated/eap8/116-jakarta-faces.windup.yaml
index cf68a0b2..3cbdc5cc 100644
--- a/default/generated/eap8/116-jakarta-faces.windup.yaml
+++ b/default/generated/eap8/116-jakarta-faces.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Producer for creating FacesContext must be removed
-    The `@Produces` annotation for instantiating `FacesContext` is not necessary anymore, as CDI injection for `FacesContext` works out of the box.
+  description: Producer for creating FacesContext must be removed
   effort: 1
   labels:
   - konveyor.io/source=eap6
diff --git a/default/generated/eap8/117-jakarta-json-binding.windup.yaml b/default/generated/eap8/117-jakarta-json-binding.windup.yaml
index 8620a30b..8f68e08b 100644
--- a/default/generated/eap8/117-jakarta-json-binding.windup.yaml
+++ b/default/generated/eap8/117-jakarta-json-binding.windup.yaml
@@ -1,19 +1,18 @@
 - category: potential
   customVariables: []
-  description: |-
-    Types annotated with the jakarta.json.bind.annotation.JsonbCreator annotation no longer require all parameters to be present
-    By default, types annotated with the `jakarta.json.bind.annotation.JsonbCreator` annotation no longer require all parameters to be present in the JSON content. Default values will be used if the JSON being parsed is missing one of the parameters.. The EE 8 behavior of requiring that all parameters be present in the JSON can be turned on by calling `jakarta.json.bind.JsonbConfig().withCreatorParametersRequired(true)`.
+  description: Types annotated with the jakarta.json.bind.annotation.JsonbCreator
+    annotation no longer require all parameters to be present
   effort: 1
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: By default, types annotated with the `jakarta.json.bind.annotation.JsonbCreator`
+  message: "\n By default, types annotated with the `jakarta.json.bind.annotation.JsonbCreator`
     annotation no longer require all parameters to be present in the JSON content.
-    Default values will be used if the JSON being parsed is missing one of the parameters..
+    Default values will be used if the JSON being parsed is missing one of the parameters.\n
     The EE 8 behavior of requiring that all parameters be present in the JSON can
-    be turned on by calling `jakarta.json.bind.JsonbConfig().withCreatorParametersRequired(true)`.
+    be turned on by calling `jakarta.json.bind.JsonbConfig().withCreatorParametersRequired(true)`.\n "
   ruleID: jakarta-json-binding-00010
   when:
     java.referenced:
diff --git a/default/generated/eap8/118-jakarta-soap.windup.yaml b/default/generated/eap8/118-jakarta-soap.windup.yaml
index 43fcc854..b437e24c 100644
--- a/default/generated/eap8/118-jakarta-soap.windup.yaml
+++ b/default/generated/eap8/118-jakarta-soap.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.xml.soap.SOAPElementFactory.newInstance() must be replaced
-    `javax.xml.soap.SOAPElementFactory.newInstance()` must be replaced with `jakarta.xml.soap.SOAPFactory.newInstance()`.
+  description: javax.xml.soap.SOAPElementFactory.newInstance() must be replaced
   effort: 1
   labels:
   - konveyor.io/target=eap8
@@ -18,9 +16,7 @@
       pattern: javax.xml.soap.SOAPElementFactory.newInstance*
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.xml.soap.SOAPElementFactory.create() must be replaced
-    `javax.xml.soap.SOAPElementFactory.create()` must be replaced with `jakarta.xml.soap.SOAPFactory.createElement()`. If `javax.xml.soap.Name` is passed as a parameter, it must be replaced with `jakarta.xml.soap.Name`.
+  description: javax.xml.soap.SOAPElementFactory.create() must be replaced
   effort: 1
   labels:
   - konveyor.io/target=eap8
diff --git a/default/generated/eap8/119-jakarta-ws-rs.windup.yaml b/default/generated/eap8/119-jakarta-ws-rs.windup.yaml
index 0df1d092..94bbe562 100644
--- a/default/generated/eap8/119-jakarta-ws-rs.windup.yaml
+++ b/default/generated/eap8/119-jakarta-ws-rs.windup.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    RESTful Web Services @Context annotation has been deprecated
-    Future versions of this API will no longer support `@Context` and related types such as `ContextResolver`.
+  description: RESTful Web Services @Context annotation has been deprecated
   effort: 0
   labels:
   - konveyor.io/target=eap8
diff --git a/default/generated/eap8/120-javaee-to-jakarta-namespaces.windup.yaml b/default/generated/eap8/120-javaee-to-jakarta-namespaces.windup.yaml
index 8d4a2a32..00d05e03 100644
--- a/default/generated/eap8/120-javaee-to-jakarta-namespaces.windup.yaml
+++ b/default/generated/eap8/120-javaee-to-jakarta-namespaces.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE namespace, schemaLocation and version with the Jakarta equivalent
-    Replace `http://xmlns.jcp.org/xml/ns/javaee` with `https://jakarta.ee/xml/ns/jakartaee` and change the schema version number
+  description: Replace the Java EE namespace, schemaLocation and version with the
+    Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -13,8 +12,8 @@
   links:
   - title: Jakarta EE XML Schemas
     url: https://jakarta.ee/xml/ns/jakartaee/#10
-  message: Replace `http://xmlns.jcp.org/xml/ns/javaee` with `https://jakarta.ee/xml/ns/jakartaee`
-    and change the schema version number
+  message: 'Replace `http://xmlns.jcp.org/xml/ns/javaee` with `https://jakarta.ee/xml/ns/jakartaee`
+    and change the schema version number '
   ruleID: javaee-to-jakarta-namespaces-00001
   when:
     builtin.filecontent:
@@ -22,9 +21,8 @@
       pattern: http://xmlns.jcp.org/xml/ns/javaee
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE persistence namespace, schemaLocation and version with the Jakarta equivalent
-    Replace `http://xmlns.jcp.org/xml/ns/persistence` with `https://jakarta.ee/xml/ns/persistence` and change the schema version number
+  description: Replace the Java EE persistence namespace, schemaLocation and version
+    with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -35,8 +33,8 @@
   links:
   - title: Jakarta Persistence XML Schemas
     url: https://jakarta.ee/xml/ns/persistence/#3
-  message: Replace `http://xmlns.jcp.org/xml/ns/persistence` with `https://jakarta.ee/xml/ns/persistence`
-    and change the schema version number
+  message: 'Replace `http://xmlns.jcp.org/xml/ns/persistence` with `https://jakarta.ee/xml/ns/persistence`
+    and change the schema version number '
   ruleID: javaee-to-jakarta-namespaces-00002
   when:
     builtin.filecontent:
@@ -44,9 +42,8 @@
       pattern: http://xmlns.jcp.org/xml/ns/persistence
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE bean validation configuration namespace, schemaLocation and version with the Jakarta equivalent
-    Replace `http://xmlns.jcp.org/xml/ns/validation` with `https://jakarta.ee/xml/ns/validation` and change the schema version number
+  description: Replace the Java EE bean validation configuration namespace, schemaLocation
+    and version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -57,8 +54,8 @@
   links:
   - title: Jakarta Bean Validation XML Schemas
     url: https://jakarta.ee/xml/ns/validation/
-  message: Replace `http://xmlns.jcp.org/xml/ns/validation` with `https://jakarta.ee/xml/ns/validation`
-    and change the schema version number
+  message: 'Replace `http://xmlns.jcp.org/xml/ns/validation` with `https://jakarta.ee/xml/ns/validation`
+    and change the schema version number '
   ruleID: javaee-to-jakarta-namespaces-00003
   when:
     builtin.filecontent:
@@ -66,9 +63,7 @@
       pattern: http://xmlns.jcp.org/xml/ns/validation
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `javaee_web_services_metadata_handler_2_0.xsd` with `jakartaee_web_services_metadata_handler_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -88,9 +83,7 @@
       pattern: javaee_web_services_metadata_handler_2_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `batchXML_1_0.xsd` with `batchXML_2_0.xsd`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -109,9 +102,7 @@
       pattern: batchXML_1_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `beans_1_1.xsd` with `beans_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -131,9 +122,7 @@
       pattern: beans_1_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `beans_2_0.xsd` with `beans_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -153,9 +142,7 @@
       pattern: beans_2_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `jobXML_1_0.xsd` with `jobXML_2_0.xsd` and update the version attribute to `"2.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -175,9 +162,7 @@
       pattern: jobXML_1_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `application_7.xsd` with `application_9.xsd` and update the version attribute to `"9"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -197,9 +182,7 @@
       pattern: application_7.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `application_8.xsd` with `application_9.xsd` and update the version attribute to `"9"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -219,9 +202,7 @@
       pattern: application_8.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `application-client_7.xsd` with `application-client_9.xsd` and update the version attribute to `"9"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -241,9 +222,7 @@
       pattern: application-client_7.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `application-client_8.xsd` with `application-client_9.xsd` and update the version attribute to `"9"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -263,9 +242,7 @@
       pattern: application-client_8.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `connector_1_7.xsd` with `connector_2_0.xsd` and update the version attribute to `"2.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -285,9 +262,7 @@
       pattern: connector_1_7.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `ejb-jar_3_2.xsd` with `ejb-jar_4_0.xsd` and update the version attribute to `"4.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -307,9 +282,7 @@
       pattern: ejb-jar_3_2.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `javaee_web_services_1_4.xsd` with `jakartaee_web_services_2_0.xsd` and update the version attribute to `"2.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -329,9 +302,7 @@
       pattern: javaee_web_services_1_4.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `permissions_7.xsd` with `permissions_9.xsd` and update the version attribute to `"9"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -351,9 +322,7 @@
       pattern: permissions_7.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-app_3_1.xsd` with `web-app_5_0.xsd` and update the version attribute to `"5.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -373,9 +342,7 @@
       pattern: web-app_3_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-app_4_0.xsd` with `web-app_5_0.xsd` and update the version attribute to `"5.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -395,9 +362,7 @@
       pattern: web-app_4_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-fragment_3_1.xsd` with `web-fragment_5_0.xsd` and update the version attribute to `"5.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -417,9 +382,7 @@
       pattern: web-fragment_3_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-fragment_4_0.xsd` with `web-fragment_5_0.xsd` and update the version attribute to `"5.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -439,9 +402,7 @@
       pattern: web-fragment_4_0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-facesconfig_2_2.xsd` with `web-facesconfig_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -461,9 +422,7 @@
       pattern: web-facesconfig_2_2.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-facesconfig_2_3.xsd` with `web-facesconfig_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -483,9 +442,7 @@
       pattern: web-facesconfig_2_3.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-facelettaglibrary_2_2.xsd` with `web-facelettaglibrary_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -505,9 +462,7 @@
       pattern: web-facelettaglibrary_2_2.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-facelettaglibrary_2_3.xsd` with `web-facelettaglibrary_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -527,9 +482,7 @@
       pattern: web-facelettaglibrary_2_3.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-partialresponse_2_2.xsd` with `web-partialresponse_3_0.xsd`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -548,9 +501,7 @@
       pattern: web-partialresponse_2_2.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-partialresponse_2_3.xsd` with `web-partialresponse_3_0.xsd`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -569,9 +520,7 @@
       pattern: web-partialresponse_2_3.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `web-jsptaglibrary_2_1.xsd` with `web-jsptaglibrary_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -591,9 +540,7 @@
       pattern: web-jsptaglibrary_2_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `validation-mapping-2.0.xsd` with `validation-mapping-3.0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -613,9 +560,7 @@
       pattern: validation-mapping-2.0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `validation-configuration-2.0.xsd` with `validation-configuration-3.0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -635,9 +580,7 @@
       pattern: validation-configuration-2.0.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `persistence_2_1.xsd` with `persistence_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -657,9 +600,7 @@
       pattern: persistence_2_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `orm_2_1.xsd` with `orm_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -679,9 +620,7 @@
       pattern: orm_2_1.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE XSD with the Jakarta equivalent
-    Replace `orm_2_2.xsd` with `orm_3_0.xsd` and update the version attribute to `"3.0"`
+  description: Replace the Java EE XSD with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -701,9 +640,7 @@
       pattern: orm_2_2.xsd
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    In the root tag, replace the `version` attribute value `2.1` with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -728,9 +665,7 @@
         xpath: p:persistence[@version='2.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    In the root tag, replace the `version` attribute value `7` with `9`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -755,9 +690,7 @@
         xpath: p:permissions[@version='7']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `beans_1_1.xsd`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -783,9 +716,7 @@
         xpath: p:beans[@version='1.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `beans_2_0.xsd`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -811,9 +742,7 @@
         xpath: p:beans[@version='2.0']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `application_7.xsd`: In the root tag, replace the `version` attribute value with `9`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -839,9 +768,7 @@
         xpath: p:application[@version='7']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `application_8.xsd`: In the root tag, replace the `version` attribute value with `9`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -867,9 +794,7 @@
         xpath: p:application[@version='8']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `application-client_7.xsd`: In the root tag, replace the `version` attribute value with `9`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -895,9 +820,7 @@
         xpath: p:application-client[@version='7']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `application-client_8.xsd`: In the root tag, replace the `version` attribute value with `9`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -923,9 +846,7 @@
         xpath: p:application-client[@version='8']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `connector_1_7.xsd`: In the root tag, replace the `version` attribute value with `2.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -951,9 +872,7 @@
         xpath: p:connector[@version='1.7']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `ejb-jar_3_2.xsd`: In the root tag, replace the `version` attribute value with `4.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -979,9 +898,7 @@
         xpath: p:ejb-jar[@version='3.2']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `javaee_web_services_1_4.xsd`: In the root tag, replace the `version` attribute value with `2.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1007,9 +924,7 @@
         xpath: p:webservices[@version='1.4']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-app_3_1`: In the root tag, replace the `version` attribute value with `5.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1035,9 +950,7 @@
         xpath: p:web-app[@version='3.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-app_4_0`: In the root tag, replace the `version` attribute value with `5.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1063,9 +976,7 @@
         xpath: p:web-app[@version='4.0']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-fragment_3_1`: In the root tag, replace the `version` attribute value with `5.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1091,9 +1002,7 @@
         xpath: p:web-fragment[@version='3.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-fragment_4_0`: In the root tag, replace the `version` attribute value with `5.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1119,9 +1028,7 @@
         xpath: p:web-fragment[@version='4.0']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-facesconfig_2_2`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1147,9 +1054,7 @@
         xpath: p:faces-config[@version='2.2']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-facesconfig_2_3`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1175,9 +1080,7 @@
         xpath: p:faces-config[@version='2.3']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-facelettaglibrary_2_2`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1203,9 +1106,7 @@
         xpath: p:facelet-taglib[@version='2.2']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-facelettaglibrary_2_3`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1231,9 +1132,7 @@
         xpath: p:facelet-taglib[@version='2.3']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `web-jsptaglibrary_2_1`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1259,9 +1158,7 @@
         xpath: p:taglib[@version='2.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `validation-mapping-2.0`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1287,9 +1184,7 @@
         xpath: p:constraint-mappings[@version='2.0']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `validation-configuration-2.0`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1315,9 +1210,7 @@
         xpath: p:validation-config[@version='2.0']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `orm_2_1`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -1343,9 +1236,7 @@
         xpath: p:entity-mappings[@version='2.1']
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Java EE version with the Jakarta equivalent
-    `orm_2_2`: In the root tag, replace the `version` attribute value with `3.0`
+  description: Replace the Java EE version with the Jakarta equivalent
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
diff --git a/default/generated/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml b/default/generated/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml
index 2252a8a2..1fb5583f 100644
--- a/default/generated/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml
+++ b/default/generated/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Bootstrapping files prefixed with javax should be renamed to use the jakarta prefix
-    Replace the bootstrapping file name prefix `javax.` with `jakarta.`
+  description: Bootstrapping files prefixed with javax should be renamed to use the
+    jakarta prefix
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
diff --git a/default/generated/eap8/122-javax-to-jakarta-dependencies.windup.yaml b/default/generated/eap8/122-javax-to-jakarta-dependencies.windup.yaml
index 3c7ca053..dc825052 100644
--- a/default/generated/eap8/122-javax-to-jakarta-dependencies.windup.yaml
+++ b/default/generated/eap8/122-javax-to-jakarta-dependencies.windup.yaml
@@ -1,7 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |
-    javax.{renamed-g} groupId has been replaced by jakarta.{renamed-g}
+  description: javax.{renamed-g} groupId has been replaced by jakarta.{renamed-g}
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -21,8 +20,8 @@
       pattern: groupId>javax.(annotation|batch|ejb|el|enterprise.concurrent|enterprise.deploy|faces|interceptor|jms|jws|mail|management.j2ee|resource|security.auth.message|security.jacc|servlet|servlet.jsp|servlet.jsp.jstl|transaction|websocket|ws.rs|xml.bind|xml.registry|xml.rpc|xml.soap|xml.ws)<
 - category: mandatory
   customVariables: []
-  description: |
-    javax.{renamed-a} javax.{renamed-a}-api artifactId has been replaced by jakarta.{renamed-a} jakarta.{renamed-a}-api
+  description: javax.{renamed-a} javax.{renamed-a}-api artifactId has been replaced
+    by jakarta.{renamed-a} jakarta.{renamed-a}-api
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -42,9 +41,8 @@
       pattern: artifactId>javax.(activation|annotation|batch|ejb|el|enterprise.concurrent|enterprise.deploy|faces|interceptor|jms|jws|mail|management.j2ee|resource|security.auth.message|security.jacc|servlet|servlet.jsp|servlet.jsp.jstl|transaction|websocket|ws.rs|xml.registry|xml.rpc|xml.soap|xml.ws)-api<
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.xml.bind jaxb-api artifactId has been replaced by jakarta.xml.bind jakarta.xml.bind-api
-    Replace the `jaxb-api` artifact dependency with `jakarta.xml.bind-api`
+  description: javax.xml.bind jaxb-api artifactId has been replaced by jakarta.xml.bind
+    jakarta.xml.bind-api
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -63,9 +61,7 @@
       pattern: artifactId>jaxb-api<
 - category: mandatory
   customVariables: []
-  description: |-
-    javax.activation groupId has been replaced by jakarta.activation
-    Replace dependency groupId `javax.activation` with `jakarta.activation`
+  description: javax.activation groupId has been replaced by jakarta.activation
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -84,9 +80,8 @@
       name: javax.activation.javax.activation-api
 - category: mandatory
   customVariables: []
-  description: |-
-    org.glassfish javax.faces artifactId has been replaced by org.glassfish jakarta.faces
-    Replace the `javax.faces` artifactId with `jakarta.faces`
+  description: org.glassfish javax.faces artifactId has been replaced by org.glassfish
+    jakarta.faces
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -105,9 +100,7 @@
       pattern: artifactId>javax.faces<
 - category: mandatory
   customVariables: []
-  description: |-
-    javax groupId has been replaced by jakarta.platform
-    Update group dependency by replacing the `javax` groupId with `jakarta.platform`
+  description: javax groupId has been replaced by jakarta.platform
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -126,9 +119,7 @@
       pattern: groupId>javax<
 - category: mandatory
   customVariables: []
-  description: |-
-    javax javaee-api artifactId has been replaced by jakarta.platform jakarta.jakartaee-api
-    Update artifact dependency by replacing the `javaee-api` artifactId with `jakarta.jakartaee-api`
+  description: javax javaee-api artifactId has been replaced by jakarta.platform jakarta.jakartaee-api
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -148,9 +139,8 @@
       pattern: artifactId>javaee-api<
 - category: mandatory
   customVariables: []
-  description: |-
-    javax javaee-web-api artifactId has been replaced by jakarta.platform jakarta.jakartaee-web-api
-    Update artifact dependency by replacing the `javaee-web-api` artifactId with `jakarta.jakartaee-web-api`
+  description: javax javaee-web-api artifactId has been replaced by jakarta.platform
+    jakarta.jakartaee-web-api
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
diff --git a/default/generated/eap8/123-javax-to-jakarta-package.windup.yaml b/default/generated/eap8/123-javax-to-jakarta-package.windup.yaml
index 4a6ef582..7c70956e 100644
--- a/default/generated/eap8/123-javax-to-jakarta-package.windup.yaml
+++ b/default/generated/eap8/123-javax-to-jakarta-package.windup.yaml
@@ -3,8 +3,7 @@
   - name: renamed
     nameOfCaptureGroup: renamed
     pattern: javax.(?P<renamed>(activation|annotation|batch|decorator|ejb|el|enterprise|faces|inject|interceptor|jms|json|jws|mail|persistence|resource|security|servlet|transaction|validation|websocket|ws|xml))?.*
-  description: |
-    javax.{renamed} has been replaced by jakarta.{renamed}
+  description: javax.{renamed} has been replaced by jakarta.{renamed}
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -13,7 +12,7 @@
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: Replace the `javax.{{renamed}}` import statement with `jakarta.{{renamed}}`
+  message: 'Replace the `javax.{{renamed}}` import statement with `jakarta.{{renamed}}` '
   ruleID: javax-to-jakarta-import-00001
   when:
     as: javaClass
diff --git a/default/generated/eap8/124-javax-to-jakarta-properties.windup.yaml b/default/generated/eap8/124-javax-to-jakarta-properties.windup.yaml
index b406642d..8aac4661 100644
--- a/default/generated/eap8/124-javax-to-jakarta-properties.windup.yaml
+++ b/default/generated/eap8/124-javax-to-jakarta-properties.windup.yaml
@@ -1,7 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: "Rename properties prefixed by javax with jakarta \nRename properties
-    prefixed by `javax` with `jakarta`"
+  description: 'Rename properties prefixed by javax with jakarta '
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -12,7 +11,7 @@
   links:
   - title: Jakarta EE
     url: https://jakarta.ee/
-  message: Rename properties prefixed by `javax` with `jakarta`
+  message: 'Rename properties prefixed by `javax` with `jakarta` '
   ruleID: javax-to-jakarta-properties-00001
   when:
     builtin.filecontent:
diff --git a/default/generated/eap8/125-javax-to-jakarta-servlet.windup.yaml b/default/generated/eap8/125-javax-to-jakarta-servlet.windup.yaml
index 9bd2f35a..253412c6 100644
--- a/default/generated/eap8/125-javax-to-jakarta-servlet.windup.yaml
+++ b/default/generated/eap8/125-javax-to-jakarta-servlet.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The javax.servlet.SingleThreadModel interface has been removed
-    The `javax.servlet.SingleThreadModel` marker interface has been removed and servlets that implement this interface should remove. the interface declaration and ensure that the servlet code properly guards state and other resource access against concurrent access,. for example by avoiding the usage of an instance variable or synchronizing the block of code accessing resources. However, it is. strongly recommended that developers not synchronize the service method (or methods like `doGet` and `doPost` that it dispatches to). because of the detrimental effect of such synchronization on performance.
+  description: The javax.servlet.SingleThreadModel interface has been removed
   effort: 3
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -14,14 +12,14 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: The `javax.servlet.SingleThreadModel` marker interface has been removed
-    and servlets that implement this interface should remove. the interface declaration
+  message: "The `javax.servlet.SingleThreadModel` marker interface has been removed
+    and servlets that implement this interface should remove\n the interface declaration
     and ensure that the servlet code properly guards state and other resource access
-    against concurrent access,. for example by avoiding the usage of an instance variable
-    or synchronizing the block of code accessing resources. However, it is. strongly
-    recommended that developers not synchronize the service method (or methods like
-    `doGet` and `doPost` that it dispatches to). because of the detrimental effect
-    of such synchronization on performance.
+    against concurrent access,\n for example by avoiding the usage of an instance
+    variable or synchronizing the block of code accessing resources. However, it is\n
+    strongly recommended that developers not synchronize the service method (or methods
+    like `doGet` and `doPost` that it dispatches to)\n because of the detrimental
+    effect of such synchronization on performance.\n "
   ruleID: javax-to-jakarta-servlet-00010
   when:
     java.referenced:
@@ -29,9 +27,8 @@
       pattern: javax.servlet.SingleThreadModel
 - category: mandatory
   customVariables: []
-  description: |-
-    The javax.servlet.http.HttpSessionContext interface and its associated method in HttpSession have been removed
-    The `javax.servlet.http.HttpSessionContext` interface has been removed,. along with the `javax.servlet.http.HttpSession.getSessionContext()` method. Since Servlet 2.1 there have. been no use cases for this interface as its implementations were required by spec not to provide any usable data.
+  description: The javax.servlet.http.HttpSessionContext interface and its associated
+    method in HttpSession have been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -43,10 +40,10 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: The `javax.servlet.http.HttpSessionContext` interface has been removed,.
+  message: "The `javax.servlet.http.HttpSessionContext` interface has been removed,\n
     along with the `javax.servlet.http.HttpSession.getSessionContext()` method. Since
-    Servlet 2.1 there have. been no use cases for this interface as its implementations
-    were required by spec not to provide any usable data.
+    Servlet 2.1 there have\n been no use cases for this interface as its implementations
+    were required by spec not to provide any usable data.\n "
   ruleID: javax-to-jakarta-servlet-00020
   when:
     or:
@@ -58,9 +55,7 @@
         pattern: javax.servlet.http.HttpSession.getSessionContext*
 - category: mandatory
   customVariables: []
-  description: |-
-    The javax.servlet.http.HttpUtils utility class has been removed
-    The `javax.servlet.http.HttpUtils` utility class has been removed. Applications should use the ServletRequest. and HttpServletRequest interfaces instead of these methods it provided:. - `parseQueryString(String s)` and `parsePostData(int len, ServletInputStream in)` -- Use `ServletRequest.getParameterMap()`. If an application needs to differentiate between query string parameters and request body parameters it will need to implement code to do that itself, perhaps by parsing the query string itself.. - `getRequestURL(HttpServletRequest req)` -- Use `HttpServletRequest.getRequestURL()`.
+  description: The javax.servlet.http.HttpUtils utility class has been removed
   effort: 3
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -72,22 +67,20 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: The `javax.servlet.http.HttpUtils` utility class has been removed. Applications
-    should use the ServletRequest. and HttpServletRequest interfaces instead of these
-    methods it provided:. - `parseQueryString(String s)` and `parsePostData(int len,
+  message: "The `javax.servlet.http.HttpUtils` utility class has been removed. Applications
+    should use the ServletRequest\n and HttpServletRequest interfaces instead of these
+    methods it provided:\n - `parseQueryString(String s)` and `parsePostData(int len,
     ServletInputStream in)` -- Use `ServletRequest.getParameterMap()`. If an application
     needs to differentiate between query string parameters and request body parameters
     it will need to implement code to do that itself, perhaps by parsing the query
-    string itself.. - `getRequestURL(HttpServletRequest req)` -- Use `HttpServletRequest.getRequestURL()`.
+    string itself.\n - `getRequestURL(HttpServletRequest req)` -- Use `HttpServletRequest.getRequestURL()`.\n "
   ruleID: javax-to-jakarta-servlet-00030
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpUtils
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getServlet in javax.servlet.ServletContext method has been removed
-    Method getServlet in javax.servlet.ServletContext has been removed.
+  description: Method getServlet in javax.servlet.ServletContext method has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -99,7 +92,7 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getServlet in javax.servlet.ServletContext has been removed.
+  message: "\n Method getServlet in javax.servlet.ServletContext has been removed.\n "
   ruleID: javax-to-jakarta-servlet-00040
   when:
     or:
@@ -108,9 +101,7 @@
         pattern: javax.servlet.ServletContext.getServlet*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getServlets in javax.servlet.ServletContext has been removed
-    Method getServlets in javax.servlet.ServletContext has been removed.
+  description: Method getServlets in javax.servlet.ServletContext has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -122,7 +113,7 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getServlets in javax.servlet.ServletContext has been removed.
+  message: "\n Method getServlets in javax.servlet.ServletContext has been removed.\n "
   ruleID: javax-to-jakarta-servlet-00041
   when:
     or:
@@ -131,9 +122,7 @@
         pattern: javax.servlet.ServletContext.getServlets*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getServletNames in javax.servlet.ServletContext has been removed
-    Method getServletNames in javax.servlet.ServletContext has been removed.
+  description: Method getServletNames in javax.servlet.ServletContext has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -145,7 +134,7 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getServletNames in javax.servlet.ServletContext has been removed.
+  message: "\n Method getServletNames in javax.servlet.ServletContext has been removed.\n "
   ruleID: javax-to-jakarta-servlet-00042
   when:
     or:
@@ -154,9 +143,8 @@
         pattern: javax.servlet.ServletContext.getServletNames*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method log(Exception, String) in javax.servlet.ServletContext has been removed
-    Method log(Exception, String) in javax.servlet.ServletContext has been removed. Use log(String, Throwable) instead.
+  description: Method log(Exception, String) in javax.servlet.ServletContext has been
+    removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -168,8 +156,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method log(Exception, String) in javax.servlet.ServletContext has been
-    removed. Use log(String, Throwable) instead.
+  message: "\n Method log(Exception, String) in javax.servlet.ServletContext has been
+    removed. Use log(String, Throwable) instead.\n "
   ruleID: javax-to-jakarta-servlet-00043
   when:
     or:
@@ -177,9 +165,7 @@
         pattern: javax.servlet.ServletContext.log(java.lang.Exception, java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method in javax.servlet.ServletRequest has been removed
-    Method `getRealPath(String)` in javax.servlet.ServletRequest has been removed. It can be replaced with `ServletContext.getRealPath(String path)`.
+  description: Method in javax.servlet.ServletRequest has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -191,8 +177,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method `getRealPath(String)` in javax.servlet.ServletRequest has been removed.
-    It can be replaced with `ServletContext.getRealPath(String path)`.
+  message: "\n Method `getRealPath(String)` in javax.servlet.ServletRequest has been
+    removed. It can be replaced with `ServletContext.getRealPath(String path)`.\n "
   ruleID: javax-to-jakarta-servlet-00050
   when:
     java.referenced:
@@ -200,9 +186,7 @@
       pattern: javax.servlet.ServletRequest.getRealPath*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method in javax.servlet.ServletRequestWrapper has been removed
-    Method `getRealPath` in javax.servlet.ServletRequestWrapper has been removed. It can be replaced with `ServletContext.getRealPath(String path)`.
+  description: Method in javax.servlet.ServletRequestWrapper has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -214,17 +198,15 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method `getRealPath` in javax.servlet.ServletRequestWrapper has been removed.
-    It can be replaced with `ServletContext.getRealPath(String path)`.
+  message: "\n Method `getRealPath` in javax.servlet.ServletRequestWrapper has been
+    removed. It can be replaced with `ServletContext.getRealPath(String path)`.\n "
   ruleID: javax-to-jakarta-servlet-00060
   when:
     java.referenced:
       pattern: javax.servlet.ServletRequestWrapper.getRealPath(java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getServlet in javax.servlet.UnavailableException has been removed
-    Method getServlet in javax.servlet.UnavailableException has been removed.
+  description: Method getServlet in javax.servlet.UnavailableException has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -236,7 +218,7 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getServlet in javax.servlet.UnavailableException has been removed.
+  message: "\n Method getServlet in javax.servlet.UnavailableException has been removed.\n "
   ruleID: javax-to-jakarta-servlet-00070
   when:
     java.referenced:
@@ -244,9 +226,8 @@
       pattern: javax.servlet.UnavailableException.getServlet*
 - category: mandatory
   customVariables: []
-  description: |-
-    Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException has been removed
-    Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException has been removed. Use UnavailableException(String) instead.
+  description: Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -258,8 +239,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException
-    has been removed. Use UnavailableException(String) instead.
+  message: "\n Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException
+    has been removed. Use UnavailableException(String) instead.\n "
   ruleID: javax-to-jakarta-servlet-00071
   when:
     java.referenced:
@@ -267,9 +248,8 @@
       pattern: javax.servlet.UnavailableException(javax.servlet.Servlet*
 - category: mandatory
   customVariables: []
-  description: |-
-    Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException has been removed
-    Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException has been removed. Use UnavailableException(String, int) instead.
+  description: Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -281,8 +261,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException
-    has been removed. Use UnavailableException(String, int) instead.
+  message: "\n Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException
+    has been removed. Use UnavailableException(String, int) instead.\n "
   ruleID: javax-to-jakarta-servlet-00072
   when:
     java.referenced:
@@ -290,9 +270,8 @@
       pattern: javax.servlet.UnavailableException(int, javax.servlet.Servlet*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method isRequestedSessionIdFromUrl in javax.servlet.http.HttpServletRequest has been removed
-    Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequest has been removed. Use `isRequestedSessionIdFromURL()` instead.
+  description: Method isRequestedSessionIdFromUrl in javax.servlet.http.HttpServletRequest
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -304,8 +283,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequest
-    has been removed. Use `isRequestedSessionIdFromURL()` instead.
+  message: "\n Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequest
+    has been removed. Use `isRequestedSessionIdFromURL()` instead.\n "
   ruleID: javax-to-jakarta-servlet-00080
   when:
     java.referenced:
@@ -313,9 +292,8 @@
       pattern: javax.servlet.http.HttpServletRequest.isRequestedSessionIdFromUrl*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method isRequestedSessionIdFromUrl in javax.servlet.http.HttpServletRequestWrapper has been removed
-    Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequestWrapper has been removed. Use `isRequestedSessionIdFromURL()` instead.
+  description: Method isRequestedSessionIdFromUrl in javax.servlet.http.HttpServletRequestWrapper
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -327,8 +305,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequestWrapper
-    has been removed. Use `isRequestedSessionIdFromURL()` instead.
+  message: "\n Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequestWrapper
+    has been removed. Use `isRequestedSessionIdFromURL()` instead.\n "
   ruleID: javax-to-jakarta-servlet-00090
   when:
     java.referenced:
@@ -336,9 +314,8 @@
       pattern: javax.servlet.http.HttpServletRequestWrapper.isRequestedSessionIdFromUrl*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method encodeUrl in javax.servlet.http.HttpServletResponse has been removed
-    Method encodeURL in javax.servlet.http.HttpServletResponse has been removed. Use encodeURL(String) instead.
+  description: Method encodeUrl in javax.servlet.http.HttpServletResponse has been
+    removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -350,17 +327,16 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method encodeURL in javax.servlet.http.HttpServletResponse has been removed.
-    Use encodeURL(String) instead.
+  message: "\n Method encodeURL in javax.servlet.http.HttpServletResponse has been
+    removed. Use encodeURL(String) instead.\n "
   ruleID: javax-to-jakarta-servlet-00100
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponse.encodeUrl(java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method encodeRedirectUrl in javax.servlet.http.HttpServletResponse has been removed
-    Method encodeRedirectUrl(String) in javax.servlet.http.HttpServletResponse has been removed. Use encodeRedirectURL(String) instead.
+  description: Method encodeRedirectUrl in javax.servlet.http.HttpServletResponse
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -372,17 +348,16 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method encodeRedirectUrl(String) in javax.servlet.http.HttpServletResponse
-    has been removed. Use encodeRedirectURL(String) instead.
+  message: "\n Method encodeRedirectUrl(String) in javax.servlet.http.HttpServletResponse
+    has been removed. Use encodeRedirectURL(String) instead.\n "
   ruleID: javax-to-jakarta-servlet-00101
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponse.encodeRedirectUrl(java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method setStatus(int, String) in javax.servlet.http.HttpServletResponse has been removed
-    Method setStatus(int, String) in javax.servlet.http.HttpServletResponse has been removed. Use sendError(int, String) instead.
+  description: Method setStatus(int, String) in javax.servlet.http.HttpServletResponse
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -394,17 +369,16 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method setStatus(int, String) in javax.servlet.http.HttpServletResponse
-    has been removed. Use sendError(int, String) instead.
+  message: "\n Method setStatus(int, String) in javax.servlet.http.HttpServletResponse
+    has been removed. Use sendError(int, String) instead.\n "
   ruleID: javax-to-jakarta-servlet-00102
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponse.setStatus(int, java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has been removed
-    Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has been removed. Use encodeURL instead.
+  description: Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has
+    been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -416,17 +390,16 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has been
-    removed. Use encodeURL instead.
+  message: "\n Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has
+    been removed. Use encodeURL instead.\n "
   ruleID: javax-to-jakarta-servlet-00110
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponseWrapper.encodeUrl(java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper has been removed
-    Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper has been removed. Use encodeRedirectURL instead.
+  description: Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -438,17 +411,16 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper
-    has been removed. Use encodeRedirectURL instead.
+  message: "\n Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper
+    has been removed. Use encodeRedirectURL instead.\n "
   ruleID: javax-to-jakarta-servlet-00111
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponseWrapper.encodeRedirectUrl(java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper has been removed
-    Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper has been removed. Use sendError(int, String) instead.
+  description: Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper
+    has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -460,17 +432,15 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper
-    has been removed. Use sendError(int, String) instead.
+  message: "\n Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper
+    has been removed. Use sendError(int, String) instead.\n "
   ruleID: javax-to-jakarta-servlet-00112
   when:
     java.referenced:
       pattern: javax.servlet.http.HttpServletResponseWrapper.setStatus(int, java.lang.String)
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getValue in javax.servlet.http.HttpSession has been removed
-    Method getValue in javax.servlet.http.HttpSession has been removed. Use getAttribute instead.
+  description: Method getValue in javax.servlet.http.HttpSession has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -482,8 +452,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getValue in javax.servlet.http.HttpSession has been removed. Use
-    getAttribute instead.
+  message: "\n Method getValue in javax.servlet.http.HttpSession has been removed.
+    Use getAttribute instead.\n "
   ruleID: javax-to-jakarta-servlet-00120
   when:
     java.referenced:
@@ -491,9 +461,7 @@
       pattern: javax.servlet.http.HttpSession.getValue*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method getValueNames in javax.servlet.http.HttpSession has been removed
-    Method getValueNames in javax.servlet.http.HttpSession has been removed. Use getAttributeNames instead.
+  description: Method getValueNames in javax.servlet.http.HttpSession has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -505,8 +473,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method getValueNames in javax.servlet.http.HttpSession has been removed.
-    Use getAttributeNames instead.
+  message: "\n Method getValueNames in javax.servlet.http.HttpSession has been removed.
+    Use getAttributeNames instead.\n "
   ruleID: javax-to-jakarta-servlet-00121
   when:
     java.referenced:
@@ -514,9 +482,7 @@
       pattern: javax.servlet.http.HttpSession.getValueNames*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method putValue in javax.servlet.http.HttpSession has been removed
-    Method putValue in javax.servlet.http.HttpSession has been removed. Use setAttribute instead.
+  description: Method putValue in javax.servlet.http.HttpSession has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -528,8 +494,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method putValue in javax.servlet.http.HttpSession has been removed. Use
-    setAttribute instead.
+  message: "\n Method putValue in javax.servlet.http.HttpSession has been removed.
+    Use setAttribute instead.\n "
   ruleID: javax-to-jakarta-servlet-00122
   when:
     java.referenced:
@@ -537,9 +503,7 @@
       pattern: javax.servlet.http.HttpSession.putValue*
 - category: mandatory
   customVariables: []
-  description: |-
-    Method removeValue in javax.servlet.http.HttpSession has been removed
-    Method removeValue in javax.servlet.http.HttpSession has been removed. Use removeAttribute instead.
+  description: Method removeValue in javax.servlet.http.HttpSession has been removed
   effort: 1
   labels:
   - konveyor.io/target=jakarta-ee9+
@@ -551,8 +515,8 @@
   - title: Red Hat JBoss EAP Application Migration from Jakarta EE 8 to EE 10 - Jakarta
       Servlet
     url: https://access.redhat.com/articles/6980265#servlet
-  message: Method removeValue in javax.servlet.http.HttpSession has been removed.
-    Use removeAttribute instead.
+  message: "\n Method removeValue in javax.servlet.http.HttpSession has been removed.
+    Use removeAttribute instead.\n "
   ruleID: javax-to-jakarta-servlet-00123
   when:
     java.referenced:
diff --git a/default/generated/eap8/126-jboss-dependencies.windup.yaml b/default/generated/eap8/126-jboss-dependencies.windup.yaml
index 368e3776..c042817a 100644
--- a/default/generated/eap8/126-jboss-dependencies.windup.yaml
+++ b/default/generated/eap8/126-jboss-dependencies.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-eap-jakartaee8 artifact with jboss-eap-ee
-    Update the dependency by replacing the group `org.jboss.bom` artifact `jboss-eap-jakartaee8`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  description: Replace jboss-eap-jakartaee8 artifact with jboss-eap-ee
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -10,8 +8,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.bom` artifact `jboss-eap-jakartaee8`.
-    with group `org.jboss.bom` artifact `jboss-eap-ee`
+  message: "Update the dependency by replacing the group `org.jboss.bom` artifact
+    `jboss-eap-jakartaee8` \n with group `org.jboss.bom` artifact `jboss-eap-ee`"
   ruleID: jboss-dependencies-00001
   when:
     java.dependency:
@@ -19,9 +17,7 @@
       name: org.jboss.bom.jboss-eap-jakartaee8
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-eap-jakartaee8-with-tools artifact with jboss-eap-ee-with-tools
-    Update the dependency by replacing the group `org.jboss.bom` artifcat `jboss-eap-jakartaee8-with-tools`. with group `org.jboss.bom` artifact `jboss-eap-ee-with-tools`
+  description: Replace jboss-eap-jakartaee8-with-tools artifact with jboss-eap-ee-with-tools
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -29,8 +25,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.bom` artifcat `jboss-eap-jakartaee8-with-tools`.
-    with group `org.jboss.bom` artifact `jboss-eap-ee-with-tools`
+  message: "Update the dependency by replacing the group `org.jboss.bom` artifcat
+    `jboss-eap-jakartaee8-with-tools` \n with group `org.jboss.bom` artifact `jboss-eap-ee-with-tools`"
   ruleID: jboss-dependencies-00002
   when:
     java.dependency:
@@ -38,9 +34,7 @@
       name: org.jboss.bom.jboss-eap-jakartaee8-with-tools
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jakartaee-8.0 artifact with jboss-eap-ee
-    Update the dependency by replacing the group `org.jboss.spec` artifact `jboss-jakartaee-8.0`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  description: Replace jboss-jakartaee-8.0 artifact with jboss-eap-ee
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -48,8 +42,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec` artifact
-    `jboss-jakartaee-8.0`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  message: "Update the dependency by replacing the group `org.jboss.spec` artifact
+    `jboss-jakartaee-8.0` \n with group `org.jboss.bom` artifact `jboss-eap-ee`"
   ruleID: jboss-dependencies-00003
   when:
     java.dependency:
@@ -57,9 +51,7 @@
       name: org.jboss.spec.jboss-jakartaee-8.0
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jakartaee-web-8.0 artifact with jboss-eap-ee
-    Update the dependency by replacing the group `org.jboss.spec` artifact `jboss-jakartaee-web-8.0`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  description: Replace jboss-jakartaee-web-8.0 artifact with jboss-eap-ee
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -67,8 +59,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec` artifact
-    `jboss-jakartaee-web-8.0`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  message: "Update the dependency by replacing the group `org.jboss.spec` artifact
+    `jboss-jakartaee-web-8.0` \n with group `org.jboss.bom` artifact `jboss-eap-ee`"
   ruleID: jboss-dependencies-00004
   when:
     java.dependency:
@@ -76,9 +68,7 @@
       name: org.jboss.spec.jboss-jakartaee-web-8.0
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jakarta.activation artifact with jakarta.activation-api
-    Update the dependency by replacing the group `com.sun.activation` artifact `jakarta.activation`. with group `jakarta.activation` artifact `jakarta.activation-api`
+  description: Replace jakarta.activation artifact with jakarta.activation-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -86,8 +76,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `com.sun.activation` artifact
-    `jakarta.activation`. with group `jakarta.activation` artifact `jakarta.activation-api`
+  message: "Update the dependency by replacing the group `com.sun.activation` artifact
+    `jakarta.activation` \n with group `jakarta.activation` artifact `jakarta.activation-api`"
   ruleID: jboss-dependencies-00005
   when:
     java.dependency:
@@ -95,9 +85,7 @@
       name: com.sun.activation.jakarta.activation
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-annotations-api_1.3_spec artifact with jakarta.annotation-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.annotation` artifact `jboss-annotations-api_1.3_spec`. with group `jakarta.annotation` artifact `jakarta.annotation-api`
+  description: Replace jboss-annotations-api_1.3_spec artifact with jakarta.annotation-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -105,9 +93,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.annotation`
-    artifact `jboss-annotations-api_1.3_spec`. with group `jakarta.annotation` artifact
-    `jakarta.annotation-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.annotation`
+    artifact `jboss-annotations-api_1.3_spec` \n with group `jakarta.annotation` artifact
+    `jakarta.annotation-api`"
   ruleID: jboss-dependencies-00006
   when:
     java.dependency:
@@ -115,9 +103,7 @@
       name: org.jboss.spec.javax.annotation.jboss-annotations-api_1.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jaspi-api_1.0_spec artifact with jakarta.authentication-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.security.auth.message` artifact `jboss-jaspi-api_1.0_spec`. with group `jakarta.authentication` artifact `jakarta.authentication-api`
+  description: Replace jboss-jaspi-api_1.0_spec artifact with jakarta.authentication-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -125,9 +111,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.security.auth.message`
-    artifact `jboss-jaspi-api_1.0_spec`. with group `jakarta.authentication` artifact
-    `jakarta.authentication-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.security.auth.message`
+    artifact `jboss-jaspi-api_1.0_spec` \n with group `jakarta.authentication` artifact
+    `jakarta.authentication-api`"
   ruleID: jboss-dependencies-00007
   when:
     java.dependency:
@@ -135,9 +121,7 @@
       name: org.jboss.spec.javax.security.auth.message.jboss-jaspi-api_1.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jacc-api_1.5_spec artifact with jakarta.authorization-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.security.jacc` artifact `jboss-jacc-api_1.5_spec`. with group `jakarta.authorization` artifact `jakarta.authorization-api`
+  description: Replace jboss-jacc-api_1.5_spec artifact with jakarta.authorization-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -145,9 +129,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.security.jacc`
-    artifact `jboss-jacc-api_1.5_spec`. with group `jakarta.authorization` artifact
-    `jakarta.authorization-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.security.jacc`
+    artifact `jboss-jacc-api_1.5_spec` \n with group `jakarta.authorization` artifact
+    `jakarta.authorization-api`"
   ruleID: jboss-dependencies-00008
   when:
     java.dependency:
@@ -155,9 +139,7 @@
       name: org.jboss.spec.javax.security.jacc.jboss-jacc-api_1.5_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-batch-api_1.0_spec artifact with jakarta.batch-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.batch` artifact `jboss-batch-api_1.0_spec`. with group `jakarta.batch` artifact `jakarta.batch-api`
+  description: Replace jboss-batch-api_1.0_spec artifact with jakarta.batch-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -165,8 +147,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.batch`
-    artifact `jboss-batch-api_1.0_spec`. with group `jakarta.batch` artifact `jakarta.batch-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.batch`
+    artifact `jboss-batch-api_1.0_spec` \n with group `jakarta.batch` artifact `jakarta.batch-api`"
   ruleID: jboss-dependencies-00009
   when:
     java.dependency:
@@ -174,9 +156,7 @@
       name: org.jboss.spec.javax.batch.jboss-batch-api_1.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-ejb-api_3.2_spec artifact with jakarta.ejb-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.ejb` artifact `jboss-ejb-api_3.2_spec`. with group `jakarta.ejb` artifact `jakarta.ejb-api`
+  description: Replace jboss-ejb-api_3.2_spec artifact with jakarta.ejb-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -184,8 +164,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.ejb`
-    artifact `jboss-ejb-api_3.2_spec`. with group `jakarta.ejb` artifact `jakarta.ejb-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.ejb`
+    artifact `jboss-ejb-api_3.2_spec` \n with group `jakarta.ejb` artifact `jakarta.ejb-api`"
   ruleID: jboss-dependencies-00010
   when:
     java.dependency:
@@ -193,9 +173,7 @@
       name: org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-el-api_3.0_spec artifact with jboss-el-api_5.0_spec
-    Update the dependency by replacing the group `org.jboss.spec.javax.el` artifact `jboss-el-api_3.0_spec`. with group `org.jboss.spec.jakarta.el` artifact `jboss-el-api_5.0_spec`
+  description: Replace jboss-el-api_3.0_spec artifact with jboss-el-api_5.0_spec
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -203,9 +181,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.el`
-    artifact `jboss-el-api_3.0_spec`. with group `org.jboss.spec.jakarta.el` artifact
-    `jboss-el-api_5.0_spec`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.el`
+    artifact `jboss-el-api_3.0_spec` \n with group `org.jboss.spec.jakarta.el` artifact
+    `jboss-el-api_5.0_spec`"
   ruleID: jboss-dependencies-00011
   when:
     java.dependency:
@@ -213,9 +191,7 @@
       name: org.jboss.spec.javax.el.jboss-el-api_3.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-concurrency-api_1.0_spec artifact with jakarta.enterprise.concurrent-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.enterprise.concurrent` artifact `jboss-concurrency-api_1.0_spec`. with group `jakarta.enterprise.concurrent` artifact `jakarta.enterprise.concurrent-api`
+  description: Replace jboss-concurrency-api_1.0_spec artifact with jakarta.enterprise.concurrent-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -223,9 +199,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.enterprise.concurrent`
-    artifact `jboss-concurrency-api_1.0_spec`. with group `jakarta.enterprise.concurrent`
-    artifact `jakarta.enterprise.concurrent-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.enterprise.concurrent`
+    artifact `jboss-concurrency-api_1.0_spec` \n with group `jakarta.enterprise.concurrent`
+    artifact `jakarta.enterprise.concurrent-api`"
   ruleID: jboss-dependencies-00012
   when:
     java.dependency:
@@ -233,9 +209,7 @@
       name: org.jboss.spec.javax.enterprise.concurrent.jboss-concurrency-api_1.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jsf-api_2.3_spec artifact with jakarta.faces-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.faces` artifact `jboss-jsf-api_2.3_spec`. with group `jakarta.faces` artifact `jakarta.faces-api`
+  description: Replace jboss-jsf-api_2.3_spec artifact with jakarta.faces-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -243,8 +217,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.faces`
-    artifact `jboss-jsf-api_2.3_spec`. with group `jakarta.faces` artifact `jakarta.faces-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.faces`
+    artifact `jboss-jsf-api_2.3_spec` \n with group `jakarta.faces` artifact `jakarta.faces-api`"
   ruleID: jboss-dependencies-00013
   when:
     java.dependency:
@@ -252,9 +226,7 @@
       name: org.jboss.spec.javax.faces.jboss-jsf-api_2.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-interceptors-api_1.2_spec artifact with jakarta.interceptor-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.interceptor` artifact `jboss-interceptors-api_1.2_spec`. with group `jakarta.interceptor` artifact `jakarta.interceptor-api`
+  description: Replace jboss-interceptors-api_1.2_spec artifact with jakarta.interceptor-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -262,9 +234,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.interceptor`
-    artifact `jboss-interceptors-api_1.2_spec`. with group `jakarta.interceptor` artifact
-    `jakarta.interceptor-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.interceptor`
+    artifact `jboss-interceptors-api_1.2_spec` \n with group `jakarta.interceptor`
+    artifact `jakarta.interceptor-api`"
   ruleID: jboss-dependencies-00014
   when:
     java.dependency:
@@ -272,9 +244,7 @@
       name: org.jboss.spec.javax.interceptor.jboss-interceptors-api_1.2_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jms-api_2.0_spec artifact with jakarta.jms-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.jms` artifact `jboss-jms-api_2.0_spec`. with group `jakarta.jms` artifact `jakarta.jms-api`
+  description: Replace jboss-jms-api_2.0_spec artifact with jakarta.jms-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -282,8 +252,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.jms`
-    artifact `jboss-jms-api_2.0_spec`. with group `jakarta.jms` artifact `jakarta.jms-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.jms`
+    artifact `jboss-jms-api_2.0_spec` \n with group `jakarta.jms` artifact `jakarta.jms-api`"
   ruleID: jboss-dependencies-00015
   when:
     java.dependency:
@@ -291,9 +261,7 @@
       name: org.jboss.spec.javax.jms.jboss-jms-api_2.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jakarta.mail artifact with jakarta.mail-api
-    Update the dependency by replacing the group `com.sun.mail` artifact `jakarta.mail`. with group `jakarta.mail` artifact `jakarta.mail-api`
+  description: Replace jakarta.mail artifact with jakarta.mail-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -301,8 +269,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `com.sun.mail` artifact `jakarta.mail`.
-    with group `jakarta.mail` artifact `jakarta.mail-api`
+  message: "Update the dependency by replacing the group `com.sun.mail` artifact `jakarta.mail`
+    \n with group `jakarta.mail` artifact `jakarta.mail-api`"
   ruleID: jboss-dependencies-00016
   when:
     java.dependency:
@@ -310,9 +278,7 @@
       name: com.sun.mail.jakarta.mail
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-connector-api_1.7_spec artifact with jakarta.resource-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.resource` artifact `jboss-connector-api_1.7_spec`. with group `jakarta.resource` artifact `jakarta.resource-api`
+  description: Replace jboss-connector-api_1.7_spec artifact with jakarta.resource-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -320,9 +286,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.resource`
-    artifact `jboss-connector-api_1.7_spec`. with group `jakarta.resource` artifact
-    `jakarta.resource-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.resource`
+    artifact `jboss-connector-api_1.7_spec` \n with group `jakarta.resource` artifact
+    `jakarta.resource-api`"
   ruleID: jboss-dependencies-00017
   when:
     java.dependency:
@@ -330,9 +296,7 @@
       name: org.jboss.spec.javax.resource.jboss-connector-api_1.7_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-servlet-api_4.0_spec artifact with jakarta.servlet-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.servlet` artifact `jboss-servlet-api_4.0_spec`. with group `jakarta.servlet` artifact `jakarta.servlet-api`
+  description: Replace jboss-servlet-api_4.0_spec artifact with jakarta.servlet-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -340,8 +304,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.servlet`
-    artifact `jboss-servlet-api_4.0_spec`. with group `jakarta.servlet` artifact `jakarta.servlet-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.servlet`
+    artifact `jboss-servlet-api_4.0_spec` \n with group `jakarta.servlet` artifact
+    `jakarta.servlet-api`"
   ruleID: jboss-dependencies-00018
   when:
     java.dependency:
@@ -349,9 +314,7 @@
       name: org.jboss.spec.javax.servlet.jboss-servlet-api_4.0_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jsp-api_2.3_spec artifact with jakarta.servlet.jsp-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.servlet.jsp` artifact `jboss-jsp-api_2.3_spec`. with group `jakarta.servlet.jsp` artifact `jakarta.servlet.jsp-api`
+  description: Replace jboss-jsp-api_2.3_spec artifact with jakarta.servlet.jsp-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -359,8 +322,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.servlet.jsp`
-    artifact `jboss-jsp-api_2.3_spec`. with group `jakarta.servlet.jsp` artifact `jakarta.servlet.jsp-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.servlet.jsp`
+    artifact `jboss-jsp-api_2.3_spec` \n with group `jakarta.servlet.jsp` artifact
+    `jakarta.servlet.jsp-api`"
   ruleID: jboss-dependencies-00019
   when:
     java.dependency:
@@ -368,9 +332,7 @@
       name: org.jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace taglibs-standard-spec artifact with jakarta.servlet.jsp.jstl-api
-    Update the dependency by replacing the group `org.apache.taglibs` artifact `taglibs-standard-spec`. with group `jakarta.servlet.jsp.jstl` artifact `jakarta.servlet.jsp.jstl-api`
+  description: Replace taglibs-standard-spec artifact with jakarta.servlet.jsp.jstl-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -378,8 +340,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.apache.taglibs` artifact
-    `taglibs-standard-spec`. with group `jakarta.servlet.jsp.jstl` artifact `jakarta.servlet.jsp.jstl-api`
+  message: "Update the dependency by replacing the group `org.apache.taglibs` artifact
+    `taglibs-standard-spec` \n with group `jakarta.servlet.jsp.jstl` artifact `jakarta.servlet.jsp.jstl-api`"
   ruleID: jboss-dependencies-00020
   when:
     java.dependency:
@@ -387,9 +349,7 @@
       name: org.apache.taglibs.taglibs-standard-spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-transaction-api_1.3_spec artifact with jakarta.transaction-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.transaction` artifact `jboss-transaction-api_1.3_spec`. with group `jakarta.transaction` artifact `jakarta.transaction-api`
+  description: Replace jboss-transaction-api_1.3_spec artifact with jakarta.transaction-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -397,9 +357,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.transaction`
-    artifact `jboss-transaction-api_1.3_spec`. with group `jakarta.transaction` artifact
-    `jakarta.transaction-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.transaction`
+    artifact `jboss-transaction-api_1.3_spec` \n with group `jakarta.transaction`
+    artifact `jakarta.transaction-api`"
   ruleID: jboss-dependencies-00021
   when:
     java.dependency:
@@ -407,9 +367,7 @@
       name: org.jboss.spec.javax.transaction.jboss-transaction-api_1.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jaxb-api_2.3_spec artifact with jakarta.xml.bind-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.xml.bind` artifact `jboss-jaxb-api_2.3_spec`. with group `jakarta.xml.bind` artifact `jakarta.xml.bind-api`
+  description: Replace jboss-jaxb-api_2.3_spec artifact with jakarta.xml.bind-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -417,8 +375,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.xml.bind`
-    artifact `jboss-jaxb-api_2.3_spec`. with group `jakarta.xml.bind` artifact `jakarta.xml.bind-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.xml.bind`
+    artifact `jboss-jaxb-api_2.3_spec` \n with group `jakarta.xml.bind` artifact `jakarta.xml.bind-api`"
   ruleID: jboss-dependencies-00022
   when:
     java.dependency:
@@ -426,9 +384,7 @@
       name: org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jaxws-api_2.3_spec artifact with jboss-jakarta-xml-ws-api_4.0_spec
-    Update the dependency by replacing the group `org.jboss.spec.javax.xml.ws` artifact `jboss-jaxws-api_2.3_spec`. with group `org.jboss.spec.jakarta.xml.ws` artifact `jboss-jakarta-xml-ws-api_4.0_spec`
+  description: Replace jboss-jaxws-api_2.3_spec artifact with jboss-jakarta-xml-ws-api_4.0_spec
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -436,9 +392,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.xml.ws`
-    artifact `jboss-jaxws-api_2.3_spec`. with group `org.jboss.spec.jakarta.xml.ws`
-    artifact `jboss-jakarta-xml-ws-api_4.0_spec`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.xml.ws`
+    artifact `jboss-jaxws-api_2.3_spec` \n with group `org.jboss.spec.jakarta.xml.ws`
+    artifact `jboss-jakarta-xml-ws-api_4.0_spec`"
   ruleID: jboss-dependencies-00023
   when:
     java.dependency:
@@ -446,9 +402,7 @@
       name: org.jboss.spec.javax.xml.ws.jboss-jaxws-api_2.3_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-websocket-api_1.1_spec artifact with jakarta.websocket-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.websocket` artifact `jboss-websocket-api_1.1_spec`. with group `jakarta.websocket` artifact `jakarta.websocket-api`
+  description: Replace jboss-websocket-api_1.1_spec artifact with jakarta.websocket-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -456,9 +410,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.websocket`
-    artifact `jboss-websocket-api_1.1_spec`. with group `jakarta.websocket` artifact
-    `jakarta.websocket-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.websocket`
+    artifact `jboss-websocket-api_1.1_spec` \n with group `jakarta.websocket` artifact
+    `jakarta.websocket-api`"
   ruleID: jboss-dependencies-00024
   when:
     java.dependency:
@@ -466,9 +420,7 @@
       name: org.jboss.spec.javax.websocket.jboss-websocket-api_1.1_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-jaxrs-api_2.1_spec artifact with jakarta.ws.rs-api
-    Update the dependency by replacing the group `org.jboss.spec.javax.ws.rs` artifact `jboss-jaxrs-api_2.1_spec`. with group `jakarta.ws.rs` artifact `jakarta.ws.rs-api`
+  description: Replace jboss-jaxrs-api_2.1_spec artifact with jakarta.ws.rs-api
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -476,8 +428,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.ws.rs`
-    artifact `jboss-jaxrs-api_2.1_spec`. with group `jakarta.ws.rs` artifact `jakarta.ws.rs-api`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.ws.rs`
+    artifact `jboss-jaxrs-api_2.1_spec` \n with group `jakarta.ws.rs` artifact `jakarta.ws.rs-api`"
   ruleID: jboss-dependencies-00025
   when:
     java.dependency:
@@ -485,9 +437,7 @@
       name: org.jboss.spec.javax.ws.rs.jboss-jaxrs-api_2.1_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jboss-saaj-api_1.4_spec artifact with jboss-saaj-api_3.0_spec
-    Update the dependency by replacing the group `org.jboss.spec.javax.xml.soap` artifact `jboss-saaj-api_1.4_spec`. with group `org.jboss.spec.jakarta.xml.soap` artifact `jboss-saaj-api_3.0_spec`
+  description: Replace jboss-saaj-api_1.4_spec artifact with jboss-saaj-api_3.0_spec
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -495,9 +445,9 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.spec.javax.xml.soap`
-    artifact `jboss-saaj-api_1.4_spec`. with group `org.jboss.spec.jakarta.xml.soap`
-    artifact `jboss-saaj-api_3.0_spec`
+  message: "Update the dependency by replacing the group `org.jboss.spec.javax.xml.soap`
+    artifact `jboss-saaj-api_1.4_spec` \n with group `org.jboss.spec.jakarta.xml.soap`
+    artifact `jboss-saaj-api_3.0_spec`"
   ruleID: jboss-dependencies-00026
   when:
     java.dependency:
@@ -505,9 +455,7 @@
       name: org.jboss.spec.javax.xml.soap.jboss-saaj-api_1.4_spec
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace org.hibernate group with org.hibernate.orm
-    Update the dependency by replacing the group `org.hibernate` artifact `hibernate-core`. with group `org.hibernate.orm` artifact `hibernate-core`
+  description: Replace org.hibernate group with org.hibernate.orm
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -515,8 +463,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.hibernate` artifact `hibernate-core`.
-    with group `org.hibernate.orm` artifact `hibernate-core`
+  message: "Update the dependency by replacing the group `org.hibernate` artifact
+    `hibernate-core` \n with group `org.hibernate.orm` artifact `hibernate-core`"
   ruleID: jboss-dependencies-00027
   when:
     java.dependency:
@@ -524,9 +472,7 @@
       name: org.hibernate.hibernate-core
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace org.hibernate group with org.hibernate.orm
-    Update the dependency by replacing the group `org.hibernate` artifact `hibernate-jpamodelgen`. with group `org.hibernate.orm` artifact `hibernate-jpamodelgen`
+  description: Replace org.hibernate group with org.hibernate.orm
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -534,8 +480,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.hibernate` artifact `hibernate-jpamodelgen`.
-    with group `org.hibernate.orm` artifact `hibernate-jpamodelgen`
+  message: "Update the dependency by replacing the group `org.hibernate` artifact
+    `hibernate-jpamodelgen` \n with group `org.hibernate.orm` artifact `hibernate-jpamodelgen`"
   ruleID: jboss-dependencies-00028
   when:
     java.dependency:
@@ -543,9 +489,7 @@
       name: org.hibernate.hibernate-jpamodelgen
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jbossxts artifact with jbossxts-jakarta
-    Update the dependency by replacing the group `org.jboss.narayana.xts` artifact `jbossxts`. with group `org.jboss.narayana.xts` artifact `jbossxts-jakarta`
+  description: Replace jbossxts artifact with jbossxts-jakarta
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -553,8 +497,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.narayana.xts` artifact
-    `jbossxts`. with group `org.jboss.narayana.xts` artifact `jbossxts-jakarta`
+  message: "Update the dependency by replacing the group `org.jboss.narayana.xts`
+    artifact `jbossxts` \n with group `org.jboss.narayana.xts` artifact `jbossxts-jakarta`"
   ruleID: jboss-dependencies-00029
   when:
     java.dependency:
@@ -562,9 +506,7 @@
       name: org.jboss.narayana.xts.jbossxts
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace eap-runtime-artifacts artifact with jboss-eap-ee
-    Update the dependency by replacing the group `org.jboss.bom` artifact `eap-runtime-artifacts`. with group `org.jboss.bom` artifact `jboss-eap-ee`
+  description: Replace eap-runtime-artifacts artifact with jboss-eap-ee
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -572,8 +514,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `org.jboss.bom` artifact `eap-runtime-artifacts`.
-    with group `org.jboss.bom` artifact `jboss-eap-ee`
+  message: "Update the dependency by replacing the group `org.jboss.bom` artifact
+    `eap-runtime-artifacts` \n with group `org.jboss.bom` artifact `jboss-eap-ee`"
   ruleID: jboss-dependencies-00030
   when:
     java.dependency:
@@ -581,9 +523,7 @@
       name: org.jboss.bom.eap-runtime-artifacts
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace jsr181-api artifact with jboss-jakarta-xml-ws-api_4.0_spec
-    Update the dependency by replacing the group `javax.jws` artifact `jsr181-api`. with group `org.jboss.spec.jakarta.xml.ws` artifact `jboss-jakarta-xml-ws-api_4.0_spec`
+  description: Replace jsr181-api artifact with jboss-jakarta-xml-ws-api_4.0_spec
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
@@ -591,8 +531,8 @@
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: Update the dependency by replacing the group `javax.jws` artifact `jsr181-api`.
-    with group `org.jboss.spec.jakarta.xml.ws` artifact `jboss-jakarta-xml-ws-api_4.0_spec`
+  message: "Update the dependency by replacing the group `javax.jws` artifact `jsr181-api`
+    \n with group `org.jboss.spec.jakarta.xml.ws` artifact `jboss-jakarta-xml-ws-api_4.0_spec`"
   ruleID: jboss-dependencies-00031
   when:
     java.dependency:
diff --git a/default/generated/eap8/127-keycloak-openid.windup.yaml b/default/generated/eap8/127-keycloak-openid.windup.yaml
index d627ef74..03aaca40 100644
--- a/default/generated/eap8/127-keycloak-openid.windup.yaml
+++ b/default/generated/eap8/127-keycloak-openid.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Update the 'auth-method' configuration from KEYCLOAK to OIDC
-    In order to add support for EAP native OpenID Connect, the `auth-method` must be updated to `OIDC`.
+  description: Update the 'auth-method' configuration from KEYCLOAK to OIDC
   effort: 1
   labels:
   - konveyor.io/source=eap6
@@ -22,9 +20,7 @@
       xpath: /web-app/login-config/auth-method[text()='KEYCLOAK']
 - category: mandatory
   customVariables: []
-  description: |-
-    Rename the keycloak.json configuration file to oidc.json
-    In order to add support for EAP native OpenID Connect, the `WEB-INF/keycloak.json` file must be renamed to `WEB-INF/oidc.json`.
+  description: Rename the keycloak.json configuration file to oidc.json
   effort: 1
   labels:
   - konveyor.io/source=eap6
diff --git a/default/generated/eap8/128-legacy-vault.windup.yaml b/default/generated/eap8/128-legacy-vault.windup.yaml
index 21ad7788..d7195884 100644
--- a/default/generated/eap8/128-legacy-vault.windup.yaml
+++ b/default/generated/eap8/128-legacy-vault.windup.yaml
@@ -1,16 +1,14 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Legacy Vault configuration must be removed
-    Vault support has been removed in EAP8; migration to Elytron credential store is mandatory.
+  description: Legacy Vault configuration must be removed
   effort: 1
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: Vault support has been removed in EAP8; migration to Elytron credential
-    store is mandatory.
+  message: "\n Vault support has been removed in EAP8; migration to Elytron credential
+    store is mandatory.\n "
   ruleID: legacy-vault-00010
   when:
     builtin.filecontent:
diff --git a/default/generated/eap8/129-login-modules.windup.yaml b/default/generated/eap8/129-login-modules.windup.yaml
index 79d5e2ac..bf44b09e 100644
--- a/default/generated/eap8/129-login-modules.windup.yaml
+++ b/default/generated/eap8/129-login-modules.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Migrate Custom Login Modules
-    The legacy custom login modules have been removed. Applications must be changed either use some of the already existing elytron security realms, or implement a custom security realm or migrate to the elytron's jaas realm. The jaas-realm can be used only if the custom login module does not use or depend on Picketbox.
+  description: Migrate Custom Login Modules
   effort: 3
   labels:
   - konveyor.io/source=eap7
diff --git a/default/generated/eap8/130-picketlink.windup.yaml b/default/generated/eap8/130-picketlink.windup.yaml
index 554aa539..e363b023 100644
--- a/default/generated/eap8/130-picketlink.windup.yaml
+++ b/default/generated/eap8/130-picketlink.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Legacy Vault configuration must be removed
-    The PicketLink subsystem has been removed. This legacy security system was deprecated in EAP6 and removed in EAP8. All related configuration must be removed.. In case of Picketlink STS usage, migration to Apache CXF is required.
+  description: Legacy Vault configuration must be removed
   effort: 1
   labels:
   - konveyor.io/target=eap8
@@ -11,9 +9,9 @@
   links:
   - title: 'Developing Jakarta XML Web Services: Apache CXF Support'
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.4/html-single/developing_web_services_applications/index#ws_trust_sts_apache_CXF_support
-  message: The PicketLink subsystem has been removed. This legacy security system
+  message: "\n The PicketLink subsystem has been removed. This legacy security system
     was deprecated in EAP6 and removed in EAP8. All related configuration must be
-    removed.. In case of Picketlink STS usage, migration to Apache CXF is required.
+    removed.\n In case of Picketlink STS usage, migration to Apache CXF is required.\n "
   ruleID: picketlink-00010
   when:
     or:
@@ -27,19 +25,17 @@
         pattern: picketlink-sts\.xml
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace legacy PicketLink configuration with RH-SSO
-    Configure an RH-SSO SAML client and then generate a keycloak-saml.xml file using the RH-SSO admin console. Add the keycloak-saml.xml file to the deployment’s WEB-INF directory. Set the auth-method to KEYCLOAK-SAML in the deployment’s web.xml file.
+  description: Replace legacy PicketLink configuration with RH-SSO
   effort: 1
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: Configure an RH-SSO SAML client and then generate a keycloak-saml.xml file
-    using the RH-SSO admin console. Add the keycloak-saml.xml file to the deployment’s
+  message: "\n Configure an RH-SSO SAML client and then generate a keycloak-saml.xml
+    file using the RH-SSO admin console. Add the keycloak-saml.xml file to the deployment’s
     WEB-INF directory. Set the auth-method to KEYCLOAK-SAML in the deployment’s web.xml
-    file.
+    file.\n "
   ruleID: picketlink-00020
   when:
     as: file
diff --git a/default/generated/eap8/ruleset.yaml b/default/generated/eap8/ruleset.yaml
index 23521ca7..445f4aab 100644
--- a/default/generated/eap8/ruleset.yaml
+++ b/default/generated/eap8/ruleset.yaml
@@ -1,3 +1,3 @@
 name: eap8/eap7
-description: This ruleset provides rules to support the migration to hibernate search
-  6.0. Developed under WINDUPRULE-900
+description: This ruleset provides analysis of EAP7 applications that need to change
+  their approach to custom login.
diff --git a/default/generated/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml b/default/generated/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
index 44a2b9e6..8e437df0 100644
--- a/default/generated/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
+++ b/default/generated/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
@@ -1,8 +1,7 @@
 - category: potential
   customVariables: []
-  description: |-
-    Bootable JAR Maven Plugin: rename extraServerContent configuration element
-    If you migrate your application to JBoss EAP XP 3.0 (or later), and want to ensure its Maven building, running or testing works as expected, rename the configuration element `extraServerContent` to `extraServerContentDirs`.
+  description: 'Bootable JAR Maven Plugin: rename extraServerContent configuration
+    element'
   effort: 1
   labels:
   - konveyor.io/source=eapxp
diff --git a/default/generated/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml b/default/generated/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml
index e41e262d..e9ae57e2 100644
--- a/default/generated/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml
+++ b/default/generated/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Remove Thorntail YAML Configuration Files
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, remove all Thorntail YAML Configuration Files.
+  description: Remove Thorntail YAML Configuration Files
   effort: 1
   labels:
   - konveyor.io/source=thorntail
diff --git a/default/generated/eapxp/133-replace_thorntail_boms.mta.yaml b/default/generated/eapxp/133-replace_thorntail_boms.mta.yaml
index c3a22bec..173c10a5 100644
--- a/default/generated/eapxp/133-replace_thorntail_boms.mta.yaml
+++ b/default/generated/eapxp/133-replace_thorntail_boms.mta.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail BOMs - io.thorntail:bom
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail BOM `io.thorntail:bom` with JBoss EAP XP MicroProfile BOM and/or JBoss EAP Jakarta EE BOM.
+  description: Replace Thorntail BOMs - io.thorntail:bom
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -29,9 +27,7 @@
         = 'io.thorntail' and m:artifactId/text() = 'bom']
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail BOMs - io.thorntail:bom-certified
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail BOM `io.thorntail:bom-certified` with JBoss EAP XP MicroProfile BOM and/or JBoss EAP Jakarta EE BOM.
+  description: Replace Thorntail BOMs - io.thorntail:bom-certified
   effort: 1
   labels:
   - konveyor.io/source=thorntail
diff --git a/default/generated/eapxp/134-replace_thorntail_fractions.mta.yaml b/default/generated/eapxp/134-replace_thorntail_fractions.mta.yaml
index 8b74d6b2..21bfe6a3 100644
--- a/default/generated/eapxp/134-replace_thorntail_fractions.mta.yaml
+++ b/default/generated/eapxp/134-replace_thorntail_fractions.mta.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:bean-validation
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:bean-validation` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:bean-validation
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -25,9 +23,7 @@
       name: io.thorntail.bean-validation
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:cdi-config
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:cdi-config` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:cdi-config
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -50,9 +46,7 @@
       name: io.thorntail.cdi-config
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:cdi
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:cdi` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:cdi
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -75,9 +69,7 @@
       name: io.thorntail.cdi
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:config-api-runtime
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:config-api-runtime` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:config-api-runtime
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -100,9 +92,7 @@
       name: io.thorntail.config-api-runtime
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:datasources
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:datasources` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:datasources
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -125,9 +115,7 @@
       name: io.thorntail.datasources
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:ee-security
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:ee-security` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:ee-security
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -150,9 +138,7 @@
       name: io.thorntail.ee-security
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:ejb-mdb
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:ejb-mdb` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:ejb-mdb
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -175,9 +161,7 @@
       name: io.thorntail.ejb-mdb
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:ejb
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:ejb` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:ejb
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -200,9 +184,7 @@
       name: io.thorntail.ejb
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:elytron
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:elytron` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:elytron
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -225,9 +207,7 @@
       name: io.thorntail.elytron
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:fraction-metadata
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:fraction-metadata` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:fraction-metadata
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -250,9 +230,7 @@
       name: io.thorntail.fraction-metadata
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:hibernate-validator
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:hibernate-validator` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:hibernate-validator
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -275,9 +253,7 @@
       name: io.thorntail.hibernate-validator
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:hibernate
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:hibernate` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:hibernate
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -300,9 +276,7 @@
       name: io.thorntail.hibernate
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:hystrix
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:hystrix` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:hystrix
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -325,9 +299,7 @@
       name: io.thorntail.hystrix
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:infinispan
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:infinispan` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:infinispan
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -350,9 +322,7 @@
       name: io.thorntail.infinispan
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaeger
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaeger` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaeger
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -375,9 +345,7 @@
       name: io.thorntail.jaeger
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs-jaxb
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs-jaxb` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs-jaxb
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -400,9 +368,7 @@
       name: io.thorntail.jaxrs-jaxb
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs-jsonb
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs-jsonb` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs-jsonb
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -425,9 +391,7 @@
       name: io.thorntail.jaxrs-jsonb
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs-jsonp
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs-jsonp` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs-jsonp
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -450,9 +414,7 @@
       name: io.thorntail.jaxrs-jsonp
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs-multipart
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs-multipart` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs-multipart
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -475,9 +437,7 @@
       name: io.thorntail.jaxrs-multipart
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs-validator
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs-validator` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs-validator
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -500,9 +460,7 @@
       name: io.thorntail.jaxrs-validator
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jaxrs
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jaxrs` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jaxrs
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -525,9 +483,7 @@
       name: io.thorntail.jaxrs
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jca
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jca` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jca
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -550,9 +506,7 @@
       name: io.thorntail.jca
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jmx
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jmx` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jmx
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -575,9 +529,7 @@
       name: io.thorntail.jmx
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jpa
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jpa` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jpa
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -600,9 +552,7 @@
       name: io.thorntail.jpa
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jsf
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jsf` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jsf
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -625,9 +575,7 @@
       name: io.thorntail.jsf
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jsonb
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jsonb` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jsonb
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -650,9 +598,7 @@
       name: io.thorntail.jsonb
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:jsonp
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:jsonp` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:jsonp
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -675,9 +621,7 @@
       name: io.thorntail.jsonp
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:keycloak
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:keycloak` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:keycloak
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -700,9 +644,7 @@
       name: io.thorntail.keycloak
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:logging
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:logging` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:logging
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -725,9 +667,7 @@
       name: io.thorntail.logging
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:management
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:management` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:management
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -750,9 +690,7 @@
       name: io.thorntail.management
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-config
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-config` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-config
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -775,9 +713,7 @@
       name: io.thorntail.microprofile-config
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-fault-tolerance
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-fault-tolerance` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-fault-tolerance
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -800,9 +736,7 @@
       name: io.thorntail.microprofile-fault-tolerance
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-health
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-health` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-health
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -825,9 +759,7 @@
       name: io.thorntail.microprofile-health
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-jwt
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-jwt` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-jwt
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -850,9 +782,7 @@
       name: io.thorntail.microprofile-jwt
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-metrics
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-metrics` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-metrics
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -875,9 +805,7 @@
       name: io.thorntail.microprofile-metrics
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-openapi
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-openapi` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-openapi
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -900,9 +828,7 @@
       name: io.thorntail.microprofile-openapi
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-opentracing
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-opentracing` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-opentracing
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -925,9 +851,7 @@
       name: io.thorntail.microprofile-opentracing
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile-restclient
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile-restclient` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile-restclient
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -950,9 +874,7 @@
       name: io.thorntail.microprofile-restclient
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:microprofile
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:microprofile` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:microprofile
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -975,9 +897,7 @@
       name: io.thorntail.microprofile
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:opentracing
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:opentracing` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:opentracing
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1000,9 +920,7 @@
       name: io.thorntail.opentracing
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:remoting
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:remoting` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:remoting
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1025,9 +943,7 @@
       name: io.thorntail.remoting
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:resource-adapters
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:resource-adapters` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:resource-adapters
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1050,9 +966,7 @@
       name: io.thorntail.resource-adapters
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:spi
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:spi` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:spi
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1075,9 +989,7 @@
       name: io.thorntail.spi
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:topology-openshift
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:topology-openshift` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:topology-openshift
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1100,9 +1012,7 @@
       name: io.thorntail.topology-openshift
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:topology-webapp
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:topology-webapp` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:topology-webapp
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1125,9 +1035,7 @@
       name: io.thorntail.topology-webapp
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:transactions
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:transactions` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:transactions
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1150,9 +1058,7 @@
       name: io.thorntail.transactions
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:undertow
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:undertow` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:undertow
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1175,9 +1081,7 @@
       name: io.thorntail.undertow
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:web
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:web` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:web
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1200,9 +1104,7 @@
       name: io.thorntail.web
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:archaius
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:archaius` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:archaius
   effort: 1
   labels:
   - konveyor.io/source=thorntail
@@ -1225,9 +1127,7 @@
       name: io.thorntail.archaius
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Fractions - io.thorntail:monitor
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Fraction `io.thorntail:monitor` with the related Eclipse MicroProfile and/or Jakarta EE artifacts.
+  description: Replace Thorntail Fractions - io.thorntail:monitor
   effort: 1
   labels:
   - konveyor.io/source=thorntail
diff --git a/default/generated/eapxp/135-replace_thorntail_maven_plugin.mta.yaml b/default/generated/eapxp/135-replace_thorntail_maven_plugin.mta.yaml
index 9b48a412..7955ca7d 100644
--- a/default/generated/eapxp/135-replace_thorntail_maven_plugin.mta.yaml
+++ b/default/generated/eapxp/135-replace_thorntail_maven_plugin.mta.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Replace Thorntail Maven Plugin
-    If you migrate your application to JBoss EAP XP 2.0 (or later), and want to ensure its Maven building, running or testing works as expected, replace Thorntail Maven Plugin with JBoss EAP XP Bootable JAR Maven Plugin.
+  description: Replace Thorntail Maven Plugin
   effort: 1
   labels:
   - konveyor.io/source=thorntail
diff --git a/default/generated/fuse-service-works/141-soa-p-5.windup.yaml b/default/generated/fuse-service-works/141-soa-p-5.windup.yaml
index f2e2152f..d9b8d2db 100644
--- a/default/generated/fuse-service-works/141-soa-p-5.windup.yaml
+++ b/default/generated/fuse-service-works/141-soa-p-5.windup.yaml
@@ -5,9 +5,7 @@
   description: "JBoss ESB 5 Action Handler\n\n                            \n                                Custom
     action classes should be migrated to CDI Beans in Fuse Service Works. These beans
     can be defined as services or called directly from a Camel route.\n                            \n
-    \                       \nCustom action classes should be migrated to CDI Beans
-    in Fuse Service Works. These beans can be defined as services or called directly
-    from a Camel route.. For more information, see the [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md)."
+    \                       "
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -16,9 +14,10 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: Custom action classes should be migrated to CDI Beans in Fuse Service Works.
-    These beans can be defined as services or called directly from a Camel route..
-    For more information, see the [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  message: "\n \n Custom action classes should be migrated to CDI Beans in Fuse Service
+    Works. These beans can be defined as services or called directly from a Camel
+    route.\n\n For more information, see the [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).\n
+    \n "
   ruleID: soa-p-5-01000
   tag:
   - jboss-esb
@@ -35,6 +34,7 @@
           and not(starts-with(@class, 'org.jboss.soa.esb.smooks')) and matches(@class,
           '.*')]/@class
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=soa-p5-
   - konveyor.io/source=soa-p
@@ -51,6 +51,7 @@
       namespaces: {}
       xpath: /jbossesb-deployment
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=soa-p5-
   - konveyor.io/source=soa-p
@@ -69,6 +70,7 @@
       namespaces: {}
       xpath: /*[local-name()='jbossesb']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=soa-p5-
   - konveyor.io/source=soa-p
@@ -87,9 +89,7 @@
       namespaces: {}
       xpath: /*[local-name()='smooks-resource-list']
 - customVariables: []
-  description: |-
-    JMS Gateway Listener
-    This listener requires a composite service binding in Fuse Service Works. The configuration for a JCA or JMS binding can be found in the jms-bus definition. associated with this listener.. For additional information, see the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  description: JMS Gateway Listener
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -98,19 +98,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: This listener requires a composite service binding in Fuse Service Works.
-    The configuration for a JCA or JMS binding can be found in the jms-bus definition.
-    associated with this listener.. For additional information, see the. [Gateway
-    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  message: "\n \n This listener requires a composite service binding in Fuse Service
+    Works. The configuration for a JCA or JMS binding can be found in the jms-bus
+    definition\n associated with this listener.\n\n For additional information, see
+    the\n [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).\n
+    \n "
   ruleID: soa-p-5-05000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='jms-listener' and @is-gateway='true']/@name
 - customVariables: []
-  description: |-
-    ESB-Aware Listener (non-gateway)
-    An ESB-aware listener is no longer required in Fuse Service Works.
+  description: ESB-Aware Listener (non-gateway)
   effort: 1
   labels:
   - konveyor.io/source=soa-p5-
@@ -126,9 +125,7 @@
       namespaces: {}
       xpath: //*[local-name()='jms-listener' and (not(@is-gateway) or @is-gateway='false')]/@name
 - customVariables: []
-  description: |-
-    JBoss SOA-P Service
-    Each <service> definition in SOA-P 5 represents a service which can be. called from outside the application through an ESB listner.  The. equivalent definition in Fuse Service Works is a composite service.. For additional information, see the. [Service Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/service-migration.md).
+  description: JBoss SOA-P Service
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -137,19 +134,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: Each <service> definition in SOA-P 5 represents a service which can be.
-    called from outside the application through an ESB listner.  The. equivalent definition
-    in Fuse Service Works is a composite service.. For additional information, see
-    the. [Service Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/service-migration.md).
+  message: "\n \n Each <service> definition in SOA-P 5 represents a service which
+    can be\n called from outside the application through an ESB listner. The\n equivalent
+    definition in Fuse Service Works is a composite service.\n\n For additional information,
+    see the\n [Service Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/service-migration.md).\n
+    \n "
   ruleID: soa-p-5-07000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='service']/@name
 - customVariables: []
-  description: |-
-    JBoss SOA-P Action Pipeline
-    The logic and execution flow of a service in SOA-P 5 is defined in an. action processing pipeline. This logic is. contained within a service component definition and expressed. using any of the available implementation types in Fuse Service Works.. For additional information see: the [Action Pipeline Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-pipeline-migration.md)
+  description: JBoss SOA-P Action Pipeline
   effort: 5
   labels:
   - konveyor.io/source=soa-p5-
@@ -158,20 +154,19 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: 'The logic and execution flow of a service in SOA-P 5 is defined in an.
-    action processing pipeline. This logic is. contained within a service component
-    definition and expressed. using any of the available implementation types in Fuse
-    Service Works.. For additional information see: the [Action Pipeline Migration
-    Guide](https://github.com/windup/soa-migration/blob/master/advice/action-pipeline-migration.md)'
+  message: "\n \n The logic and execution flow of a service in SOA-P 5 is defined
+    in an\n action processing pipeline. This logic is\n contained within a service
+    component definition and expressed\n using any of the available implementation
+    types in Fuse Service Works.\n\n For additional information see: the [Action Pipeline
+    Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-pipeline-migration.md)\n
+    \n "
   ruleID: soa-p-5-08000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='actions']
 - customVariables: []
-  description: |-
-    Service Binding: Hibernate Bus
-    Although Camel has both Hibernate and JPA components that are. useful in consuming records, there isn't any support for Hibernate events.. To migrate this to SwitchYard you may have to. build a custom SwitchYard component using Hibernate. listeners, or redesign your requirements to leverage the. existing Camel components available (Hibernate/JPA/SQL). in this area.
+  description: 'Service Binding: Hibernate Bus'
   effort: 13
   labels:
   - konveyor.io/source=soa-p5-
@@ -180,20 +175,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: Although Camel has both Hibernate and JPA components that are. useful in
-    consuming records, there isn't any support for Hibernate events.. To migrate this
-    to SwitchYard you may have to. build a custom SwitchYard component using Hibernate.
-    listeners, or redesign your requirements to leverage the. existing Camel components
-    available (Hibernate/JPA/SQL). in this area.
+  message: "\n \n Although Camel has both Hibernate and JPA components that are\n
+    useful in consuming records, there isn't any support for Hibernate events.\n\n
+    To migrate this to SwitchYard you may have to\n build a custom SwitchYard component
+    using Hibernate\n listeners, or redesign your requirements to leverage the\n existing
+    Camel components available (Hibernate/JPA/SQL)\n in this area.\n \n "
   ruleID: soa-p-5-09000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='hibernate-bus']/@busid
 - customVariables: []
-  description: |-
-    JMS Bus Definition
-    A jms-bus definition can be converted to a JMS or JCA gateway. binding on a composite service in SwitchYard. If the jms-bus. configuration is used for a non-gateway listener, it does not. need to be migrated to Fuse Service Works.. For additional information, see the. [JMS Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/jms-bus-migration.md).
+  description: JMS Bus Definition
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -202,19 +195,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: A jms-bus definition can be converted to a JMS or JCA gateway. binding
-    on a composite service in SwitchYard. If the jms-bus. configuration is used for
-    a non-gateway listener, it does not. need to be migrated to Fuse Service Works..
-    For additional information, see the. [JMS Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/jms-bus-migration.md).
+  message: "\n \n A jms-bus definition can be converted to a JMS or JCA gateway\n
+    binding on a composite service in SwitchYard. If the jms-bus\n configuration is
+    used for a non-gateway listener, it does not\n need to be migrated to Fuse Service
+    Works.\n\n For additional information, see the\n [JMS Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/jms-bus-migration.md).\n
+    \n "
   ruleID: soa-p-5-10000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='jms-bus']/@busid
 - customVariables: []
-  description: |-
-    FTP Bus Definition
-    A ftp-bus definition can be converted to a FTP gateway. binding on a composite service in SwitchYard.. For additional information, see the. [FTP Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/ftp-bus-migration.md).
+  description: FTP Bus Definition
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -223,18 +215,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: A ftp-bus definition can be converted to a FTP gateway. binding on a composite
-    service in SwitchYard.. For additional information, see the. [FTP Bus Migration
-    Guide](https://github.com/windup/soa-migration/blob/master/advice/ftp-bus-migration.md).
+  message: "\n \n A ftp-bus definition can be converted to a FTP gateway\n binding
+    on a composite service in SwitchYard.\n\n For additional information, see the\n
+    [FTP Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/ftp-bus-migration.md).\n
+    \n "
   ruleID: soa-p-5-11000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='ftp-bus']/@busid
 - customVariables: []
-  description: |-
-    Camel Bus Definition
-    A camel-bus definition can be converted to a Camel gateway. binding on a composite service in SwitchYard.. For additional information, see the. [Camel Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/camel-bus-migration.md)
+  description: Camel Bus Definition
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -244,18 +235,17 @@
   - jboss-esb
   - camel
   links: []
-  message: A camel-bus definition can be converted to a Camel gateway. binding on
-    a composite service in SwitchYard.. For additional information, see the. [Camel
-    Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/camel-bus-migration.md)
+  message: "\n \n A camel-bus definition can be converted to a Camel gateway\n binding
+    on a composite service in SwitchYard.\n\n For additional information, see the\n
+    [Camel Bus Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/camel-bus-migration.md)\n
+    \n "
   ruleID: soa-p-5-12000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='camel-bus']/@busid
 - customVariables: []
-  description: |-
-    UDP Listener Configuration
-    A UDP Listener definition can be converted to a TCP/UDP. gateway binding on a composite service in SwitchYard.
+  description: UDP Listener Configuration
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -266,17 +256,15 @@
   links:
   - title: TCP/UDP Gateway
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-TCP_UDP
-  message: A UDP Listener definition can be converted to a TCP/UDP. gateway binding
-    on a composite service in SwitchYard.
+  message: "\n \n A UDP Listener definition can be converted to a TCP/UDP\n gateway
+    binding on a composite service in SwitchYard.\n \n "
   ruleID: soa-p-5-13000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='udp-listener']
 - customVariables: []
-  description: |-
-    JMS JCA Provider
-    A jms-jca-provider definition can be converted to a JCA. gateway binding on a composite service in Fuse Service Works.
+  description: JMS JCA Provider
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -287,17 +275,15 @@
   links:
   - title: JCA Gateway Binding
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-JCA
-  message: A jms-jca-provider definition can be converted to a JCA. gateway binding
-    on a composite service in Fuse Service Works.
+  message: "\n \n A jms-jca-provider definition can be converted to a JCA\n gateway
+    binding on a composite service in Fuse Service Works.\n \n "
   ruleID: soa-p-5-14000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='jms-jca-provider']
 - customVariables: []
-  description: |-
-    HTTP Provider
-    A http-provider definition can be converted to a HTTP gateway. binding on a composite service in Fuse Service Works.. For additional information, see the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  description: HTTP Provider
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -307,18 +293,17 @@
   - jboss-esb
   - soa-p
   links: []
-  message: A http-provider definition can be converted to a HTTP gateway. binding
-    on a composite service in Fuse Service Works.. For additional information, see
-    the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  message: "\n \n A http-provider definition can be converted to a HTTP gateway\n
+    binding on a composite service in Fuse Service Works.\n\n For additional information,
+    see the\n [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).\n
+    \n "
   ruleID: soa-p-5-15000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='http-provider']
 - customVariables: []
-  description: |-
-    Cron Schedule
-    A cron-schedule definition can be converted to a Quartz. gateway binding on a composite service in Fuse Service Works.. For additional information, see the. [Cron Scheduler Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/cron-schedule-migration.md).
+  description: Cron Schedule
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -327,18 +312,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: A cron-schedule definition can be converted to a Quartz. gateway binding
-    on a composite service in Fuse Service Works.. For additional information, see
-    the. [Cron Scheduler Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/cron-schedule-migration.md).
+  message: "\n \n A cron-schedule definition can be converted to a Quartz\n gateway
+    binding on a composite service in Fuse Service Works.\n\n For additional information,
+    see the\n [Cron Scheduler Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/cron-schedule-migration.md).\n
+    \n "
   ruleID: soa-p-16000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='cron-schedule']
 - customVariables: []
-  description: |-
-    FTP Gateway Listener
-    This listener requires a composite service binding in Fuse Service Works. The configuration for a FTP binding. can be found in the ftp-bus definition associated with this listener.. For additional information, see the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  description: FTP Gateway Listener
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -347,19 +331,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: This listener requires a composite service binding in Fuse Service Works.
-    The configuration for a FTP binding. can be found in the ftp-bus definition associated
-    with this listener.. For additional information, see the. [Gateway Listener Migration
-    Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  message: "\n \n This listener requires a composite service binding in Fuse Service
+    Works. The configuration for a FTP binding\n can be found in the ftp-bus definition
+    associated with this listener.\n\n For additional information, see the\n [Gateway
+    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).\n
+    \n "
   ruleID: soa-p-17000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='ftp-listener' and @is-gateway='true']/@name
 - customVariables: []
-  description: |-
-    Camel Gateway Listener
-    This gateway requires a composite service binding in Fuse Service Works.. The configuration for a Camel binding can be found in the camel-bus definition associated. with this listener.. For additional information, see the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  description: Camel Gateway Listener
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -369,19 +352,18 @@
   - jboss-esb
   - camel
   links: []
-  message: This gateway requires a composite service binding in Fuse Service Works..
-    The configuration for a Camel binding can be found in the camel-bus definition
-    associated. with this listener.. For additional information, see the. [Gateway
-    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  message: "\n \n This gateway requires a composite service binding in Fuse Service
+    Works.\n The configuration for a Camel binding can be found in the camel-bus definition
+    associated\n with this listener.\n\n For additional information, see the\n [Gateway
+    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).\n
+    \n "
   ruleID: soa-p-18000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='camel-gateway']/@busidref
 - customVariables: []
-  description: |-
-    HTTP Gateway Listener
-    A <http-gateway> can be replaced in Fuse Service Works by a http binding added to your composite service.. For additional information, see the. [HTTP Gateway Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/http-gateway-migration.md).
+  description: HTTP Gateway Listener
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -390,18 +372,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: A <http-gateway> can be replaced in Fuse Service Works by a http binding
-    added to your composite service.. For additional information, see the. [HTTP Gateway
-    Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/http-gateway-migration.md).
+  message: "\n \n A <http-gateway> can be replaced in Fuse Service Works by a http
+    binding added to your composite service.\n\n For additional information, see the\n
+    [HTTP Gateway Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/http-gateway-migration.md).\n
+    \n "
   ruleID: soa-p-19000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='http-gateway']/@name
 - customVariables: []
-  description: |-
-    Smooks Transformation Action
-    Fuse Service Works uses a <transform> to replace the invocation. of as SmooksAction to transform message content. You most likely will want to use a Smooks transform. to specify your Smooks configuration and from/to types.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: Smooks Transformation Action
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -411,19 +392,18 @@
   - jboss-esb
   - smooks
   links: []
-  message: Fuse Service Works uses a <transform> to replace the invocation. of as
-    SmooksAction to transform message content. You most likely will want to use a
-    Smooks transform. to specify your Smooks configuration and from/to types.. For
-    additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n Fuse Service Works uses a <transform> to replace the invocation\n
+    of as SmooksAction to transform message content. You most likely will want to
+    use a Smooks transform\n to specify your Smooks configuration and from/to types.\n\n
+    For additional information, see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-20000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.smooks.SmooksAction']/@class
 - customVariables: []
-  description: |-
-    Smooks Config
-    In a Fuse Service Works Smooks transform, you can specify your Smooks configuration with the &quot;config&quot; attribute.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: Smooks Config
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -433,18 +413,17 @@
   - jboss-esb
   - smooks
   links: []
-  message: In a Fuse Service Works Smooks transform, you can specify your Smooks configuration
-    with the &quot;config&quot; attribute.. For additional information, see the. [Transformation
-    Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n In a Fuse Service Works Smooks transform, you can specify your Smooks
+    configuration with the &quot;config&quot; attribute.\n\n For additional information,
+    see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-21000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='property' and @name='smooksConfig']/@name
 - customVariables: []
-  description: |-
-    Smooks Result Type
-    Fuse Service Works uses a <transform> to replace the invocation of as SmooksAction. to transform message content. You most likely will want to use a Smooks transform. to specify your Smooks configuration and from/to types.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: Smooks Result Type
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -454,10 +433,11 @@
   - jboss-esb
   - smooks
   links: []
-  message: Fuse Service Works uses a <transform> to replace the invocation of as SmooksAction.
-    to transform message content. You most likely will want to use a Smooks transform.
-    to specify your Smooks configuration and from/to types.. For additional information,
-    see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n Fuse Service Works uses a <transform> to replace the invocation
+    of as SmooksAction\n to transform message content. You most likely will want to
+    use a Smooks transform\n to specify your Smooks configuration and from/to types.\n\n
+    For additional information, see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-22000
   when:
     builtin.xml:
@@ -465,9 +445,7 @@
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.smooks.SmooksAction']/*[local-name()='property'
         and @name='resultType']
 - customVariables: []
-  description: |-
-    ESB SOAP Proxy
-    Instead of the JBoss ESB SOAPProxy action which transforms a specified WSDL and rewrites the address to the JBoss ESB server,. Fuse Service Works relies on Camel's routing capability to forward requests from a proxying service to the source.. Create a proxy service and a reference to the original service, and then use Camel to route them.. For additional information, see the. [SOAPProxy Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/soap-proxy.md).
+  description: ESB SOAP Proxy
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -476,21 +454,20 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: Instead of the JBoss ESB SOAPProxy action which transforms a specified
-    WSDL and rewrites the address to the JBoss ESB server,. Fuse Service Works relies
+  message: "\n \n Instead of the JBoss ESB SOAPProxy action which transforms a specified
+    WSDL and rewrites the address to the JBoss ESB server,\n Fuse Service Works relies
     on Camel's routing capability to forward requests from a proxying service to the
-    source.. Create a proxy service and a reference to the original service, and then
-    use Camel to route them.. For additional information, see the. [SOAPProxy Migration
-    Guide](https://github.com/windup/soa-migration/blob/master/advice/soap-proxy.md).
+    source.\n Create a proxy service and a reference to the original service, and
+    then use Camel to route them.\n\n For additional information, see the\n [SOAPProxy
+    Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/soap-proxy.md).\n
+    \n "
   ruleID: soa-p-23000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.soap.proxy.SOAPProxy']/@class
 - customVariables: []
-  description: |-
-    ESB SystemPrintln Action
-    In order to log your message (or a static logging message), you may want to create a Bean service which logs the message in the manner you wish, or you can use Camel routing to log static. logging messages.. For additional information, see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  description: ESB SystemPrintln Action
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -499,19 +476,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to log your message (or a static logging message), you may want
-    to create a Bean service which logs the message in the manner you wish, or you
-    can use Camel routing to log static. logging messages.. For additional information,
-    see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  message: "\n \n In order to log your message (or a static logging message), you
+    may want to create a Bean service which logs the message in the manner you wish,
+    or you can use Camel routing to log static\n logging messages.\n\n For additional
+    information, see the\n [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).\n
+    \n "
   ruleID: soa-p-24000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.SystemPrintln']/@class
 - customVariables: []
-  description: |-
-    ESB Static Router
-    In order to configure static routes for your message in. Fuse Service Works, you should use Camel's routing (either through Java DSL routes or route.xml).. For additional information, see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  description: ESB Static Router
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -520,18 +496,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to configure static routes for your message in. Fuse Service Works,
-    you should use Camel's routing (either through Java DSL routes or route.xml)..
-    For additional information, see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  message: "\n \n In order to configure static routes for your message in\n Fuse Service
+    Works, you should use Camel's routing (either through Java DSL routes or route.xml).\n\n
+    For additional information, see the\n [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).\n
+    \n "
   ruleID: soa-p-25000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.StaticRouter']/@class
 - customVariables: []
-  description: |-
-    ESB JMS Router
-    In order to replace the use of the JMSRouter in Fuse Service Works, you should use a JMS binding. You may need to review the options for JMS bindings in. Fuse Service Works if you are using the unwrap property.. For additional information, see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  description: ESB JMS Router
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -540,19 +515,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the JMSRouter in Fuse Service Works, you
-    should use a JMS binding. You may need to review the options for JMS bindings
-    in. Fuse Service Works if you are using the unwrap property.. For additional information,
-    see the. [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).
+  message: "\n \n In order to replace the use of the JMSRouter in Fuse Service Works,
+    you should use a JMS binding. You may need to review the options for JMS bindings
+    in\n Fuse Service Works if you are using the unwrap property.\n\n For additional
+    information, see the\n [Action Class Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/action-class-migration.md).\n
+    \n "
   ruleID: soa-p-26000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.routing.JMSRouter']/@class
 - customVariables: []
-  description: |-
-    ESB Test Message Store
-    TestMessageStore is an out-of-the-box ESB action that is used in JBoss Application Server. container tests to store a message with some form of logging - to a file, JMX, etc. TestMessageStore is used throughout. the JBoss ESB sample projects to help test the results of processed messages.. Fuse Service Works is able to leverage Arquillian to do container testing, so TestMessageStore is not. necessary for testing. This action should simply be removed during the migration.
+  description: ESB Test Message Store
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -561,21 +535,20 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: TestMessageStore is an out-of-the-box ESB action that is used in JBoss
-    Application Server. container tests to store a message with some form of logging
-    - to a file, JMX, etc. TestMessageStore is used throughout. the JBoss ESB sample
-    projects to help test the results of processed messages.. Fuse Service Works is
-    able to leverage Arquillian to do container testing, so TestMessageStore is not.
-    necessary for testing. This action should simply be removed during the migration.
+  message: "\n \n TestMessageStore is an out-of-the-box ESB action that is used in
+    JBoss Application Server\n container tests to store a message with some form of
+    logging - to a file, JMX, etc. TestMessageStore is used throughout\n the JBoss
+    ESB sample projects to help test the results of processed messages.\n\n Fuse Service
+    Works is able to leverage Arquillian to do container testing, so TestMessageStore
+    is not\n necessary for testing. This action should simply be removed during the
+    migration.\n \n "
   ruleID: soa-p-27000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.TestMessageStore']/@class
 - customVariables: []
-  description: |-
-    ESB GroovyActionProcessor
-    The GroovyActionProcessor action executes a Groovy script. You can duplicate this functionality in. Fuse Service Works through Camel routing (both Java and XML.). For additional information, see the. [Camel Scripting Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).
+  description: ESB GroovyActionProcessor
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -584,18 +557,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: The GroovyActionProcessor action executes a Groovy script. You can duplicate
-    this functionality in. Fuse Service Works through Camel routing (both Java and
-    XML.). For additional information, see the. [Camel Scripting Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).
+  message: "\n \n The GroovyActionProcessor action executes a Groovy script. You can
+    duplicate this functionality in\n Fuse Service Works through Camel routing (both
+    Java and XML.)\n\n For additional information, see the\n [Camel Scripting Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).\n
+    \n "
   ruleID: soa-p-28000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.scripting.GroovyActionProcessor']/@class
 - customVariables: []
-  description: |-
-    ESB BpmProcessor
-    The BpmProcessor makes calls to jBPM 3 through the jBPM command API. Fuse Service Works supports jBPM 5, so you will need. to migrate your existing workflow from jBPM 3 to jBPM 5 and use a Fuse Service Works BPM implementation.. For additional information, see the. [BPM Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/bpm_migration.md).
+  description: ESB BpmProcessor
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -604,19 +576,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: The BpmProcessor makes calls to jBPM 3 through the jBPM command API. Fuse
-    Service Works supports jBPM 5, so you will need. to migrate your existing workflow
-    from jBPM 3 to jBPM 5 and use a Fuse Service Works BPM implementation.. For additional
-    information, see the. [BPM Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/bpm_migration.md).
+  message: "\n \n The BpmProcessor makes calls to jBPM 3 through the jBPM command
+    API. Fuse Service Works supports jBPM 5, so you will need\n to migrate your existing
+    workflow from jBPM 3 to jBPM 5 and use a Fuse Service Works BPM implementation.\n\n
+    For additional information, see the\n [BPM Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/bpm_migration.md).\n
+    \n "
   ruleID: soa-p-29000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.services.jbpm.actions.BpmProcessor']/@class
 - customVariables: []
-  description: |-
-    ESB Filesystem Bus
-    A fs-bus definition can be converted to a Camel binding on a composite service in Fuse Service Works.. For additional information, see the. [Gateway Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  description: ESB Filesystem Bus
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -625,18 +596,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: A fs-bus definition can be converted to a Camel binding on a composite
-    service in Fuse Service Works.. For additional information, see the. [Gateway
-    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).
+  message: "\n \n A fs-bus definition can be converted to a Camel binding on a composite
+    service in Fuse Service Works.\n\n For additional information, see the\n [Gateway
+    Listener Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/gateway-listener-migration.md).\n
+    \n "
   ruleID: soa-p-30000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='fs-bus']/@busid
 - customVariables: []
-  description: |-
-    ESB Notifier Action
-    JBoss ESB uses notifiers to transform ESB aware messages to a format that ESB-unaware services can handle. Fuse Service Works uses bi-directional gateways to transfer messages. via its service bindings.. A JBoss ESB Notifier should be converted to a Fuse Service Works Service Binding.. For example:. ```xml. <service category="routerToFile" name="FileRouterListener" description="Static route file destination">. <actions mep="OneWay">. <action name="notificationAction" class="org.jboss.soa.esb.actions.Notifier">. <property name="okMethod" value="notifyOK"/>. <property name="notification-details">. <NotificationList type="ok">. <target class="NotifyFiles">. <file append="false" URI="/tmp/HelloWorldFileNotifierTest.log"/>. </target>. </NotificationList>. </property>. </action>. </actions>. </service>. ```. Could be translated to:. ```xml. <sca:reference name="HelloWorld" multiplicity="0..1" promote="MyComponent/HelloWorld">. <camel:binding.file>. <camel:directory>/tmp</camel:directory>. <camel:fileName>HelloWorldFileNotifierTest.log</camel:fileName>. </camel:binding.file>. </sca:reference>. <sca:component name="MyComponent">. <sca:reference name="HelloWorld">. <sca:interface.wsdl interface="HelloWorld.wsdl#wsdl.porttype(HelloWorld)"/>. </sca:reference>. </sca:component>. ```
+  description: ESB Notifier Action
   effort: 7
   labels:
   - konveyor.io/source=soa-p5-
@@ -645,30 +615,29 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses notifiers to transform ESB aware messages to a format that
-    ESB-unaware services can handle. Fuse Service Works uses bi-directional gateways
-    to transfer messages. via its service bindings.. A JBoss ESB Notifier should be
-    converted to a Fuse Service Works Service Binding.. For example:. ```xml. <service
-    category="routerToFile" name="FileRouterListener" description="Static route file
-    destination">. <actions mep="OneWay">. <action name="notificationAction" class="org.jboss.soa.esb.actions.Notifier">.
-    <property name="okMethod" value="notifyOK"/>. <property name="notification-details">.
-    <NotificationList type="ok">. <target class="NotifyFiles">. <file append="false"
-    URI="/tmp/HelloWorldFileNotifierTest.log"/>. </target>. </NotificationList>. </property>.
-    </action>. </actions>. </service>. ```. Could be translated to:. ```xml. <sca:reference
-    name="HelloWorld" multiplicity="0..1" promote="MyComponent/HelloWorld">. <camel:binding.file>.
-    <camel:directory>/tmp</camel:directory>. <camel:fileName>HelloWorldFileNotifierTest.log</camel:fileName>.
-    </camel:binding.file>. </sca:reference>. <sca:component name="MyComponent">. <sca:reference
-    name="HelloWorld">. <sca:interface.wsdl interface="HelloWorld.wsdl#wsdl.porttype(HelloWorld)"/>.
-    </sca:reference>. </sca:component>. ```
+  message: "\n \n JBoss ESB uses notifiers to transform ESB aware messages to a format
+    that ESB-unaware services can handle. Fuse Service Works uses bi-directional gateways
+    to transfer messages\n via its service bindings.\n\n A JBoss ESB Notifier should
+    be converted to a Fuse Service Works Service Binding.\n\n For example:\n\n ```xml\n
+    <service category=\"routerToFile\" name=\"FileRouterListener\" description=\"Static
+    route file destination\">\n <actions mep=\"OneWay\">\n <action name=\"notificationAction\"
+    class=\"org.jboss.soa.esb.actions.Notifier\">\n <property name=\"okMethod\" value=\"notifyOK\"/>\n
+    <property name=\"notification-details\">\n <NotificationList type=\"ok\">\n <target
+    class=\"NotifyFiles\">\n <file append=\"false\" URI=\"/tmp/HelloWorldFileNotifierTest.log\"/>\n
+    </target>\n </NotificationList>\n </property>\n </action>\n </actions>\n </service>\n
+    ```\n\n\n Could be translated to:\n\n ```xml\n <sca:reference name=\"HelloWorld\"
+    multiplicity=\"0..1\" promote=\"MyComponent/HelloWorld\">\n <camel:binding.file>\n
+    <camel:directory>/tmp</camel:directory>\n <camel:fileName>HelloWorldFileNotifierTest.log</camel:fileName>\n
+    </camel:binding.file>\n </sca:reference>\n <sca:component name=\"MyComponent\">\n
+    <sca:reference name=\"HelloWorld\">\n <sca:interface.wsdl interface=\"HelloWorld.wsdl#wsdl.porttype(HelloWorld)\"/>\n
+    </sca:reference>\n </sca:component>\n ```\n \n "
   ruleID: soa-p-31000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.Notifier']/@class
 - customVariables: []
-  description: |-
-    ESB ByteArrayToString
-    JBoss ESB uses a ByteArrayToString action to do conversion on a message body. In Fuse Service Works. you would use Camel to do type conversion.
+  description: ESB ByteArrayToString
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -681,17 +650,16 @@
     url: http://camel.apache.org/convertbodyto.html
   - title: Camel Type Converters
     url: http://camel.apache.org/type-converter.html
-  message: JBoss ESB uses a ByteArrayToString action to do conversion on a message
-    body. In Fuse Service Works. you would use Camel to do type conversion.
+  message: "\n \n JBoss ESB uses a ByteArrayToString action to do conversion on a
+    message body. In Fuse Service Works\n you would use Camel to do type conversion.\n
+    \n "
   ruleID: soa-p-32000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.ByteArrayToString']/@class
 - customVariables: []
-  description: |-
-    ESB LongToDateConverter
-    JBoss ESB uses the LongToDateConverter action to do conversion on a message body.. In Fuse Service Works you would use Camel to do type conversion.
+  description: ESB LongToDateConverter
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -702,17 +670,16 @@
   links:
   - title: Camel Type Converters
     url: http://camel.apache.org/type-converter.html
-  message: JBoss ESB uses the LongToDateConverter action to do conversion on a message
-    body.. In Fuse Service Works you would use Camel to do type conversion.
+  message: "\n \n JBoss ESB uses the LongToDateConverter action to do conversion on
+    a message body.\n\n In Fuse Service Works you would use Camel to do type conversion.\n
+    \n "
   ruleID: soa-p-33000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.LongToDateConverter']/@class
 - customVariables: []
-  description: |-
-    ESB ObjectToCSVString
-    JBoss ESB uses the ObjectToCSVString action to do conversion on a message body. Fuse Service Works. would use a Smooks transform or a Camel route to perform this type of conversion.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: ESB ObjectToCSVString
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -721,19 +688,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses the ObjectToCSVString action to do conversion on a message
-    body. Fuse Service Works. would use a Smooks transform or a Camel route to perform
-    this type of conversion.. For additional information, see the. [Transformation
-    Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n JBoss ESB uses the ObjectToCSVString action to do conversion on
+    a message body. Fuse Service Works\n would use a Smooks transform or a Camel route
+    to perform this type of conversion.\n\n For additional information, see the\n
+    [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-34000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.ObjectToCSVString']/@class
 - customVariables: []
-  description: |-
-    ESB ObjectInvoke
-    JBoss ESB uses a ObjectInvoke action to invoke a processor on a message.. Fuse Service Works would use a bean component to do this.
+  description: ESB ObjectInvoke
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -744,17 +710,15 @@
   links:
   - title: Fuse Service Works Bean Component
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#sect-Bean
-  message: JBoss ESB uses a ObjectInvoke action to invoke a processor on a message..
-    Fuse Service Works would use a bean component to do this.
+  message: "\n \n JBoss ESB uses a ObjectInvoke action to invoke a processor on a
+    message.\n Fuse Service Works would use a bean component to do this.\n \n "
   ruleID: soa-p-35000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.ObjectInvoke']/@class
 - customVariables: []
-  description: |-
-    ESB ObjectToXStream
-    JBoss ESB uses an ObjectToXStream action to do convert an Object payload to XML using the XStream. processor. Fuse Service Works would use a Smooks transform or a Camel route to do this type of conversion.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: ESB ObjectToXStream
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -763,19 +727,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses an ObjectToXStream action to do convert an Object payload
-    to XML using the XStream. processor. Fuse Service Works would use a Smooks transform
-    or a Camel route to do this type of conversion.. For additional information, see
-    the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n JBoss ESB uses an ObjectToXStream action to do convert an Object
+    payload to XML using the XStream\n processor. Fuse Service Works would use a Smooks
+    transform or a Camel route to do this type of conversion.\n\n For additional information,
+    see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-36000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.ObjectToXStream']/@class
 - customVariables: []
-  description: |-
-    ESB XStreamToObject
-    JBoss ESB uses an XStreamToObject action to convert XML in a payload to an object using the XStream processor.. Fuse Service Works would use Smooks transform or a Camel route transform to do this type of conversion.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: ESB XStreamToObject
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -784,19 +747,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses an XStreamToObject action to convert XML in a payload to
-    an object using the XStream processor.. Fuse Service Works would use Smooks transform
-    or a Camel route transform to do this type of conversion.. For additional information,
-    see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n JBoss ESB uses an XStreamToObject action to convert XML in a payload
+    to an object using the XStream processor.\n Fuse Service Works would use Smooks
+    transform or a Camel route transform to do this type of conversion.\n\n For additional
+    information, see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-37000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.XStreamToObject']/@class
 - customVariables: []
-  description: |-
-    ESB XsltAction
-    JBoss ESB uses the XsltAction action to transform documents in a payload. Fuse Service Works would use Camel to do this type of. conversion.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: ESB XsltAction
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -805,18 +767,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses the XsltAction action to transform documents in a payload.
-    Fuse Service Works would use Camel to do this type of. conversion.. For additional
-    information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n JBoss ESB uses the XsltAction action to transform documents in a
+    payload. Fuse Service Works would use Camel to do this type of\n conversion.\n\n
+    For additional information, see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-38000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.transformation.xslt.XsltAction']/@class
 - customVariables: []
-  description: |-
-    ESB SmooksTransformer
-    Fuse Service Works uses a &lt;transform&gt; to replace the invocation of a SmooksTransformer to transform message content.. You will need to use a Smooks transform to specify your Smooks configuration and from/to types.. For additional information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  description: ESB SmooksTransformer
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -827,19 +788,18 @@
   links:
   - title: Smooks Development Guide
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_2_Smooks/
-  message: Fuse Service Works uses a &lt;transform&gt; to replace the invocation of
-    a SmooksTransformer to transform message content.. You will need to use a Smooks
-    transform to specify your Smooks configuration and from/to types.. For additional
-    information, see the. [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).
+  message: "\n \n Fuse Service Works uses a &lt;transform&gt; to replace the invocation
+    of a SmooksTransformer to transform message content.\n You will need to use a
+    Smooks transform to specify your Smooks configuration and from/to types.\n\n For
+    additional information, see the\n [Transformation Migration Guide](https://github.com/windup/soa-migration/blob/master/advice/transformation-migration.md).\n
+    \n "
   ruleID: soa-p-39000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.converters.SmooksTransformer']/@class
 - customVariables: []
-  description: |-
-    ESB MessagePersister
-    JBoss ESB uses the MessagePersister action to persist a message. Fuse Service Works would use. a [SQL reference binding](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SQL) to accomplish something similar.
+  description: ESB MessagePersister
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -848,18 +808,16 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses the MessagePersister action to persist a message. Fuse Service
-    Works would use. a [SQL reference binding](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SQL)
-    to accomplish something similar.
+  message: "\n \n JBoss ESB uses the MessagePersister action to persist a message.
+    Fuse Service Works would use\n a [SQL reference binding](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SQL)
+    to accomplish something similar.\n \n "
   ruleID: soa-p-40000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.MessagePersister']/@class
 - customVariables: []
-  description: |-
-    ESB EJBProcessor
-    JBoss ESB uses the EJBProcessor action to invoke a stateless session bean with the contents of a message.. Similar things can be achieved in Fuse Service Works through the use ofa bean service.
+  description: ESB EJBProcessor
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -870,18 +828,16 @@
   links:
   - title: Fuse Service Works Bean Component
     url: https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#sect-Bean
-  message: JBoss ESB uses the EJBProcessor action to invoke a stateless session bean
-    with the contents of a message.. Similar things can be achieved in Fuse Service
-    Works through the use ofa bean service.
+  message: "\n \n JBoss ESB uses the EJBProcessor action to invoke a stateless session
+    bean with the contents of a message.\n Similar things can be achieved in Fuse
+    Service Works through the use ofa bean service.\n \n "
   ruleID: soa-p-41000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.EJBProcessor']/@class
 - customVariables: []
-  description: |-
-    ESB ScriptingAction
-    The ScriptingAction executes a script using the BeanScriptingFramework. You can duplicate this functionality in Fuse Service Works. through Camel routing (both Java and XML.). For additional information, see the. [Camel Scripting Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).
+  description: ESB ScriptingAction
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -890,17 +846,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: The ScriptingAction executes a script using the BeanScriptingFramework.
-    You can duplicate this functionality in Fuse Service Works. through Camel routing
-    (both Java and XML.). For additional information, see the. [Camel Scripting Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).
+  message: "\n \n The ScriptingAction executes a script using the BeanScriptingFramework.
+    You can duplicate this functionality in Fuse Service Works\n through Camel routing
+    (both Java and XML.)\n\n For additional information, see the\n [Camel Scripting
+    Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Service_Implementations.html#Using_Scripting_Languages).\n
+    \n "
   ruleID: soa-p-42000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.scripting.ScriptingAction']/@class
 - customVariables: []
-  description: |
-    ESB {javaclassname}
+  description: ESB {javaclassname}
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -909,19 +866,18 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: JBoss ESB uses the {{javaclassname}} action to aggregate a message sequence
-    into a single aggregated message.. Fuse Service Works would make use of Camel
-    routing and Camel's aggregator to accomplish this.. For more information, see
-    the. [Camel Aggregator Documentation](http://camel.apache.org/aggregator.html).
+  message: "\n \n JBoss ESB uses the {{javaclassname}} action to aggregate a message
+    sequence into a single aggregated message.\n Fuse Service Works would make use
+    of Camel routing and Camel's aggregator to accomplish this.\n\n For more information,
+    see the\n [Camel Aggregator Documentation](http://camel.apache.org/aggregator.html).\n
+    \n "
   ruleID: soa-p-43000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and matches(@class, 'org.jboss.soa.esb.actions.(StreamingAggregator)|(Aggregator)')]/@class
 - customVariables: []
-  description: |-
-    ESB HTTP Router
-    In order to replace the use of the HttpRouter in JBoss ESB, you should use a HTTP reference binding.. Further documentation is available in the. [Fuse Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-HTTP).
+  description: ESB HTTP Router
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -930,18 +886,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the HttpRouter in JBoss ESB, you should
-    use a HTTP reference binding.. Further documentation is available in the. [Fuse
-    Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-HTTP).
+  message: "\n \n In order to replace the use of the HttpRouter in JBoss ESB, you
+    should use a HTTP reference binding.\n\n Further documentation is available in
+    the\n [Fuse Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-HTTP).\n
+    \n "
   ruleID: soa-p-44000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.routing.http.HttpRouter']/@class
 - customVariables: []
-  description: |-
-    ESB Email Router
-    In order to replace the use of the EmailRouter in Fuse Service Works, you should use a mail reference binding.. Further documentation is available in the. [Fuse Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-Mail).
+  description: ESB Email Router
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -950,18 +905,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the EmailRouter in Fuse Service Works, you
-    should use a mail reference binding.. Further documentation is available in the.
-    [Fuse Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-Mail).
+  message: "\n \n In order to replace the use of the EmailRouter in Fuse Service Works,
+    you should use a mail reference binding.\n\n Further documentation is available
+    in the\n [Fuse Service Works Developer Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-Mail).\n
+    \n "
   ruleID: soa-p-45000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.routing.email.EmailRouter']/@class
 - customVariables: []
-  description: |-
-    ESB ContentBasedRouter
-    In order to replace the use of the ContentBasedRouter in Fuse Service Works, you should use Camel to route messages.. A good example of this functionality can be found in the quickstarts project in the [rules-camel-jbr. quickstart](https://github.com/jboss-switchyard/quickstarts/tree/master/rules-camel-cbr).
+  description: ESB ContentBasedRouter
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -970,18 +924,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the ContentBasedRouter in Fuse Service Works,
-    you should use Camel to route messages.. A good example of this functionality
-    can be found in the quickstarts project in the [rules-camel-jbr. quickstart](https://github.com/jboss-switchyard/quickstarts/tree/master/rules-camel-cbr).
+  message: "\n \n In order to replace the use of the ContentBasedRouter in Fuse Service
+    Works, you should use Camel to route messages.\n\n A good example of this functionality
+    can be found in the quickstarts project in the [rules-camel-jbr\n quickstart](https://github.com/jboss-switchyard/quickstarts/tree/master/rules-camel-cbr).\n
+    \n "
   ruleID: soa-p-46000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.ContentBasedRouter']/@class
 - customVariables: []
-  description: |-
-    ESB StaticWiretap
-    In order to replace the use of the StaticWiretap in Fuse Service Works, you should use a. [Camel Wiretap](http://camel.apache.org/wire-tap.html) to perform this action.
+  description: ESB StaticWiretap
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -990,18 +943,16 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the StaticWiretap in Fuse Service Works,
-    you should use a. [Camel Wiretap](http://camel.apache.org/wire-tap.html) to perform
-    this action.
+  message: "\n \n In order to replace the use of the StaticWiretap in Fuse Service
+    Works, you should use a\n [Camel Wiretap](http://camel.apache.org/wire-tap.html)
+    to perform this action.\n \n "
   ruleID: soa-p-47000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.StaticWiretap']/@class
 - customVariables: []
-  description: |-
-    ESB Static Router
-    In order to replace the use of the StaticRouter in Fuse Service Works, you should use Camel to route messages.. Further information is available in the [Camel Integration Patterns Documentation](http://camel.apache.org/enterprise-integration-patterns.html).
+  description: ESB Static Router
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -1010,18 +961,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the StaticRouter in Fuse Service Works,
-    you should use Camel to route messages.. Further information is available in the
-    [Camel Integration Patterns Documentation](http://camel.apache.org/enterprise-integration-patterns.html).
+  message: "\n \n In order to replace the use of the StaticRouter in Fuse Service
+    Works, you should use Camel to route messages.\n\n Further information is available
+    in the [Camel Integration Patterns Documentation](http://camel.apache.org/enterprise-integration-patterns.html).\n
+    \n "
   ruleID: soa-p-48000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.StaticRouter']/@class
 - customVariables: []
-  description: |-
-    ESB SOAPProcessor
-    In order to replace the use of the SOAPProcessor you should use a SOAP reference binding in Fuse Service Works.. For more information, see the. [Fuse Service Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).
+  description: ESB SOAPProcessor
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -1030,18 +980,17 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the SOAPProcessor you should use a SOAP
-    reference binding in Fuse Service Works.. For more information, see the. [Fuse
-    Service Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).
+  message: "\n \n In order to replace the use of the SOAPProcessor you should use
+    a SOAP reference binding in Fuse Service Works.\n\n For more information, see
+    the\n [Fuse Service Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).\n
+    \n "
   ruleID: soa-p-49000
   when:
     builtin.xml:
       namespaces: {}
       xpath: //*[local-name()='action' and @class='org.jboss.soa.esb.actions.soap.SOAPProcessor']/@class
 - customVariables: []
-  description: |-
-    ESB SOAPClient
-    In order to replace the use of the SOAPClient in Fuse Service Works, you should use a SOAP reference binding.. For more information, see the. [Fuse Service Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).
+  description: ESB SOAPClient
   effort: 3
   labels:
   - konveyor.io/source=soa-p5-
@@ -1050,9 +999,10 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  message: In order to replace the use of the SOAPClient in Fuse Service Works, you
-    should use a SOAP reference binding.. For more information, see the. [Fuse Service
-    Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).
+  message: "\n \n In order to replace the use of the SOAPClient in Fuse Service Works,
+    you should use a SOAP reference binding.\n\n For more information, see the\n [Fuse
+    Service Works Development Guide](https://access.redhat.com/documentation/en-us/Red_Hat_JBoss_Fuse_Service_Works/6.0/html/Development_Guide_Volume_1_SwitchYard/chap-Gateways.html#sect-SOAP).\n
+    \n "
   ruleID: soa-p-50000
   when:
     builtin.xml:
diff --git a/default/generated/fuse/138-sonic-catchall.windup.yaml b/default/generated/fuse/138-sonic-catchall.windup.yaml
index 361b84e1..be84b503 100644
--- a/default/generated/fuse/138-sonic-catchall.windup.yaml
+++ b/default/generated/fuse/138-sonic-catchall.windup.yaml
@@ -6,8 +6,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: com.(?P<subpackage>(sonic|sonicsw)(\..*)?.)?(?P<classname>[^.]+)
-  description: |
-    Sonic proprietary type reference com.{subpackage}.{classname}
+  description: Sonic proprietary type reference com.{subpackage}.{classname}
   effort: 0
   labels:
   - konveyor.io/source=sonic
@@ -18,9 +17,9 @@
   - sonic
   - catchall
   links: []
-  message: This com.{{subpackage}}.{{classname}} is a Sonic proprietary type and needs
-    to be migrated to a compatible API. There are currently no detailed. migration
-    rules about this type.
+  message: "\n This com.{{subpackage}}.{{classname}} is a Sonic proprietary type and
+    needs to be migrated to a compatible API. There are currently no detailed\n migration
+    rules about this type.\n "
   ruleID: sonic-catchall-00000
   when:
     java.referenced:
diff --git a/default/generated/fuse/139-sonic-esb.windup.yaml b/default/generated/fuse/139-sonic-esb.windup.yaml
index 37384d96..a7815fdf 100644
--- a/default/generated/fuse/139-sonic-esb.windup.yaml
+++ b/default/generated/fuse/139-sonic-esb.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Sonic ESB service - inheritance from com.sonicsw.xq.XQService
-    Sonic ESB services inherit from XQService.  In Camel, this can be achieved through the simple Java Bean Camel Component.. * [Camel Java Bean Component](http://camel.apache.org/bean.html)
+  description: Sonic ESB service - inheritance from com.sonicsw.xq.XQService
   effort: 4
   labels:
   - konveyor.io/source=sonic
@@ -13,8 +11,9 @@
   links:
   - title: XQService Javadoc
     url: http://documentation.progress.com/output/Sonic/8.0.0/Docs8.0/api/esb_api/com/sonicsw/xq/XQService.html
-  message: Sonic ESB services inherit from XQService.  In Camel, this can be achieved
-    through the simple Java Bean Camel Component.. * [Camel Java Bean Component](http://camel.apache.org/bean.html)
+  message: "\n \n Sonic ESB services inherit from XQService. In Camel, this can be
+    achieved through the simple Java Bean Camel Component.\n\n * [Camel Java Bean
+    Component](http://camel.apache.org/bean.html)\n \n "
   ruleID: sonic-esb-01000
   tag:
   - sonic-esb
@@ -25,8 +24,7 @@
       pattern: com.sonicsw.xq.XQService
 - category: mandatory
   customVariables: []
-  description: |
-    Reference to com.sonicsw.xq.XQServiceContext
+  description: Reference to com.sonicsw.xq.XQServiceContext
   effort: 4
   labels:
   - konveyor.io/source=sonic
@@ -35,18 +33,20 @@
   - sonic-esb
   - camel
   links: []
-  message: Sonic ESB services leverage the service(XQServiceContext context) method
-    to implement business logic.  When messages are routed to the service, the service(XQServiceContext
-    context) method is executed.. In Camel, this is achieved by routing messages to
-    the Java Bean via the Camel Route's Bean Component syntax.. * [Camel Java Bean
-    Component](http://camel.apache.org/bean.html). * [Camel Binding Annotations](http://camel.apache.org/parameter-binding-annotations.html).
-    Camel's Java Bean Component can leverage annotations annotations on the method
-    to specify how Camel Message body values are mapped to the method parameters.  Additionally,
-    the @Handler annotation can be leveraged to setup the default Java Bean method..
-    **For example:**. ```java. public void service(XQServiceContext ctx) throws XQServiceException
-    \{{. .... }}. ```. **Should become:**. ```java. @Handler. public void service(@Header
-    messageHeader, @Body messageBody, Exchange exchange) \{{. .... }}. ```. * org.apache.camel.Body.
-    * org.apache.camel.Header. * org.apache.camel.Exchange
+  message: "\n \n Sonic ESB services leverage the service(XQServiceContext context)
+    method to implement business logic. When messages are routed to the service, the
+    service(XQServiceContext context) method is executed.\n In Camel, this is achieved
+    by routing messages to the Java Bean via the Camel Route's Bean Component syntax.\n\n
+    * [Camel Java Bean Component](http://camel.apache.org/bean.html)\n * [Camel Binding
+    Annotations](http://camel.apache.org/parameter-binding-annotations.html)\n\n Camel's
+    Java Bean Component can leverage annotations annotations on the method to specify
+    how Camel Message body values are mapped to the method parameters. Additionally,
+    the @Handler annotation can be leveraged to setup the default Java Bean method.\n\n
+    **For example:**\n\n ```java\n public void service(XQServiceContext ctx) throws
+    XQServiceException \\{{\n ...\n }}\n ```\n\n **Should become:**\n\n ```java\n
+    @Handler\n public void service(@Header messageHeader, @Body messageBody, Exchange
+    exchange) \\{{\n ...\n }}\n ```\n\n * org.apache.camel.Body\n * org.apache.camel.Header\n
+    * org.apache.camel.Exchange\n \n "
   ruleID: sonic-esb-02000
   when:
     or:
@@ -58,8 +58,7 @@
         pattern: com.sonicsw.xq.XQServiceContext
 - category: mandatory
   customVariables: []
-  description: |
-    Reference to com.sonicsw.xq.XQInitContext
+  description: Reference to com.sonicsw.xq.XQInitContext
   effort: 4
   labels:
   - konveyor.io/source=sonic
@@ -69,13 +68,13 @@
   - camel
   - spring
   links: []
-  message: The XQInitContext is used to receive initialization information for the
-    service from Sonic ESB.. This is not neccessary for Camel.  The init() method
-    that receives this object should be replaced with Spring Bean property injection.  For
-    initialization beyond propery injection, leverage Spring's @PostConstruct annotation
-    on this init() method.. * [Spring @PostConstruct Documentation](http://docs.spring.io/spring/docs/2.5.x/reference/beans.html#beans-postconstruct-and-predestroy-annotations).
-    ```java. @PostConstruct. public void init() \{{. //leverage injected properties.
-    }}. ```
+  message: "\n \n The XQInitContext is used to receive initialization information
+    for the service from Sonic ESB.\n\n This is not neccessary for Camel. The init()
+    method that receives this object should be replaced with Spring Bean property
+    injection. For initialization beyond propery injection, leverage Spring's @PostConstruct
+    annotation on this init() method.\n\n * [Spring @PostConstruct Documentation](http://docs.spring.io/spring/docs/2.5.x/reference/beans.html#beans-postconstruct-and-predestroy-annotations)\n\n
+    ```java\n @PostConstruct\n public void init() \\{{\n //leverage injected properties\n
+    }}\n ```\n \n "
   ruleID: sonic-esb-03000
   when:
     or:
@@ -87,9 +86,7 @@
         pattern: com.sonicsw.xq.XQInitContext
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQInitContext.getParameters
-    Migrate XQInitContext.getParameters to Spring property injection.
+  description: Call of com.sonicsw.xq.XQInitContext.getParameters
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -106,9 +103,7 @@
       pattern: com.sonicsw.xq.XQInitContext.getParameters*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQParameters.getParameter
-    Migrate XQParameters.getParameter to Spring property injection.
+  description: Call of com.sonicsw.xq.XQParameters.getParameter
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -126,9 +121,7 @@
       pattern: com.sonicsw.xq.XQParameters.getParameter*
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQParameters
-    Migrate XQParameters to Spring property injection.
+  description: Reference to com.sonicsw.xq.XQParameters
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -150,9 +143,7 @@
         pattern: com.sonicsw.xq.XQParameters
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQParameters
-    Migrate XQParameterInfo to Spring property injection.
+  description: Reference to com.sonicsw.xq.XQParameters
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -174,9 +165,7 @@
         pattern: com.sonicsw.xq.XQParameterInfo
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQMessage
-    Migrate to org.apache.camel.Message
+  description: Reference to com.sonicsw.xq.XQMessage
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -197,9 +186,7 @@
         pattern: com.sonicsw.xq.XQMessage
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.getHeaderValue
-    Migrate to org.apache.camel.Message.getHeader(String name)
+  description: Call of com.sonicsw.xq.XQMessage.getHeaderValue
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -216,9 +203,7 @@
       pattern: com.sonicsw.xq.XQMessage.getHeaderValue*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.setHeaderValue
-    Migrate to org.apache.camel.Message.setHeader(String name, Object value)
+  description: Call of com.sonicsw.xq.XQMessage.setHeaderValue
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -235,9 +220,7 @@
       pattern: com.sonicsw.xq.XQMessage.setHeaderValue*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.getHeaderNames
-    Migrate to org.apache.camel.Message.getHeaders()
+  description: Call of com.sonicsw.xq.XQMessage.getHeaderNames
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -254,9 +237,7 @@
       pattern: com.sonicsw.xq.XQMessage.getHeaderNames*
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQPart
-    Migrate XQPart to an attachment on the org.apache.camel.Message
+  description: Reference to com.sonicsw.xq.XQPart
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -277,9 +258,7 @@
         pattern: com.sonicsw.xq.XQPart
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.getPartCount
-    Migrate to org.apache.camel.Message.getAttachments().size()
+  description: Call of com.sonicsw.xq.XQMessage.getPartCount
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -296,9 +275,7 @@
       pattern: com.sonicsw.xq.XQMessage.getPartCount*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.getPart
-    Migrate to org.apache.camel.Message.getAttachment(String id)
+  description: Call of com.sonicsw.xq.XQMessage.getPart
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -315,9 +292,7 @@
       pattern: com.sonicsw.xq.XQMessage.getPart*
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQLog
-    Migrate to [Apache SLF4J](http://www.slf4j.org).
+  description: Reference to com.sonicsw.xq.XQLog
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -327,7 +302,7 @@
   - camel
   - slf4j
   links: []
-  message: Migrate to [Apache SLF4J](http://www.slf4j.org).
+  message: "\n Migrate to [Apache SLF4J](http://www.slf4j.org).\n "
   ruleID: sonic-esb-15000
   when:
     or:
@@ -339,9 +314,7 @@
         pattern: com.sonicsw.xq.XQLog
 - category: mandatory
   customVariables: []
-  description: "Reference to com.sonicsw.xq.XQServiceException \nCreate a custom ServiceException
-    class, extending Exception.  The documentation below explains exception handling
-    in Camel.. * [Camel Exception Handling](http://camel.apache.org/exception-clause.html)"
+  description: 'Reference to com.sonicsw.xq.XQServiceException '
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -350,8 +323,9 @@
   - sonic-esb
   - camel
   links: []
-  message: Create a custom ServiceException class, extending Exception.  The documentation
-    below explains exception handling in Camel.. * [Camel Exception Handling](http://camel.apache.org/exception-clause.html)
+  message: "\n \n Create a custom ServiceException class, extending Exception. The
+    documentation below explains exception handling in Camel.\n\n * [Camel Exception
+    Handling](http://camel.apache.org/exception-clause.html)\n \n "
   ruleID: sonic-esb-16000
   when:
     or:
@@ -363,9 +337,7 @@
         pattern: com.sonicsw.xq.XQServiceException
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQMessage.getCorrelationId
-    Correlation is handled several ways in Camel.  Read the article below.. * [Camel Exception Handling](http://camel.apache.org/correlation-identifier.html)
+  description: Call of com.sonicsw.xq.XQMessage.getCorrelationId
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -374,8 +346,8 @@
   - sonic-esb
   - camel
   links: []
-  message: Correlation is handled several ways in Camel.  Read the article below..
-    * [Camel Exception Handling](http://camel.apache.org/correlation-identifier.html)
+  message: "\n \n Correlation is handled several ways in Camel. Read the article below.\n\n
+    * [Camel Exception Handling](http://camel.apache.org/correlation-identifier.html)\n "
   ruleID: sonic-esb-17000
   when:
     java.referenced:
@@ -383,9 +355,7 @@
       pattern: com.sonicsw.xq.XQMessage.getCorrelationId*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQAddressFactory.createEndpointAddress
-    This indicates that the Sonic ESB Service is routing messages to a [1...N] endpoints.  To achieve this in Camel, take the business logic in the service, and populate a header property with an array of target enpoints.. Next, create a Recipient List processor to route the message to N endpoints.. * [Camel Recipient List](http://camel.apache.org/recipientlist-annotation.html)
+  description: Call of com.sonicsw.xq.XQAddressFactory.createEndpointAddress
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -394,11 +364,12 @@
   - sonic-esb
   - camel
   links: []
-  message: This indicates that the Sonic ESB Service is routing messages to a [1...N]
-    endpoints.  To achieve this in Camel, take the business logic in the service,
-    and populate a header property with an array of target enpoints.. Next, create
-    a Recipient List processor to route the message to N endpoints.. * [Camel Recipient
-    List](http://camel.apache.org/recipientlist-annotation.html)
+  message: "\n \n This indicates that the Sonic ESB Service is routing messages to
+    a [1...N] endpoints. To achieve this in Camel, take the business logic in the
+    service, and populate a header property with an array of target enpoints.\n\n
+    Next, create a Recipient List processor to route the message to N endpoints.\n\n
+    * [Camel Recipient List](http://camel.apache.org/recipientlist-annotation.html)\n
+    \n "
   ruleID: sonic-esb-18000
   when:
     java.referenced:
@@ -406,9 +377,7 @@
       pattern: com.sonicsw.xq.XQAddressFactory.createEndpointAddress*
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQServiceContext.addOutgoing
-    Sonic ESB uses the addOutgoing method to set the outgoing message.. This is achieved in Camel by either modifying the @Body parameter in the Java Bean Component method, or literally setting a new message to the Exchange.. * [Camel Setting Response](http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html)
+  description: Call of com.sonicsw.xq.XQServiceContext.addOutgoing
   effort: 1
   labels:
   - konveyor.io/source=sonic
@@ -417,10 +386,11 @@
   - sonic-esb
   - camel
   links: []
-  message: Sonic ESB uses the addOutgoing method to set the outgoing message.. This
-    is achieved in Camel by either modifying the @Body parameter in the Java Bean
-    Component method, or literally setting a new message to the Exchange.. * [Camel
-    Setting Response](http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html)
+  message: "\n \n Sonic ESB uses the addOutgoing method to set the outgoing message.\n
+    This is achieved in Camel by either modifying the @Body parameter in the Java
+    Bean Component method, or literally setting a new message to the Exchange.\n\n
+    * [Camel Setting Response](http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html)\n
+    \n "
   ruleID: sonic-esb-19000
   when:
     java.referenced:
@@ -428,9 +398,7 @@
       pattern: com.sonicsw.xq.XQServiceContext.addOutgoing*
 - category: mandatory
   customVariables: []
-  description: |-
-    Reference to com.sonicsw.xq.XQEnvelope
-    Migrate to org.apache.camel.Exchange
+  description: Reference to com.sonicsw.xq.XQEnvelope
   effort: 3
   labels:
   - konveyor.io/source=sonic
@@ -451,9 +419,7 @@
         pattern: com.sonicsw.xq.XQEnvelope
 - category: mandatory
   customVariables: []
-  description: |-
-    Call of com.sonicsw.xq.XQEnvelope.getMessage
-    Migrate to org.apache.camel.Message.getIn()
+  description: Call of com.sonicsw.xq.XQEnvelope.getMessage
   effort: 1
   labels:
   - konveyor.io/source=sonic
diff --git a/default/generated/fuse/140-xml-sonic-esb.windup.yaml b/default/generated/fuse/140-xml-sonic-esb.windup.yaml
index 53f48125..697b0079 100644
--- a/default/generated/fuse/140-xml-sonic-esb.windup.yaml
+++ b/default/generated/fuse/140-xml-sonic-esb.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/source=sonicesb
   - konveyor.io/target=fuse6+
diff --git a/default/generated/hibernate/142-hibernate-catchall.windup.yaml b/default/generated/hibernate/142-hibernate-catchall.windup.yaml
index dc399d53..728344a4 100644
--- a/default/generated/hibernate/142-hibernate-catchall.windup.yaml
+++ b/default/generated/hibernate/142-hibernate-catchall.windup.yaml
@@ -5,7 +5,7 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: org.hibernate.(?P<packageRemainder>(.*)?.)?(?P<type>[^.]+)
-  description: |
+  description: |-
     Hibernate
     This is a Hibernate type and it will need to be verified for compatibility with the latest Hibernate version.
   labels:
diff --git a/default/generated/hibernate/143-hibernate-xml.windup.yaml b/default/generated/hibernate/143-hibernate-xml.windup.yaml
index cc36bbaa..fb177ab9 100644
--- a/default/generated/hibernate/143-hibernate-xml.windup.yaml
+++ b/default/generated/hibernate/143-hibernate-xml.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate: Deprecated 'string' CLOB data type
-    In versions of Hibernate prior to 3.5, text type was mapped to JDBC CLOB. A new Hibernate type, `materialized_clob`, was added in Hibernate 4 to map Java `String` properties to JDBC CLOB
+  description: 'Hibernate: Deprecated ''string'' CLOB data type'
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -29,9 +27,8 @@
       from: "1"
 - category: mandatory
   customVariables: []
-  description: |-
-    hibernate.jdbc.use_streams_for_binary must be set according to the provider
-    If you are using Oracle and using the ```materialized_clob``` or ```materialized_blob``` properties, this global environment variable must be set to true.. If you are using PostgreSQL and using the CLOB or BLOB properties, this global environment variable  must be set to false.
+  description: hibernate.jdbc.use_streams_for_binary must be set according to the
+    provider
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -41,10 +38,10 @@
   - hibernate
   - configuration
   links: []
-  message: If you are using Oracle and using the ```materialized_clob``` or ```materialized_blob```
-    properties, this global environment variable must be set to true.. If you are
-    using PostgreSQL and using the CLOB or BLOB properties, this global environment
-    variable  must be set to false.
+  message: "\n If you are using Oracle and using the ```materialized_clob``` or ```materialized_blob```
+    properties, this global environment variable must be set to true.\n\t\t\tIf you
+    are using PostgreSQL and using the CLOB or BLOB properties, this global environment
+    variable must be set to false.\n "
   ruleID: hibernate-xml-02000
   when:
     or:
@@ -59,9 +56,7 @@
       from: "1"
 - category: mandatory
   customVariables: []
-  description: |-
-    Hibernate: Removed package org.hibernate.connection
-    From Hibernate 4.0 there were moved classes from package `org.hibernate.connection` to package `org.hibernate.service.jdbc.connections.internal`.. You should change your Hibernate setup to replace references to the old package names.
+  description: 'Hibernate: Removed package org.hibernate.connection'
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -71,9 +66,9 @@
   - hibernate
   - configuration
   links: []
-  message: From Hibernate 4.0 there were moved classes from package `org.hibernate.connection`
-    to package `org.hibernate.service.jdbc.connections.internal`.. You should change
-    your Hibernate setup to replace references to the old package names.
+  message: "From Hibernate 4.0 there were moved classes from package `org.hibernate.connection`
+    to package `org.hibernate.service.jdbc.connections.internal`.\n You should change
+    your Hibernate setup to replace references to the old package names.\n "
   ruleID: hibernate-xml-03000
   when:
     builtin.filecontent:
diff --git a/default/generated/hibernate/144-hibernate.windup.yaml b/default/generated/hibernate/144-hibernate.windup.yaml
index 44738c03..897f300d 100644
--- a/default/generated/hibernate/144-hibernate.windup.yaml
+++ b/default/generated/hibernate/144-hibernate.windup.yaml
@@ -1,8 +1,6 @@
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Deprecated @Type(type=text)
-    In versions of Hibernate prior to 3.5, text type was mapped to JDBC CLOB. A new Hibernate type, materialized_clob, was added in Hibernate 4 to map Java String properties to JDBC CLOB. Therefore, Hibernate 4 text LOB type definitions should be defined using `@Lob`, instead.
+  description: Hibernate 4 - Deprecated @Type(type=text)
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -15,10 +13,10 @@
   links:
   - title: Hibernate 4 java @Type migration.
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Migrate_Your_Hibernate_33x_Application_to_Hibernate_4x
-  message: In versions of Hibernate prior to 3.5, text type was mapped to JDBC CLOB.
-    A new Hibernate type, materialized_clob, was added in Hibernate 4 to map Java
-    String properties to JDBC CLOB. Therefore, Hibernate 4 text LOB type definitions
-    should be defined using `@Lob`, instead.
+  message: "\n In versions of Hibernate prior to 3.5, text type was mapped to JDBC
+    CLOB. A new Hibernate type, materialized_clob, was added in Hibernate 4 to map
+    Java String properties to JDBC CLOB. Therefore, Hibernate 4 text LOB type definitions
+    should be defined using `@Lob`, instead.\n "
   ruleID: hibernate-01000
   when:
     java.referenced:
@@ -28,9 +26,7 @@
   - name: method
     nameOfCaptureGroup: method
     pattern: org.hibernate.criterion.Projections.(?P<method>(count|rowCount|sum))?.*
-  description: |-
-    Hibernate 4 - Changed 'Projections' return types
-    The return types of the numeric aggregate criteria projections has changed to Long in hibernate 4. This change may introduce conflicts in the code.
+  description: Hibernate 4 - Changed 'Projections' return types
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -43,8 +39,8 @@
   links:
   - title: Hibernate 4 projections return type change.
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Migrate_Your_Hibernate_33x_Application_to_Hibernate_4x
-  message: The return types of the numeric aggregate criteria projections has changed
-    to Long in hibernate 4. This change may introduce conflicts in the code.
+  message: "\n The return types of the numeric aggregate criteria projections has
+    changed to Long in hibernate 4. This change may introduce conflicts in the code.\n "
   ruleID: hibernate-02000
   when:
     java.referenced:
@@ -52,9 +48,8 @@
       pattern: org.hibernate.criterion.Projections.(count|rowCount|sum)*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Changed naming strategy from 'DefaultNamingStrategy' to 'EJB3NamingStrategy'
-    The initial/default naming strategy in Hibernate 4 was changed from DefaultNamingStrategy to EJB3NamingStrategy. This can result in naming mismatches. If you rely on the naming strategy, call Configuration#setNamingStrategy.
+  description: Hibernate 4 - Changed naming strategy from 'DefaultNamingStrategy'
+    to 'EJB3NamingStrategy'
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -67,9 +62,9 @@
   links:
   - title: Hibernate 4 naming strategy change documentation.
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/migration_guide/index#Migrate_Your_Hibernate_3.5.x_Application_to_Hibernate_4.x
-  message: The initial/default naming strategy in Hibernate 4 was changed from DefaultNamingStrategy
-    to EJB3NamingStrategy. This can result in naming mismatches. If you rely on the
-    naming strategy, call Configuration#setNamingStrategy.
+  message: "\n The initial/default naming strategy in Hibernate 4 was changed from
+    DefaultNamingStrategy to EJB3NamingStrategy. This can result in naming mismatches.
+    If you rely on the naming strategy, call Configuration#setNamingStrategy.\n "
   ruleID: hibernate-03000
   when:
     java.referenced:
@@ -77,9 +72,7 @@
       pattern: org.hibernate.cfg.AnnotationConfiguration*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Removed classes in 'org.hibernate.classic'
-    The deprecated classes in org.hibernate.classic package was removed in Hibernate 4.
+  description: Hibernate 4 - Removed classes in 'org.hibernate.classic'
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -101,9 +94,7 @@
       pattern: org.hibernate.classic*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Replaced DialectResolver
-    Replace org.hibernate.dialect.resolver.DialectResolver with org.hibernate.service.jdbc.dialect.spi.DialectResolver.
+  description: Hibernate 4 - Replaced DialectResolver
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -121,9 +112,7 @@
       pattern: org.hibernate.dialect.resolver.DialectResolver
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Replaced BatcherFactory
-    Replace org.hibernate.jdbc.BatcherFactory by org.hibernate.engine.jdbc.batch.spi.BatchBuilder.. Their default implementations are in org.hibernate.engine.jdbc.batch.internal.. You can override the default BatchBuilder by defining the  "hibernate.jdbc.batch.builder" property as the name of a BatchBuilder implementation. or by providing a BatchBuilder in a custom ServiceRegistry.
+  description: Hibernate 4 - Replaced BatcherFactory
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -134,11 +123,11 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: Replace org.hibernate.jdbc.BatcherFactory by org.hibernate.engine.jdbc.batch.spi.BatchBuilder..
-    Their default implementations are in org.hibernate.engine.jdbc.batch.internal..
-    You can override the default BatchBuilder by defining the  "hibernate.jdbc.batch.builder"
-    property as the name of a BatchBuilder implementation. or by providing a BatchBuilder
-    in a custom ServiceRegistry.
+  message: "Replace org.hibernate.jdbc.BatcherFactory by org.hibernate.engine.jdbc.batch.spi.BatchBuilder.\n
+    Their default implementations are in org.hibernate.engine.jdbc.batch.internal.\n
+    You can override the default BatchBuilder by defining the \"hibernate.jdbc.batch.builder\"
+    property as the name of a BatchBuilder implementation\n or by providing a BatchBuilder
+    in a custom ServiceRegistry.\n "
   ruleID: hibernate-06000
   when:
     or:
@@ -150,9 +139,7 @@
         pattern: org.hibernate.jdbc.NonBatchingBatcherFactory
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Replaced JDBC Batcher
-    Replace org.hibernate.jdbc.Batcher by org.hibernate.engine.jdbc.batch.spi.Batch.. Their default implementations are in org.hibernate.engine.jdbc.batch.internal.
+  description: Hibernate 4 - Replaced JDBC Batcher
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -163,8 +150,8 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: Replace org.hibernate.jdbc.Batcher by org.hibernate.engine.jdbc.batch.spi.Batch..
-    Their default implementations are in org.hibernate.engine.jdbc.batch.internal.
+  message: "Replace org.hibernate.jdbc.Batcher by org.hibernate.engine.jdbc.batch.spi.Batch.\n
+    Their default implementations are in org.hibernate.engine.jdbc.batch.internal.\n "
   ruleID: hibernate-07000
   when:
     or:
@@ -178,9 +165,7 @@
         pattern: org.hibernate.jdbc.NonBatchingBatcher
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - SessionImplementor replacement
-    Replace org.hibernate.engine.SessionImplementor with org.hibernate.engine.spi.SessionImplementor
+  description: Hibernate 4 - SessionImplementor replacement
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -191,7 +176,7 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: Replace org.hibernate.engine.SessionImplementor with org.hibernate.engine.spi.SessionImplementor
+  message: "Replace org.hibernate.engine.SessionImplementor with org.hibernate.engine.spi.SessionImplementor\n "
   ruleID: hibernate-08000
   when:
     java.referenced:
@@ -201,9 +186,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: org.hibernate.connection.(?P<classname>[^.]+)
-  description: |-
-    Hibernate 4 - Renamed package 'org.hibernate.connection'
-    The classes in org.hibernate.connection package was moved to org.hibernate.service.jdbc.connections.internal in Hibernate 4
+  description: Hibernate 4 - Renamed package 'org.hibernate.connection'
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -223,9 +206,7 @@
       pattern: org.hibernate.connection*
 - category: optional
   customVariables: []
-  description: |-
-    Hibernate 4 - Replace org.hibernate.collection.PersistentBag
-    The class org.hibernate.collection.PersistentBag was moved to org.hibernate.collection.internal.PersistentBag in Hibernate 4
+  description: Hibernate 4 - Replace org.hibernate.collection.PersistentBag
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -247,9 +228,7 @@
   - name: classname
     nameOfCaptureGroup: classname
     pattern: net.sf.hibernate.(?P<classname>[^.]+)
-  description: |-
-    Hibernate type reference net.sf.hibernate.{classname}
-    This is an old Hibernate package name from version 2.x and needs to be migrated to a compatible API to Hibernate 4.x/5.x,. where package name is org.hibernate.
+  description: Hibernate type reference net.sf.hibernate.{classname}
   effort: 1
   labels:
   - konveyor.io/source=hibernate3.9-
@@ -260,8 +239,9 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: This is an old Hibernate package name from version 2.x and needs to be
-    migrated to a compatible API to Hibernate 4.x/5.x,. where package name is org.hibernate.
+  message: "\n This is an old Hibernate package name from version 2.x and needs to
+    be migrated to a compatible API to Hibernate 4.x/5.x,\n where package name is
+    org.hibernate.\n "
   ruleID: hibernate-10100
   tag:
   - Hibernate 2.x - Renamed package 'net.sf.hibernate'
diff --git a/default/generated/openjdk11/145-java-removals.windup.yaml b/default/generated/openjdk11/145-java-removals.windup.yaml
index 09a2c16d..2ac1f274 100644
--- a/default/generated/openjdk11/145-java-removals.windup.yaml
+++ b/default/generated/openjdk11/145-java-removals.windup.yaml
@@ -1,20 +1,20 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Methods in `java.lang.Thread` have been removed
-    The `java.lang.Thread.stop(Throwable)` method has been removed, as it is dangerous for a thread to not only be able to directly stop another thread, but with an exception it may not expect. Instead, the thread should be notified to stop using a shared variable or `interrupt()`.. The `java.lang.Thread.destroy()` method was never even implemented and just throws `NoSuchMethodError`.
+  description: Methods in `java.lang.Thread` have been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Java Thread Primitive Deprecation
     url: https://docs.oracle.com/javase/7/docs/technotes/guides/concurrency/threadPrimitiveDeprecation.html
-  message: The `java.lang.Thread.stop(Throwable)` method has been removed, as it is
-    dangerous for a thread to not only be able to directly stop another thread, but
-    with an exception it may not expect. Instead, the thread should be notified to
-    stop using a shared variable or `interrupt()`.. The `java.lang.Thread.destroy()`
-    method was never even implemented and just throws `NoSuchMethodError`.
+  message: "\n The `java.lang.Thread.stop(Throwable)` method has been removed, as
+    it is dangerous for a thread to not only be able to directly stop another thread,
+    but with an exception it may not expect. Instead, the thread should be notified
+    to stop using a shared variable or `interrupt()`.\n The `java.lang.Thread.destroy()`
+    method was never even implemented and just throws `NoSuchMethodError`.\n "
   ruleID: java-removals-00000
   when:
     or:
@@ -26,19 +26,19 @@
         pattern: java.lang.Thread.destroy*
 - category: mandatory
   customVariables: []
-  description: |-
-    sun.reflect.Reflection class was deprecated in Java 9
-    Java 9 introduced the `StackWalker API` to replace `sun.reflect.Reflection`.. As such, the use of `sun.reflect.Reflection` class and particular the `getCallerClass` method should no longer be needed.. Refer to the example changeset linked below.
+  description: sun.reflect.Reflection class was deprecated in Java 9
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Example changeset
     url: https://hg.openjdk.java.net/openjfx/9-dev/rt/rev/70f6fa01a32c
-  message: Java 9 introduced the `StackWalker API` to replace `sun.reflect.Reflection`..
-    As such, the use of `sun.reflect.Reflection` class and particular the `getCallerClass`
-    method should no longer be needed.. Refer to the example changeset linked below.
+  message: "\n Java 9 introduced the `StackWalker API` to replace `sun.reflect.Reflection`.
+    \n As such, the use of `sun.reflect.Reflection` class and particular the `getCallerClass`
+    method should no longer be needed. \n Refer to the example changeset linked below.\n "
   ruleID: java-removals-00010
   when:
     or:
@@ -50,18 +50,18 @@
         pattern: sun.reflect.Reflection*
 - category: mandatory
   customVariables: []
-  description: |-
-    sun.reflect.CallerSensitive annotation was deprecated in Java 9
-    `sun.reflect.CallerSensitive` annotation was deprecated in Java 9.. Refer to the example changeset linked below.
+  description: sun.reflect.CallerSensitive annotation was deprecated in Java 9
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Example changeset
     url: https://hg.openjdk.java.net/openjfx/9-dev/rt/rev/70f6fa01a32c
-  message: '`sun.reflect.CallerSensitive` annotation was deprecated in Java 9.. Refer
-    to the example changeset linked below.'
+  message: "\n `sun.reflect.CallerSensitive` annotation was deprecated in Java 9.\n
+    Refer to the example changeset linked below. \n "
   ruleID: java-removals-00020
   when:
     or:
@@ -73,23 +73,23 @@
         pattern: sun.reflect.CallerSensitive*
 - category: mandatory
   customVariables: []
-  description: |-
-    The `javax.security.auth.Policy` class has been removed
-    The `javax.security.auth.Policy` class has been removed.. It should be replaced by the use of `java.security.Policy` and `java.security.ProtectionDomain`.. Usage of `policy.getPermissions(subject,codeSource)` should be  replaced with a call to. policy.getPermissions passing in a new ProtectionDomain (see links below for details)
+  description: The `javax.security.auth.Policy` class has been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Java 10 javax.security.auth.Policy api
     url: https://docs.oracle.com/javase/10/docs/api/javax/security/auth/Policy.html
   - title: Java 11 java.security.Policy api
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/security/Policy.html
-  message: The `javax.security.auth.Policy` class has been removed.. It should be
-    replaced by the use of `java.security.Policy` and `java.security.ProtectionDomain`..
-    Usage of `policy.getPermissions(subject,codeSource)` should be  replaced with
-    a call to. policy.getPermissions passing in a new ProtectionDomain (see links
-    below for details)
+  message: "\n \n The `javax.security.auth.Policy` class has been removed.\n It should
+    be replaced by the use of `java.security.Policy` and `java.security.ProtectionDomain`.\n
+    Usage of `policy.getPermissions(subject,codeSource)` should be replaced with a
+    call to\n policy.getPermissions passing in a new ProtectionDomain (see links below
+    for details)\n \n "
   ruleID: java-removals-00030
   when:
     java.referenced:
@@ -99,27 +99,28 @@
   - name: methodName
     nameOfCaptureGroup: methodName
     pattern: java.lang.SecurityManager.(?P<methodName>(checkAwtEventQueueAccess|checkSystemClipboardAccess|checkTopLevelWindow))?(.*)
-  description: |-
-    AWT SecurityManager method java.lang.SecurityManager.{method-name} has been removed in Java 11
-    Due to modularisation, the methods `java.lang.SecurityManager.checkAwtEventQueueAccess()`,. `java.lang.SecurityManager.checkSystemClipboardAccess()` and. `java.lang.SecurityManager.checkTopLevelWindow(java.lang.Object)`. have been removed, so that the core SecurityManager class does not depend on the AWT stack.. Replace with a call to `java.lang.SecurityManager.checkPermission(java.security.Permission)` as follows:. `java.lang.SecurityManager.checkAwtEventQueueAccess()` --> `java.lang.SecurityManager.checkPermission(new AWTPermission("accessEventQueue"))`. `java.lang.SecurityManager.checkSystemClipboardAccess()` --> `java.lang.SecurityManager.checkPermission(new AWTPermission("accessClipboard"))`. `java.lang.SecurityManager.checkTopLevelWindow(java.lang.Object) --> java.lang.SecurityManager.checkPermission(new AWTPermission("showWindowWithoutWarningBanner"))`
+  description: AWT SecurityManager method java.lang.SecurityManager.{method-name}
+    has been removed in Java 11
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Java 11 SecurityManager api
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/SecurityManager.html
   - title: Java 11 AWTPermission api
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.desktop/java/awt/AWTPermission.html
-  message: Due to modularisation, the methods `java.lang.SecurityManager.checkAwtEventQueueAccess()`,.
-    `java.lang.SecurityManager.checkSystemClipboardAccess()` and. `java.lang.SecurityManager.checkTopLevelWindow(java.lang.Object)`.
+  message: "\n Due to modularisation, the methods `java.lang.SecurityManager.checkAwtEventQueueAccess()`,\n
+    `java.lang.SecurityManager.checkSystemClipboardAccess()` and\n `java.lang.SecurityManager.checkTopLevelWindow(java.lang.Object)`\n
     have been removed, so that the core SecurityManager class does not depend on the
-    AWT stack.. Replace with a call to `java.lang.SecurityManager.checkPermission(java.security.Permission)`
-    as follows:. `java.lang.SecurityManager.checkAwtEventQueueAccess()` --> `java.lang.SecurityManager.checkPermission(new
-    AWTPermission("accessEventQueue"))`. `java.lang.SecurityManager.checkSystemClipboardAccess()`
-    --> `java.lang.SecurityManager.checkPermission(new AWTPermission("accessClipboard"))`.
+    AWT stack.\n\n Replace with a call to `java.lang.SecurityManager.checkPermission(java.security.Permission)`
+    as follows:\n\n `java.lang.SecurityManager.checkAwtEventQueueAccess()` --> `java.lang.SecurityManager.checkPermission(new
+    AWTPermission(\"accessEventQueue\"))`\n `java.lang.SecurityManager.checkSystemClipboardAccess()`
+    --> `java.lang.SecurityManager.checkPermission(new AWTPermission(\"accessClipboard\"))`\n
     `java.lang.SecurityManager.checkTopLevelWindow(java.lang.Object) --> java.lang.SecurityManager.checkPermission(new
-    AWTPermission("showWindowWithoutWarningBanner"))`
+    AWTPermission(\"showWindowWithoutWarningBanner\"))`\n "
   ruleID: java-removals-00040
   when:
     java.referenced:
@@ -127,20 +128,21 @@
       pattern: java.lang.SecurityManager.(checkAwtEventQueueAccess|checkSystemClipboardAccess|checkTopLevelWindow)*
 - category: mandatory
   customVariables: []
-  description: |-
-    SecurityManager method java.lang.SecurityManager.checkMemberAccess has been removed
-    The implementation of `java.lang.SecurityManager.checkMemberAccess(java.lang.Class, int)` relies on an assumption. that the caller is at a stack depth of 4, which is not something that can be enforced, making the code error-prone.. Replace with a call to `java.lang.SecurityManager.checkPermission(new RuntimePermission("accessDeclaredMembers"))`.
+  description: SecurityManager method java.lang.SecurityManager.checkMemberAccess
+    has been removed
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Java 11 SecurityManager api
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/SecurityManager.html
-  message: The implementation of `java.lang.SecurityManager.checkMemberAccess(java.lang.Class,
-    int)` relies on an assumption. that the caller is at a stack depth of 4, which
-    is not something that can be enforced, making the code error-prone.. Replace with
-    a call to `java.lang.SecurityManager.checkPermission(new RuntimePermission("accessDeclaredMembers"))`.
+  message: "\n The implementation of `java.lang.SecurityManager.checkMemberAccess(java.lang.Class,
+    int)` relies on an assumption\n that the caller is at a stack depth of 4, which
+    is not something that can be enforced, making the code error-prone.\n\n Replace
+    with a call to `java.lang.SecurityManager.checkPermission(new RuntimePermission(\"accessDeclaredMembers\"))`.\n "
   ruleID: java-removals-00041
   when:
     java.referenced:
@@ -148,20 +150,21 @@
       pattern: java.lang.SecurityManager.checkMemberAccess*
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.util.logging.LogManager.addPropertyChangeListener() method was removed in Java 9
-    `java.util.logging.LogManager.addPropertyChangeListener()` method was removed in Java 9.. In order to listen to property change events, please consider overriding the `java.util.logging.LogManager.readConfiguration` methods,. which previously triggered property change events for the registered listeners.
+  description: The java.util.logging.LogManager.addPropertyChangeListener() method
+    was removed in Java 9
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: APIs removed in JDK 9
     url: https://docs.oracle.com/en/java/javase/16/migrate/removed-apis.html#GUID-B96BD00F-12A4-493A-9907-2FFE8DA6748C
-  message: '`java.util.logging.LogManager.addPropertyChangeListener()` method was
-    removed in Java 9.. In order to listen to property change events, please consider
-    overriding the `java.util.logging.LogManager.readConfiguration` methods,. which
-    previously triggered property change events for the registered listeners.'
+  message: "\n `java.util.logging.LogManager.addPropertyChangeListener()` method was
+    removed in Java 9.\n In order to listen to property change events, please consider
+    overriding the `java.util.logging.LogManager.readConfiguration` methods,\n which
+    previously triggered property change events for the registered listeners.\n "
   ruleID: java-removals-00050
   when:
     java.referenced:
@@ -169,20 +172,21 @@
       pattern: java.util.logging.LogManager.addPropertyChangeListener*
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.util.logging.LogManager.removePropertyChangeListener() method was removed in Java 9
-    `java.util.logging.LogManager.removePropertyChangeListener()` method was removed in Java 9.. In order to listen to property change events, please consider overriding the `java.util.logging.LogManager.readConfiguration` methods,. which previously triggered property change events for the registered listeners.
+  description: The java.util.logging.LogManager.removePropertyChangeListener() method
+    was removed in Java 9
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: APIs removed in JDK 9
     url: https://docs.oracle.com/en/java/javase/16/migrate/removed-apis.html#GUID-B96BD00F-12A4-493A-9907-2FFE8DA6748C
-  message: '`java.util.logging.LogManager.removePropertyChangeListener()` method was
-    removed in Java 9.. In order to listen to property change events, please consider
-    overriding the `java.util.logging.LogManager.readConfiguration` methods,. which
-    previously triggered property change events for the registered listeners.'
+  message: "\n `java.util.logging.LogManager.removePropertyChangeListener()` method
+    was removed in Java 9.\n In order to listen to property change events, please
+    consider overriding the `java.util.logging.LogManager.readConfiguration` methods,\n
+    which previously triggered property change events for the registered listeners.\n "
   ruleID: java-removals-00060
   when:
     java.referenced:
@@ -190,21 +194,23 @@
       pattern: java.util.logging.LogManager.removePropertyChangeListener*
 - category: mandatory
   customVariables: []
-  description: |-
-    Property listener methods on `Pack200.Packer` and `Pack200.Unpacker` have been removed
-    Property listener methods on `Pack200.Packer` and `Pack200.Unpacker` have been removed.. Instead, a strategy based on polling the `PROGRESS` value maintained by `java.util.jar.Pack200.Packer`. or `java.util.jar.Pack200.Unpacker` is recommended.
+  description: Property listener methods on `Pack200.Packer` and `Pack200.Unpacker`
+    have been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: java.util.jar.Packer API
     url: https://docs.oracle.com/javase/8/docs/api/java/util/jar/Pack200.Packer.html
   - title: java.util.jar.Unpacker API
     url: https://docs.oracle.com/javase/8/docs/api/java/util/jar/Pack200.Unpacker.html
-  message: Property listener methods on `Pack200.Packer` and `Pack200.Unpacker` have
-    been removed.. Instead, a strategy based on polling the `PROGRESS` value maintained
-    by `java.util.jar.Pack200.Packer`. or `java.util.jar.Pack200.Unpacker` is recommended.
+  message: "\n Property listener methods on `Pack200.Packer` and `Pack200.Unpacker`
+    have been removed.\n Instead, a strategy based on polling the `PROGRESS` value
+    maintained by `java.util.jar.Pack200.Packer`\n or `java.util.jar.Pack200.Unpacker`
+    is recommended.\n "
   ruleID: java-removals-00100
   when:
     or:
@@ -225,31 +231,31 @@
   - name: methodName
     nameOfCaptureGroup: methodName
     pattern: sun.misc.Unsafe.(?P<methodName>(getInt|putInt|getFloat|putFloat|getDouble|putDouble|getBoolean|putBoolean|getObject|putObject|getByte|putByte|getChar|putChar|getShort|putShort|getLong|putLong|fieldOffset|staticFieldBase|tryMonitorEnter|monitorEnter|monitorExit))?(.*)
-  description: |-
-    Methods in `sun.misc.Unsafe` have been removed
-    The `sun.misc.Unsafe` API is scheduled for removal in the long term, and some of its methods have been removed. In short term, please consider the following:. - The `get` and `put` methods have equivalents that take long offsets (OpenJDK 8's version of the removed methods just casts the int offsets and used the long versions).. - `fieldOffset(Field)` should be replaced by `staticFieldOffset(Field)` and `ObjectFieldOffset(Field)`.. - `staticFieldBase(Class)` should be replaced by asking for a specific field with `staticFieldBase(Field)`. The removed method only returned the address of the first static field in the class and relied on the assumption that the JVM stored all statics together, which may not be true.. - `tryMonitorEnter(Object)` and `monitorExit(Object)` can be replaced with use of the Java synchronized primitives, as illustrated in the test changes for JDK-8054494 (see links below).. In the long term, please consider using Variable Handles (see the link below)
+  description: Methods in `sun.misc.Unsafe` have been removed
   effort: 2
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Test changes for JDK-8054494
     url: https://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/0a0a0986400e#l2.19
   - title: Variable Handles
     url: https://openjdk.java.net/jeps/193
-  message: The `sun.misc.Unsafe` API is scheduled for removal in the long term, and
-    some of its methods have been removed. In short term, please consider the following:.
-    - The `get` and `put` methods have equivalents that take long offsets (OpenJDK
-    8's version of the removed methods just casts the int offsets and used the long
-    versions).. - `fieldOffset(Field)` should be replaced by `staticFieldOffset(Field)`
-    and `ObjectFieldOffset(Field)`.. - `staticFieldBase(Class)` should be replaced
+  message: "\n The `sun.misc.Unsafe` API is scheduled for removal in the long term,
+    and some of its methods have been removed. In short term, please consider the
+    following:\n\n - The `get` and `put` methods have equivalents that take long offsets
+    (OpenJDK 8's version of the removed methods just casts the int offsets and used
+    the long versions).\n - `fieldOffset(Field)` should be replaced by `staticFieldOffset(Field)`
+    and `ObjectFieldOffset(Field)`.\n - `staticFieldBase(Class)` should be replaced
     by asking for a specific field with `staticFieldBase(Field)`. The removed method
     only returned the address of the first static field in the class and relied on
-    the assumption that the JVM stored all statics together, which may not be true..
+    the assumption that the JVM stored all statics together, which may not be true.\n
     - `tryMonitorEnter(Object)` and `monitorExit(Object)` can be replaced with use
     of the Java synchronized primitives, as illustrated in the test changes for JDK-8054494
-    (see links below).. In the long term, please consider using Variable Handles (see
-    the link below)
+    (see links below).\n\n In the long term, please consider using Variable Handles
+    (see the link below)\n "
   ruleID: java-removals-00110
   when:
     java.referenced:
@@ -260,12 +266,13 @@
   - name: encoderDecoder
     nameOfCaptureGroup: encoderDecoder
     pattern: sun.misc.BASE64(?P<encoderDecoder>(Encoder|Decoder))?.*
-  description: |
-    The `sun.misc.BASE64{encoder-decoder}` class has been removed
+  description: The `sun.misc.BASE64{encoder-decoder}` class has been removed
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: java.util.Base64 - Javadoc
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/util/Base64.html
@@ -273,10 +280,11 @@
     url: https://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/9078c34437ab
   - title: OpenJDK - Original enhancement request
     url: https://bugs.openjdk.java.net/browse/JDK-8006182
-  message: The `sun.misc.BASE64{{encoderDecoder}}` class has been removed.. It can
-    be replaced with `Base64.{{encoderDecoder}}` class instantiated using `java.util.Base64.getMime{{encoderDecoder}}()`
-    method.. For further examples on how to replace the `BASE64{{encoderDecoder}}`
-    class with `Base64.{{encoderDecoder}}` one, refer to the "Code example" link below.
+  message: "\n The `sun.misc.BASE64{{encoderDecoder}}` class has been removed. \n
+    It can be replaced with `Base64.{{encoderDecoder}}` class instantiated using `java.util.Base64.getMime{{encoderDecoder}}()`
+    method. \n For further examples on how to replace the `BASE64{{encoderDecoder}}`
+    class with `Base64.{{encoderDecoder}}` one, refer to the \"Code example\" link
+    below. \n "
   ruleID: java-removals-00120
   when:
     java.referenced:
@@ -284,21 +292,21 @@
       pattern: sun.misc.BASE64(Encoder|Decoder)*
 - category: mandatory
   customVariables: []
-  description: |-
-    The `runFinalizersOnExit` methods have been removed
-    The `java.lang.System.runFinalizersOnExit(boolean value)` and `java.lang.Runtime.runFinalizersOnExit(boolean value)`. have been removed as they are regarded as inherently unsafe. Running finalizers on exit was disabled by default. and enabling it could result in finalizers being called on live objects which are still being manipulated by other threads.. Remove these method calls.
+  description: The `runFinalizersOnExit` methods have been removed
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: JDK 11 removed APIs
     url: https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-4B613B7E-B150-4D0A-835C-2393C60BE1F8
-  message: The `java.lang.System.runFinalizersOnExit(boolean value)` and `java.lang.Runtime.runFinalizersOnExit(boolean
-    value)`. have been removed as they are regarded as inherently unsafe. Running
-    finalizers on exit was disabled by default. and enabling it could result in finalizers
-    being called on live objects which are still being manipulated by other threads..
-    Remove these method calls.
+  message: "\n The `java.lang.System.runFinalizersOnExit(boolean value)` and `java.lang.Runtime.runFinalizersOnExit(boolean
+    value)`\n have been removed as they are regarded as inherently unsafe. Running
+    finalizers on exit was disabled by default\n and enabling it could result in finalizers
+    being called on live objects which are still being manipulated by other threads.\n\n
+    Remove these method calls.\n "
   ruleID: java-removals-00130
   when:
     or:
@@ -310,22 +318,24 @@
         pattern: java.lang.Runtime.runFinalizersOnExit*
 - category: mandatory
   customVariables: []
-  description: |-
-    The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods have been removed
-    The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods have been removed.. The `java.awt.peer` and `java.awt.dnd.peer` are no longer accessible and are considered. internal implementation details, the API may be removed without notice or changed in non. compatible ways.. Methods exposing this API, such as `java.awt.Font.getPeer()` have been removed since JDK 9.. Since Font rendering is platform independent, there are no substitutes for this method.
+  description: The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods
+    have been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: java.awt.peer Not Accessible
     url: https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-0C350BAB-F2C8-409E-AD3E-63831C684A55
-  message: The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods
-    have been removed.. The `java.awt.peer` and `java.awt.dnd.peer` are no longer
-    accessible and are considered. internal implementation details, the API may be
-    removed without notice or changed in non. compatible ways.. Methods exposing this
-    API, such as `java.awt.Font.getPeer()` have been removed since JDK 9.. Since Font
-    rendering is platform independent, there are no substitutes for this method.
+  message: "\n The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods
+    have been removed. \n The `java.awt.peer` and `java.awt.dnd.peer` are no longer
+    accessible and are considered\n internal implementation details, the API may be
+    removed without notice or changed in non\n compatible ways. \n Methods exposing
+    this API, such as `java.awt.Font.getPeer()` have been removed since JDK 9. \n
+    Since Font rendering is platform independent, there are no substitutes for this
+    method.\n "
   ruleID: java-removals-00140
   when:
     or:
@@ -337,23 +347,23 @@
         pattern: java.awt.Component.getPeer*
 - category: potential
   customVariables: []
-  description: |-
-    Changes in ClassLoader hierarchy in JDK 11 may impact code
-    The changes that were implemented in JDK 9 may impact code that creates class loaders with null (that is, the bootstrap class loader). as the parent class loader and assumes that all platform classes are visible to the parent.. Such code may need to be changed to use the platform class loader as the parent (see the links below)
+  description: Changes in ClassLoader hierarchy in JDK 11 may impact code
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: JDK11 New Classloader Implementations
     url: https://docs.oracle.com/en/java/javase/11/migrate/index.html#JSMIG-GUID-A868D0B9-026F-4D46-B979-901834343F9E
   - title: ClassLoader Constructor API
     url: https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/ClassLoader.html#%3Cinit%3E(java.lang.ClassLoader)
-  message: The changes that were implemented in JDK 9 may impact code that creates
-    class loaders with null (that is, the bootstrap class loader). as the parent class
-    loader and assumes that all platform classes are visible to the parent.. Such
-    code may need to be changed to use the platform class loader as the parent (see
-    the links below)
+  message: "\n The changes that were implemented in JDK 9 may impact code that creates
+    class loaders with null (that is, the bootstrap class loader)\n as the parent
+    class loader and assumes that all platform classes are visible to the parent.\n
+    Such code may need to be changed to use the platform class loader as the parent
+    (see the links below)\n "
   ruleID: java-removals-00150
   when:
     java.referenced:
diff --git a/default/generated/openjdk11/146-removed-javaee-modules.windup.yaml b/default/generated/openjdk11/146-removed-javaee-modules.windup.yaml
index c31ec781..4b83e710 100644
--- a/default/generated/openjdk11/146-removed-javaee-modules.windup.yaml
+++ b/default/generated/openjdk11/146-removed-javaee-modules.windup.yaml
@@ -1,17 +1,17 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.activation (JAF) module has been removed from OpenJDK 11
-    Add the `jakarta.activation` dependency to your application's `pom.xml`.. `<groupId>jakarta.activation</groupId>`. `<artifactId>jakarta.activation</artifactId>`
+  description: The java.activation (JAF) module has been removed from OpenJDK 11
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Removed Java EE modules
     url: https://www.oracle.com/java/technologies/javase/11-relnote-issues.html#JDK-8190378
-  message: Add the `jakarta.activation` dependency to your application's `pom.xml`..
-    `<groupId>jakarta.activation</groupId>`. `<artifactId>jakarta.activation</artifactId>`
+  message: "\n Add the `jakarta.activation` dependency to your application's `pom.xml`.\n\n
+    `<groupId>jakarta.activation</groupId>`\n\n `<artifactId>jakarta.activation</artifactId>`\n "
   ruleID: removed-javaee-modules-00000
   when:
     java.referenced:
@@ -19,21 +19,21 @@
       pattern: javax.activation*
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.corba module has been removed from OpenJDK 11
-    The `java.corba` (CORBA) module has been removed from OpenJDK 11.. If you wish to continue using CORBA within your application consider using the GlassFish implementation of CORBA and RMI-IIOP.
+  description: The java.corba module has been removed from OpenJDK 11
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: GlassFish implementation of CORBA and RMI-IIOP
     url: https://javaee.github.io/glassfish-corba/index.html
   - title: Removed Java EE modules
     url: https://www.oracle.com/java/technologies/javase/11-relnote-issues.html#JDK-8190378
-  message: The `java.corba` (CORBA) module has been removed from OpenJDK 11.. If you
-    wish to continue using CORBA within your application consider using the GlassFish
-    implementation of CORBA and RMI-IIOP.
+  message: "\n The `java.corba` (CORBA) module has been removed from OpenJDK 11. \n
+    If you wish to continue using CORBA within your application consider using the
+    GlassFish implementation of CORBA and RMI-IIOP.\n "
   ruleID: removed-javaee-modules-00010
   when:
     or:
@@ -48,18 +48,19 @@
         pattern: com.sun.corba*
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.annotation (Common Annotations) module has been removed from OpenJDK 11
-    Add the `jakarta.annotation` dependency to your application's `pom.xml`.. `<groupId>jakarta.annotation</groupId>`. `<artifactId>jakarta.annotation-api</artifactId>`
+  description: The java.annotation (Common Annotations) module has been removed from
+    OpenJDK 11
   effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
   - title: Removed Java EE modules
     url: https://www.oracle.com/java/technologies/javase/11-relnote-issues.html#JDK-8190378
-  message: Add the `jakarta.annotation` dependency to your application's `pom.xml`..
-    `<groupId>jakarta.annotation</groupId>`. `<artifactId>jakarta.annotation-api</artifactId>`
+  message: "\n Add the `jakarta.annotation` dependency to your application's `pom.xml`.\n\n
+    `<groupId>jakarta.annotation</groupId>`\n\n `<artifactId>jakarta.annotation-api</artifactId>`\n "
   ruleID: removed-javaee-modules-00020
   when:
     java.referenced:
diff --git a/default/generated/openjdk11/ruleset.yaml b/default/generated/openjdk11/ruleset.yaml
index 1fb587b7..cd9b9e83 100644
--- a/default/generated/openjdk11/ruleset.yaml
+++ b/default/generated/openjdk11/ruleset.yaml
@@ -1,3 +1,3 @@
 name: openjdk11/openjdk8
-description: This ruleset provides analysis with respect to API removals between OpenJDK
-  8 and 11.
+description: This ruleset provides analysis with respect to modules removed between
+  OpenJDK 8 and 11.
diff --git a/default/generated/openjdk17/147-applet-api-deprecation.windup.yaml b/default/generated/openjdk17/147-applet-api-deprecation.windup.yaml
index 5c7d3559..7ff397ec 100644
--- a/default/generated/openjdk17/147-applet-api-deprecation.windup.yaml
+++ b/default/generated/openjdk17/147-applet-api-deprecation.windup.yaml
@@ -1,18 +1,18 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The Java Applet API has been deprecated
-    The Java Applet API has been deprecated and will be removed in future releases, since modern web browsers no longer support Java applets any references to it should be removed.
+  description: The Java Applet API has been deprecated
   effort: 3
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 398: Deprecate the Applet API for Removal'
     url: https://openjdk.org/jeps/398
-  message: The Java Applet API has been deprecated and will be removed in future releases,
-    since modern web browsers no longer support Java applets any references to it
-    should be removed.
+  message: "\n The Java Applet API has been deprecated and will be removed in future
+    releases, since modern web browsers no longer support Java applets any references
+    to it should be removed.\n "
   ruleID: applet-api-deprecation-00000
   when:
     or:
diff --git a/default/generated/openjdk17/148-lombok.windup.yaml b/default/generated/openjdk17/148-lombok.windup.yaml
index 92746bab..450ec116 100644
--- a/default/generated/openjdk17/148-lombok.windup.yaml
+++ b/default/generated/openjdk17/148-lombok.windup.yaml
@@ -1,18 +1,18 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The Lombok version is incompatible with Open JDK 17
-    Lombok supports Java 17 since version 1.18.22. The version of Lombok used in this project is too old and not compatible with Java 17. You should consider upgrading it.
+  description: The Lombok version is incompatible with Open JDK 17
   effort: 3
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: Upgrade Lombok version to support Java 17
     url: https://github.com/projectlombok/lombok/issues/2898
-  message: Lombok supports Java 17 since version 1.18.22. The version of Lombok used
-    in this project is too old and not compatible with Java 17. You should consider
-    upgrading it.
+  message: "\n Lombok supports Java 17 since version 1.18.22. The version of Lombok
+    used in this project is too old and not compatible with Java 17. You should consider
+    upgrading it.\n "
   ruleID: lombok-incompatibility-00001
   when:
     java.dependency:
diff --git a/default/generated/openjdk17/149-removed-classes.windup.yaml b/default/generated/openjdk17/149-removed-classes.windup.yaml
index 9c03fed6..917dd8a0 100644
--- a/default/generated/openjdk17/149-removed-classes.windup.yaml
+++ b/default/generated/openjdk17/149-removed-classes.windup.yaml
@@ -3,22 +3,22 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: java.util.jar.(?P<className>(Pack200|Pack200.Packer|Pack200.Unpacker))
-  description: |-
-    The java.util.jar.{class-name} class has been removed
-    After being deprecated in OpenJDK 11, the pack200,. unpack200 and corresponding java.util.jar.Pack200* classes were removed in OpenJDK 14.. Please look into switching to either the jlink tool or the jpackage tool to create. application-specific runtimes with an optimized factor.
+  description: The java.util.jar.{class-name} class has been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 367: Remove the Pack200 Tools and API'
     url: https://openjdk.org/jeps/367
   - title: 'JEP 392: Packaging Tool (jpackage tool)'
     url: https://openjdk.org/jeps/392
-  message: After being deprecated in OpenJDK 11, the pack200,. unpack200 and corresponding
-    java.util.jar.Pack200* classes were removed in OpenJDK 14.. Please look into switching
-    to either the jlink tool or the jpackage tool to create. application-specific
-    runtimes with an optimized factor.
+  message: "\n After being deprecated in OpenJDK 11, the pack200, \n unpack200 and
+    corresponding java.util.jar.Pack200* classes were removed in OpenJDK 14. \n Please
+    look into switching to either the jlink tool or the jpackage tool to create \n
+    application-specific runtimes with an optimized factor.\n "
   ruleID: removed-classes-00000
   when:
     java.referenced:
diff --git a/default/generated/openjdk17/150-removed-packages.windup.yaml b/default/generated/openjdk17/150-removed-packages.windup.yaml
index 09f5edeb..17e0240b 100644
--- a/default/generated/openjdk17/150-removed-packages.windup.yaml
+++ b/default/generated/openjdk17/150-removed-packages.windup.yaml
@@ -1,17 +1,17 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The java.rmi.activation detected
-    RMI activation and its associated daemon, rmid, and code package, java.rmi.activation were deprecated in OpenJDK 15 and removed in OpenJDK 17.
+  description: The java.rmi.activation detected
   effort: 3
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 407: Remove RMI Activation'
     url: https://openjdk.org/jeps/407
-  message: RMI activation and its associated daemon, rmid, and code package, java.rmi.activation
-    were deprecated in OpenJDK 15 and removed in OpenJDK 17.
+  message: "\n RMI activation and its associated daemon, rmid, and code package, java.rmi.activation
+    were deprecated in OpenJDK 15 and removed in OpenJDK 17.\n "
   ruleID: removed-packages-00000
   when:
     java.referenced:
@@ -19,22 +19,23 @@
       pattern: java.rmi.activation*
 - category: mandatory
   customVariables: []
-  description: |-
-    The jdk.nashorn.api.scripting and jdk.nashorn.api.tree packages have been removed
-    The Nashorn scripting implementation has been removed from OpenJDK 15 onwards.. The javax.script API is still present and third party implementations, such as Rhino or Nashorn itself, can be installed if needed. Any references to its packages should be removed or substituted with the third party implementations.
+  description: The jdk.nashorn.api.scripting and jdk.nashorn.api.tree packages have
+    been removed
   effort: 3
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 372: Remove RMI Activation'
     url: https://openjdk.org/jeps/372
   - title: openjdk/nashorn
     url: https://github.com/openjdk/nashorn
-  message: The Nashorn scripting implementation has been removed from OpenJDK 15 onwards..
-    The javax.script API is still present and third party implementations, such as
-    Rhino or Nashorn itself, can be installed if needed. Any references to its packages
-    should be removed or substituted with the third party implementations.
+  message: "\n The Nashorn scripting implementation has been removed from OpenJDK
+    15 onwards. \n The javax.script API is still present and third party implementations,
+    such as Rhino or Nashorn itself, can be installed if needed. Any references to
+    its packages should be removed or substituted with the third party implementations.\n "
   ruleID: removed-packages-00010
   when:
     or:
diff --git a/default/generated/openjdk17/151-security-manager-deprecation.windup.yaml b/default/generated/openjdk17/151-security-manager-deprecation.windup.yaml
index e6c11d72..e5ad980b 100644
--- a/default/generated/openjdk17/151-security-manager-deprecation.windup.yaml
+++ b/default/generated/openjdk17/151-security-manager-deprecation.windup.yaml
@@ -3,18 +3,18 @@
   - name: className
     nameOfCaptureGroup: className
     pattern: java.security.(?P<className>(AccessController|AccessControlContext|AccessControlException|DomainCombiner|Policy|PolicySpi|Policy.Parameters))
-  description: |-
-    The java.security.{class-name} class has been deprecated
-    The Java Security Manager API is deprecated in Java 17. Any references to it should be removed.. See the link for further information.
+  description: The java.security.{class-name} class has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The Java Security Manager API is deprecated in Java 17. Any references
-    to it should be removed.. See the link for further information.
+  message: "\n The Java Security Manager API is deprecated in Java 17. Any references
+    to it should be removed. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00000
   when:
     java.referenced:
@@ -24,18 +24,18 @@
   - name: fqcn
     nameOfCaptureGroup: fqcn
     pattern: (?P<fqcn>(java.lang.SecurityManager|java.rmi.RMISecurityManager|javax.security.auth.SubjectDomainCombiner))
-  description: |-
-    The {fqcn} class has been deprecated
-    References to Java Security Manager API classes deprecated in Java 17. Any references to it should be removed.. See the link for further information.
+  description: The {fqcn} class has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: References to Java Security Manager API classes deprecated in Java 17.
-    Any references to it should be removed.. See the link for further information.
+  message: "\n References to Java Security Manager API classes deprecated in Java
+    17. Any references to it should be removed. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00010
   when:
     java.referenced:
@@ -45,18 +45,18 @@
   - name: methodName
     nameOfCaptureGroup: methodName
     pattern: java.lang.System.(?P<methodName>(getSecurityManager|setSecurityManager))?(.*)
-  description: |-
-    The java.lang.System.{method-name} method has been deprecated
-    The java.lang.System::getSecurityManager and java.lang.System::setSecurityManager methods have been deprecated in Java 17.. See the link for further information.
+  description: The java.lang.System.{method-name} method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The java.lang.System::getSecurityManager and java.lang.System::setSecurityManager
-    methods have been deprecated in Java 17.. See the link for further information.
+  message: "\n The java.lang.System::getSecurityManager and java.lang.System::setSecurityManager
+    methods have been deprecated in Java 17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00020
   when:
     java.referenced:
@@ -64,18 +64,18 @@
       pattern: java.lang.System.(getSecurityManager|setSecurityManager)*
 - category: mandatory
   customVariables: []
-  description: |-
-    java.lang.Thread.checkAccess method has been deprecated
-    The java.lang.Thread::checkAccess method has been deprecated in Java 17.. See the link for further information.
+  description: java.lang.Thread.checkAccess method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The java.lang.Thread::checkAccess method has been deprecated in Java 17..
-    See the link for further information.
+  message: "\n The java.lang.Thread::checkAccess method has been deprecated in Java
+    17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00030
   when:
     java.referenced:
@@ -83,18 +83,18 @@
       pattern: java.lang.Thread.checkAccess*
 - category: mandatory
   customVariables: []
-  description: |-
-    java.lang.ThreadGroup.checkAccess method has been deprecated
-    The java.lang.ThreadGroup::checkAccess method has been deprecated in Java 17.. See the link for further information.
+  description: java.lang.ThreadGroup.checkAccess method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The java.lang.ThreadGroup::checkAccess method has been deprecated in Java
-    17.. See the link for further information.
+  message: "\n The java.lang.ThreadGroup::checkAccess method has been deprecated in
+    Java 17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00040
   when:
     java.referenced:
@@ -102,18 +102,18 @@
       pattern: java.lang.ThreadGroup.checkAccess*
 - category: mandatory
   customVariables: []
-  description: |-
-    java.util.logging.LogManager.checkAccess method has been deprecated
-    The java.util.logging.LogManager::checkAccess method has been deprecated in Java 17.. See the link for further information.
+  description: java.util.logging.LogManager.checkAccess method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The java.util.logging.LogManager::checkAccess method has been deprecated
-    in Java 17.. See the link for further information.
+  message: "\n The java.util.logging.LogManager::checkAccess method has been deprecated
+    in Java 17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00050
   when:
     java.referenced:
@@ -124,17 +124,18 @@
   - name: methodNames
     nameOfCaptureGroup: methodNames
     pattern: java.util.concurrent.Executors.(?P<methodNames>(privilegedCallable|privilegedCallableUsingCurrentClassLoader|privilegedThreadFactory))?(.*)
-  description: |
-    The java.util.concurrent.Executors.{method-names} method has been deprecated
+  description: The java.util.concurrent.Executors.{method-names} method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The java.util.concurrent.Executors::{{methodNames}} method has been deprecated
-    in Java 17.. See the link for further information.
+  message: "\n The java.util.concurrent.Executors::{{methodNames}} method has been
+    deprecated in Java 17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00060
   when:
     java.referenced:
@@ -145,17 +146,18 @@
   - name: methName
     nameOfCaptureGroup: methName
     pattern: javax.security.auth.Subject.(?P<methName>(doAsPrivileged|getSubject))?(.*)
-  description: |
-    javax.security.auth.Subject.{meth-name} method has been deprecated
+  description: javax.security.auth.Subject.{meth-name} method has been deprecated
   effort: 5
   labels:
   - konveyor.io/source=openjdk11-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk17+
+  - konveyor.io/target=openjdk
   links:
   - title: 'JEP 411: Deprecate the Security Manager for Removal'
     url: https://openjdk.org/jeps/411
-  message: The javax.security.auth.Subject::{{methName}} method has been deprecated
-    in Java 17.. See the link for further information.
+  message: "\n The javax.security.auth.Subject::{{methName}} method has been deprecated
+    in Java 17. \n See the link for further information.\n "
   ruleID: security-manager-deprecation-00070
   when:
     java.referenced:
diff --git a/default/generated/openjdk17/ruleset.yaml b/default/generated/openjdk17/ruleset.yaml
index 7dd8fcf1..8508d229 100644
--- a/default/generated/openjdk17/ruleset.yaml
+++ b/default/generated/openjdk17/ruleset.yaml
@@ -1,3 +1,3 @@
 name: openjdk17/openjdk11
-description: This ruleset provides analysis Security Manager classes and methods deprecated
-  between OpenJDK 11 to 17.
+description: This ruleset provides analysis with respect to packages removed between
+  OpenJDK 11 to 17.
diff --git a/default/generated/openjdk7/152-oracle2openjdk.rhamt.yaml b/default/generated/openjdk7/152-oracle2openjdk.rhamt.yaml
index be88397a..3e5a6e5b 100644
--- a/default/generated/openjdk7/152-oracle2openjdk.rhamt.yaml
+++ b/default/generated/openjdk7/152-oracle2openjdk.rhamt.yaml
@@ -1,19 +1,22 @@
 - category: potential
   customVariables: []
-  description: |-
-    JavaFX usage
-    Currently OpenJFX (open-source implementation of JavaFX) is neither shipped nor supported on RHEL.
+  description: JavaFX usage
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - JavaFX
   links:
   - title: Knowledge base article about JavaFX support in RHEL
     url: https://access.redhat.com/solutions/3299701
   - title: RFE to include OpenJFX in RHEL
     url: https://bugzilla.redhat.com/show_bug.cgi?id=1275610
-  message: Currently OpenJFX (open-source implementation of JavaFX) is neither shipped
-    nor supported on RHEL.
+  message: "\n Currently OpenJFX (open-source implementation of JavaFX) is neither
+    shipped nor supported on RHEL.\n "
   ruleID: oracle2openjdk-00000
   when:
     java.referenced:
@@ -21,19 +24,22 @@
       pattern: javafx*
 - category: potential
   customVariables: []
-  description: |-
-    Fonts usage
-    The font library is different in OpenJDK compared to OracleJDK.. This means slightly different text layout in some cases.. Ensure with tests that the output is still as expected.
+  description: Fonts usage
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - fonts
   links:
   - title: Knowledge base article OracleJDK vs. OpenJDK
     url: https://access.redhat.com/solutions/2489791
-  message: The font library is different in OpenJDK compared to OracleJDK.. This means
-    slightly different text layout in some cases.. Ensure with tests that the output
-    is still as expected.
+  message: "\n The font library is different in OpenJDK compared to OracleJDK.\n This
+    means slightly different text layout in some cases.\n Ensure with tests that the
+    output is still as expected.\n "
   ruleID: oracle2openjdk-00001
   when:
     or:
@@ -48,17 +54,20 @@
         pattern: javax.swing*Font*
 - category: potential
   customVariables: []
-  description: |-
-    Resource management API usage
-    OpenJDK does not support the resource management API for Java.
+  description: Resource management API usage
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - Oracle-JDK-resource-management
   links:
   - title: Knowledge base article OracleJDK vs. OpenJDK
     url: https://access.redhat.com/solutions/2489791
-  message: OpenJDK does not support the resource management API for Java.
+  message: "\n OpenJDK does not support the resource management API for Java.\n "
   ruleID: oracle2openjdk-00002
   when:
     java.referenced:
@@ -66,21 +75,24 @@
       pattern: jdk.management.resource*
 - category: potential
   customVariables: []
-  description: |-
-    Color management usage
-    OracleJDK used to use KCMS as color mangement system up until JDK7 by default. It switched to Little CMS (LCMS) with JDK8.. OpenJDK uses LCMS. If you continued to use KCMS by using the property ``sun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider``, remove this property and ensure in your tests that your application still works as expected.
+  description: Color management usage
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - JDK-color-management
   links:
   - title: Knowledge base article OracleJDK vs. OpenJDK
     url: https://access.redhat.com/solutions/2489791
-  message: OracleJDK used to use KCMS as color mangement system up until JDK7 by default.
-    It switched to Little CMS (LCMS) with JDK8.. OpenJDK uses LCMS. If you continued
-    to use KCMS by using the property ``sun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider``,
+  message: "\n OracleJDK used to use KCMS as color mangement system up until JDK7
+    by default. It switched to Little CMS (LCMS) with JDK8.\n OpenJDK uses LCMS. If
+    you continued to use KCMS by using the property ``sun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider``,
     remove this property and ensure in your tests that your application still works
-    as expected.
+    as expected.\n "
   ruleID: oracle2openjdk-00003
   when:
     java.referenced:
@@ -90,19 +102,22 @@
   - name: package
     nameOfCaptureGroup: package
     pattern: java.awt.(?P<package>(geom|color|font|image|image\.renderable|print))?.*
-  description: |-
-    Java 2D library usage
-    OpenJDK has its own 2D library, different from the proprietary JDK. This means that its performance may be different.. Ensure during your tests that the application behaves as expected.
+  description: Java 2D library usage
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - 2DLibrary
   links:
   - title: Knowledge base article OracleJDK vs. OpenJDK
     url: https://access.redhat.com/solutions/2489791
-  message: OpenJDK has its own 2D library, different from the proprietary JDK. This
-    means that its performance may be different.. Ensure during your tests that the
-    application behaves as expected.
+  message: "\n OpenJDK has its own 2D library, different from the proprietary JDK.
+    This means that its performance may be different.\n Ensure during your tests that
+    the application behaves as expected.\n "
   ruleID: oracle2openjdk-00004
   when:
     java.referenced:
@@ -110,21 +125,24 @@
       pattern: java.awt.(geom|color|font|image|image.renderable|print)*
 - category: potential
   customVariables: []
-  description: |-
-    Crypto: elliptic curves usage
-    When on RHEL, OpenJDK uses the NSS crypto library from RHEL instead of the built-in one.. This mostly affects elliptic curve cryptography, where OpenJDK supports all of the RHEL curves and none of the others.. A list of all cipher suits of NSS in RHEL:. * RHEL6: [https://access.redhat.com/articles/1470663](https://access.redhat.com/articles/1470663). * RHEL7: [https://access.redhat.com/articles/1463663](https://access.redhat.com/articles/1463663)
+  description: 'Crypto: elliptic curves usage'
   effort: 0
   labels:
+  - konveyor.io/source=oraclejdk7+
   - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
   - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  - crypto
   links:
   - title: Knowledge base article OracleJDK vs. OpenJDK
     url: https://access.redhat.com/solutions/2489791
-  message: 'When on RHEL, OpenJDK uses the NSS crypto library from RHEL instead of
-    the built-in one.. This mostly affects elliptic curve cryptography, where OpenJDK
-    supports all of the RHEL curves and none of the others.. A list of all cipher
-    suits of NSS in RHEL:. * RHEL6: [https://access.redhat.com/articles/1470663](https://access.redhat.com/articles/1470663).
-    * RHEL7: [https://access.redhat.com/articles/1463663](https://access.redhat.com/articles/1463663)'
+  message: "\n When on RHEL, OpenJDK uses the NSS crypto library from RHEL instead
+    of the built-in one.\n\n This mostly affects elliptic curve cryptography, where
+    OpenJDK supports all of the RHEL curves and none of the others.\n \n A list of
+    all cipher suits of NSS in RHEL:\n\n * RHEL6: [https://access.redhat.com/articles/1470663](https://access.redhat.com/articles/1470663)\n
+    * RHEL7: [https://access.redhat.com/articles/1463663](https://access.redhat.com/articles/1463663)\n "
   ruleID: oracle2openjdk-00005
   when:
     or:
diff --git a/default/generated/openliberty/153-liberty-java-unavailable-technologies.windup.yaml b/default/generated/openliberty/153-liberty-java-unavailable-technologies.windup.yaml
index 72de2b9d..4940b8ca 100644
--- a/default/generated/openliberty/153-liberty-java-unavailable-technologies.windup.yaml
+++ b/default/generated/openliberty/153-liberty-java-unavailable-technologies.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Java EE Application Deployment API is unavailable
-    <div class="Text"> <span class="SubHeader">Java EE Application Deployment API</span>. <p> This rule flags Java code that references the <code>javax.enterprise.deploy</code> package. </p>. <p> The Java EE Application Deployment API is not supported on Liberty or Liberty Core. The technology is deprecated in WebSphere Application Server traditional V9.0. If your application uses the Java EE Application Deployment API, you can deploy this part of your application on WebSphere Application Server traditional but the capability might be removed in a later version. </p>. <p> Use another way to deploy applications to the server, such as wsadmin scripting and JMX MBeans. The closest method to using the Java EE Deployment API is to use WebSphere JMX MBeans. For more information, see <a href="https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html');return false"> Ways to install enterprise applications or modules. </a> </p>. <p> For Liberty, see <a href="https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html');return false"> Deploying applications in Liberty. </a> </p>. </div>
+  description: Java EE Application Deployment API is unavailable
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -10,21 +8,21 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text"> <span class="SubHeader">Java EE Application Deployment
-    API</span>. <p> This rule flags Java code that references the <code>javax.enterprise.deploy</code>
-    package. </p>. <p> The Java EE Application Deployment API is not supported on
+  message: "<div class=\"Text\"> <span class=\"SubHeader\">Java EE Application Deployment
+    API</span> \n <p> This rule flags Java code that references the <code>javax.enterprise.deploy</code>
+    package. </p> \n <p> The Java EE Application Deployment API is not supported on
     Liberty or Liberty Core. The technology is deprecated in WebSphere Application
     Server traditional V9.0. If your application uses the Java EE Application Deployment
     API, you can deploy this part of your application on WebSphere Application Server
-    traditional but the capability might be removed in a later version. </p>. <p>
+    traditional but the capability might be removed in a later version. </p> \n <p>
     Use another way to deploy applications to the server, such as wsadmin scripting
     and JMX MBeans. The closest method to using the Java EE Deployment API is to use
-    WebSphere JMX MBeans. For more information, see <a href="https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html');return
-    false"> Ways to install enterprise applications or modules. </a> </p>. <p> For
-    Liberty, see <a href="https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html');return
-    false"> Deploying applications in Liberty. </a> </p>. </div>
+    WebSphere JMX MBeans. For more information, see <a href=\"https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/crun_app_install.html');return
+    false\"> Ways to install enterprise applications or modules. </a> </p> \n <p>
+    For Liberty, see <a href=\"https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/twlp_dep.html');return
+    false\"> Deploying applications in Liberty. </a> </p> \n</div>"
   ruleID: DetectJavaApplicationDeploymentJava
   when:
     java.referenced:
@@ -35,9 +33,7 @@
   - name: DetectJavaPortlet_0_packages
     nameOfCaptureGroup: DetectJavaPortlet_0_packages
     pattern: (?P<DetectJavaPortlet_0_packages>(javax.portlet\.[^.]+|javax.portlet.filter\.[^.]+))
-  description: |-
-    Java Portlet is unsupported
-    <div class="Text">. <p> This rule flags Java code that has references to the following packages: </p>. <ul>. <li><code>javax.portlet</code></li>. <li><code>javax.portlet.filter</code></li>. </ul>. <p>This rule also flags the following references in the portlet.xml file: </p>. <ul>. <li><code>&lt;portlet-app&gt;&lt;/portlet-app&gt;</code></li>. </ul>. <p>The Java Portlet API and its deployment descriptors are not supported on Liberty. Deploy this part of your application on WebSphere Application Server traditional. </p>. </div>
+  description: Java Portlet is unsupported
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -45,13 +41,13 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> This rule flags Java code that has references
-    to the following packages: </p>. <ul>. <li><code>javax.portlet</code></li>. <li><code>javax.portlet.filter</code></li>.
-    </ul>. <p>This rule also flags the following references in the portlet.xml file:
-    </p>. <ul>. <li><code>&lt;portlet-app&gt;&lt;/portlet-app&gt;</code></li>. </ul>.
-    <p>The Java Portlet API and its deployment descriptors are not supported on Liberty.
-    Deploy this part of your application on WebSphere Application Server traditional.
-    </p>. </div>'
+  message: "<div class=\"Text\"> \n <p> This rule flags Java code that has references
+    to the following packages: </p> \n <ul> \n <li><code>javax.portlet</code></li>
+    \n <li><code>javax.portlet.filter</code></li> \n </ul> \n <p>This rule also flags
+    the following references in the portlet.xml file: </p> \n <ul> \n <li><code>&lt;portlet-app&gt;&lt;/portlet-app&gt;</code></li>
+    \n </ul> \n <p>The Java Portlet API and its deployment descriptors are not supported
+    on Liberty. Deploy this part of your application on WebSphere Application Server
+    traditional. </p> \n</div>"
   ruleID: DetectJavaPortlet
   when:
     java.referenced:
@@ -61,9 +57,7 @@
   - name: DetectJAXRJava_0_packages
     nameOfCaptureGroup: DetectJAXRJava_0_packages
     pattern: (?P<DetectJAXRJava_0_packages>(javax.xml.registry\.[^.]+|javax.xml.registry.infomodel\.[^.]+))
-  description: |-
-    Java API for XML Registries (JAXR) is unavailable
-    <div class="Text"> <span class="SubHeader">Java API for XML Registries (JAXR)</span>. <p> This rule flags Java code that has references to the following packages: </p>. <ul>. <li><code>javax.xml.registry</code></li>. <li><code>javax.xml.registry.infomodel</code></li>. </ul>. <p>The Java API for XML Registries (JAXR) is not supported on Liberty or Liberty Core. The API is deprecated in WebSphere Application Server traditional V9.0. If your application uses the JAXR API, you can deploy this part of your application on WebSphere Application Server traditional but the capability might be removed in a later version. It is recommended to migrate to using UDDI Version 3 to replace JAXR technologies. </p>. </div>
+  description: Java API for XML Registries (JAXR) is unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -71,15 +65,15 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text"> <span class="SubHeader">Java API for XML Registries
-    (JAXR)</span>. <p> This rule flags Java code that has references to the following
-    packages: </p>. <ul>. <li><code>javax.xml.registry</code></li>. <li><code>javax.xml.registry.infomodel</code></li>.
-    </ul>. <p>The Java API for XML Registries (JAXR) is not supported on Liberty or
-    Liberty Core. The API is deprecated in WebSphere Application Server traditional
+  message: "<div class=\"Text\"> <span class=\"SubHeader\">Java API for XML Registries
+    (JAXR)</span> \n <p> This rule flags Java code that has references to the following
+    packages: </p> \n <ul> \n <li><code>javax.xml.registry</code></li> \n <li><code>javax.xml.registry.infomodel</code></li>
+    \n </ul> \n <p>The Java API for XML Registries (JAXR) is not supported on Liberty
+    or Liberty Core. The API is deprecated in WebSphere Application Server traditional
     V9.0. If your application uses the JAXR API, you can deploy this part of your
     application on WebSphere Application Server traditional but the capability might
     be removed in a later version. It is recommended to migrate to using UDDI Version
-    3 to replace JAXR technologies. </p>. </div>'
+    3 to replace JAXR technologies. </p> \n</div>"
   ruleID: DetectJAXRJava
   when:
     java.referenced:
@@ -89,9 +83,7 @@
   - name: DetectRemoteBundleRepositoriesJava_0_packages
     nameOfCaptureGroup: DetectRemoteBundleRepositoriesJava_0_packages
     pattern: (?P<DetectRemoteBundleRepositoriesJava_0_packages>org.osgi.service.repository\.[^.]+)
-  description: |-
-    The OSGI remote bundle repository service API is unavailable
-    <div class="Text">. <p>The OSGI repository service APIs is not supported in Liberty or Liberty Core.</p>. <p>This rule flags java references to APIs in the <code>org.osgi.service.repository</code> package.</p>. </div>
+  description: The OSGI remote bundle repository service API is unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -99,9 +91,9 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p>The OSGI repository service APIs is not supported
-    in Liberty or Liberty Core.</p>. <p>This rule flags java references to APIs in
-    the <code>org.osgi.service.repository</code> package.</p>. </div>
+  message: "<div class=\"Text\"> \n <p>The OSGI repository service APIs is not supported
+    in Liberty or Liberty Core.</p> \n <p>This rule flags java references to APIs
+    in the <code>org.osgi.service.repository</code> package.</p> \n</div>"
   ruleID: DetectRemoteBundleRepositoriesJava
   when:
     java.referenced:
@@ -112,9 +104,7 @@
   - name: DetectRemoteServicesJava_0_packages
     nameOfCaptureGroup: DetectRemoteServicesJava_0_packages
     pattern: (?P<DetectRemoteServicesJava_0_packages>org.osgi.service.remoteserviceadmin\.[^.]+)
-  description: |-
-    The OSGI Remote Service Admin API is unavailable
-    <div class="Text">. <p>The OSGI Remote Service Admin is not supported in Liberty or Liberty Core.</p>. <p>This rule flags java references to APIs in the <code>org.osgi.service.remoteserviceadmin</code> package.</p>. </div>
+  description: The OSGI Remote Service Admin API is unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -122,9 +112,9 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p>The OSGI Remote Service Admin is not supported in
-    Liberty or Liberty Core.</p>. <p>This rule flags java references to APIs in the
-    <code>org.osgi.service.remoteserviceadmin</code> package.</p>. </div>
+  message: "<div class=\"Text\"> \n <p>The OSGI Remote Service Admin is not supported
+    in Liberty or Liberty Core.</p> \n <p>This rule flags java references to APIs
+    in the <code>org.osgi.service.remoteserviceadmin</code> package.</p> \n</div>"
   ruleID: DetectRemoteServicesJava
   when:
     java.referenced:
@@ -132,9 +122,7 @@
       pattern: org.osgi.service.remoteserviceadmin*
 - category: mandatory
   customVariables: []
-  description: |-
-    Web Services Notification (WS-Notification) is unavailable
-    <div class="Text">. <p> This rule flags Java code that has references to the <code>org.oasis_open.docs.wsn</code> package. </p>. <p>This rule also flags the following references in WSDL files: </p>. <ul>. <li><code>&lt;import location="http://docs.oasis-open.org/wsn/*.wsdl"&gt;&lt;/import&gt;</code></li>. </ul>. <p>Web Services Notification (WS-Notification) is not supported on Liberty or Liberty Core. If your application uses WS-Notification, you can deploy this part of your application on WebSphere Application Server traditional. </p>. </div>
+  description: Web Services Notification (WS-Notification) is unavailable
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -142,12 +130,14 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> This rule flags Java code that has references
-    to the <code>org.oasis_open.docs.wsn</code> package. </p>. <p>This rule also flags
-    the following references in WSDL files: </p>. <ul>. <li><code>&lt;import location="http://docs.oasis-open.org/wsn/*.wsdl"&gt;&lt;/import&gt;</code></li>.
-    </ul>. <p>Web Services Notification (WS-Notification) is not supported on Liberty
-    or Liberty Core. If your application uses WS-Notification, you can deploy this
-    part of your application on WebSphere Application Server traditional. </p>. </div>'
+  message: "<div class=\"Text\"> \n <p> This rule flags Java code that has references
+    to the <code>org.oasis_open.docs.wsn</code> package. </p> \n <p>This rule also
+    flags the following references in WSDL files: </p> \n <ul> \n <li><code>&lt;import
+    location=\"http://docs.oasis-open.org/wsn/*.wsdl\"&gt;&lt;/import&gt;</code></li>
+    \n </ul> \n <p>Web Services Notification (WS-Notification) is not supported on
+    Liberty or Liberty Core. If your application uses WS-Notification, you can deploy
+    this part of your application on WebSphere Application Server traditional. </p>
+    \n</div>"
   ruleID: DetectWSNotificationJava
   when:
     java.referenced:
@@ -155,9 +145,7 @@
       pattern: org.oasis_open.docs.wsn*
 - category: mandatory
   customVariables: []
-  description: |-
-    Entity Enterprise JavaBeans (EJB) are unavailable
-    <div class="Text"> <span class="SubHeader">Entity Enterprise JavaBeans (EJB)</span>. <p> This rule flags <code>entity</code> elements in <span class="FilePath">ejb-jar.xml</span> files. </p>. <p> Entity beans are optional in the EJB 3.2 specification and are not supported on Liberty or Liberty Core. The entity bean API is deprecated in WebSphere Application Server traditional V8.5.5 and V9.0 and might be removed in a later version.</p>. <p> The EJBDeploy tool used to deploy applications with entity beans has also been deprecated and may be removed in the future, either at the same time entity beans are removed or prior. </p>. <p>The Java Persistence API (JPA) is an alternative to using EJB entity beans for new database and other persistence-related operations. </p>. <p> Upgrading entity beans can be difficult, but it can be simplified if your application uses design patterns such as DTO, Session Facade, and DAO. </p>. </div>
+  description: Entity Enterprise JavaBeans (EJB) are unavailable
   effort: 13
   labels:
   - konveyor.io/source=websphere
@@ -165,18 +153,18 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text"> <span class="SubHeader">Entity Enterprise JavaBeans
-    (EJB)</span>. <p> This rule flags <code>entity</code> elements in <span class="FilePath">ejb-jar.xml</span>
-    files. </p>. <p> Entity beans are optional in the EJB 3.2 specification and are
-    not supported on Liberty or Liberty Core. The entity bean API is deprecated in
-    WebSphere Application Server traditional V8.5.5 and V9.0 and might be removed
-    in a later version.</p>. <p> The EJBDeploy tool used to deploy applications with
-    entity beans has also been deprecated and may be removed in the future, either
-    at the same time entity beans are removed or prior. </p>. <p>The Java Persistence
+  message: "<div class=\"Text\"> <span class=\"SubHeader\">Entity Enterprise JavaBeans
+    (EJB)</span> \n <p> This rule flags <code>entity</code> elements in <span class=\"FilePath\">ejb-jar.xml</span>
+    files. </p> \n <p> Entity beans are optional in the EJB 3.2 specification and
+    are not supported on Liberty or Liberty Core. The entity bean API is deprecated
+    in WebSphere Application Server traditional V8.5.5 and V9.0 and might be removed
+    in a later version.</p> \n <p> The EJBDeploy tool used to deploy applications
+    with entity beans has also been deprecated and may be removed in the future, either
+    at the same time entity beans are removed or prior. </p> \n <p>The Java Persistence
     API (JPA) is an alternative to using EJB entity beans for new database and other
-    persistence-related operations. </p>. <p> Upgrading entity beans can be difficult,
+    persistence-related operations. </p> \n <p> Upgrading entity beans can be difficult,
     but it can be simplified if your application uses design patterns such as DTO,
-    Session Facade, and DAO. </p>. </div>
+    Session Facade, and DAO. </p> \n</div>"
   ruleID: DetectEJBEntityBeansXML
   when:
     builtin.xml:
@@ -186,9 +174,8 @@
       xpath: //*[local-name()='entity']
 - category: mandatory
   customVariables: []
-  description: |-
-    Transaction propagation is not supported for Enterprise JavaBeans (EJB) remote interfaces
-    <div class="Text">. <p> Liberty does not support outbound or inbound transaction propagation for EJB remote interfaces. By default, EJB beans are container-managed and use the <code>Required</code> transaction attribute. As a result, existing EJB definitions that do not specify any <code>container-transaction</code> properties are configured by default to use transactions although they are not supported. </p>. <p>This rule flags Java code that references the following EJB annotations that indicate the use of remote business or home interfaces:</p>. <ul>. <li><code>javax.ejb.Remote</code></li>. <li><code>javax.ejb.RemoteHome</code></li>. </ul>. <p>This rule also flags the following references in the <span class="FilePath">ejb-jar.xml</span> file:</p>. <ul>. <li><code>&lt;remote/&gt;</code></li>. <li><code>&lt;business-remote/&gt;</code></li>. </ul>. <p> The EJB specification requires products that support outbound transaction propagation to still send a null transaction context. This context must be rejected by EJB components that use the <code>Required</code> (default), <code>Mandatory</code> , or <code>Supports</code> transaction attributes. A client with an active global transaction cannot start an EJB bean with default transaction attributes if either the client or server is on Liberty. </p>. <p> To enable the client to start the EJB bean, change the EJB bean to use either the <code>RequiresNew</code> or <code>NotSupported</code> transaction attribute. Although these attributes will allow the EJB bean to start, the transactional work that is done by the EJB bean is not committed as part of the client transactions. </p>. <p> Note that transaction propagation is supported for EJB remote interfaces that are running in the same JVM, however this may only be determined with further investigation of the application behavior. </p>. <h4>Make sure remote EJB interfaces are needed</h4>. <p> Often EJB 2.x beans configure the remote interfaces in ejb-jar.xml even when they are not used. You only need remote interfaces if you have code running across two different JVMs. In WebSphere terms, this is either between two different application servers or between a client application and an application server running in different JVMs. CORBA information, such as an <code>iiop://</code> provider URL, in an EJB lookup is also an indicator that remote EJB beans are being used. </p>. <p> If you are referencing EJB beans using a remote interface that are running in the same JVM, the Local interface can be used and will perform better. Where possible, change annotations from @Remote to @Local and from @RemoteHome to @LocalHome and test all your code scenarios. Likewise for ejb-jar.xml configuration, remove the <code>&lt;remote/&gt;</code> and <code>&lt;business-remote/&gt;</code> definitions and test all scenarios. While transaction propagation is supported for this scenario, the best practice is to convert to using local interfaces to improve performance and remove the perception that methods can be called externally from the same JVM. </p>. <h4>If you really need remote interfaces</h4>. <h5>Wrap the EJB beans in a web service (JAX-WS)</h5>. <p> For those EJB beans that require remote access, best practice is to wrap them in a web service. Refer to <a href="https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service'); return false;"> Annotating an EJB bean to create a web service</a> for instructions on using WebSphere Application Server Developer Tools for Eclipse to make these code changes. After wrapping the EJB beans in web services, use the web service client to call the EJB web service. After testing, you can remove the EJB remote annotations or configuration. </p>. <h5>Handling Transaction Propagation</h5> Liberty provides Web Services Atomic Transaction (WS-AT) support which enables distributed global transactions. When your EJB are deployed as web services, WS-AT can be used to manage the transactions. See <a href="https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview'); return false;"> Web Services Atomic Transaction overview</a> for more information.. <p> For more information on related topics, see </p>. <ul>. <li><a href="https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces'); return false;"> Using enterprise JavaBeans with remote interfaces on Liberty</a></li>. <li><a href="https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application'); return false;"> Using enterprise JavaBeans applications that call local EJB components in another application</a></li>. </ul>. </div>
+  description: Transaction propagation is not supported for Enterprise JavaBeans (EJB)
+    remote interfaces
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -196,64 +183,64 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> Liberty does not support outbound or inbound transaction
-    propagation for EJB remote interfaces. By default, EJB beans are container-managed
+  message: "<div class=\"Text\"> \n <p> Liberty does not support outbound or inbound
+    transaction propagation for EJB remote interfaces. By default, EJB beans are container-managed
     and use the <code>Required</code> transaction attribute. As a result, existing
     EJB definitions that do not specify any <code>container-transaction</code> properties
     are configured by default to use transactions although they are not supported.
-    </p>. <p>This rule flags Java code that references the following EJB annotations
-    that indicate the use of remote business or home interfaces:</p>. <ul>. <li><code>javax.ejb.Remote</code></li>.
-    <li><code>javax.ejb.RemoteHome</code></li>. </ul>. <p>This rule also flags the
-    following references in the <span class="FilePath">ejb-jar.xml</span> file:</p>.
-    <ul>. <li><code>&lt;remote/&gt;</code></li>. <li><code>&lt;business-remote/&gt;</code></li>.
-    </ul>. <p> The EJB specification requires products that support outbound transaction
-    propagation to still send a null transaction context. This context must be rejected
-    by EJB components that use the <code>Required</code> (default), <code>Mandatory</code>
-    , or <code>Supports</code> transaction attributes. A client with an active global
-    transaction cannot start an EJB bean with default transaction attributes if either
-    the client or server is on Liberty. </p>. <p> To enable the client to start the
-    EJB bean, change the EJB bean to use either the <code>RequiresNew</code> or <code>NotSupported</code>
-    transaction attribute. Although these attributes will allow the EJB bean to start,
-    the transactional work that is done by the EJB bean is not committed as part of
-    the client transactions. </p>. <p> Note that transaction propagation is supported
-    for EJB remote interfaces that are running in the same JVM, however this may only
-    be determined with further investigation of the application behavior. </p>. <h4>Make
-    sure remote EJB interfaces are needed</h4>. <p> Often EJB 2.x beans configure
-    the remote interfaces in ejb-jar.xml even when they are not used. You only need
-    remote interfaces if you have code running across two different JVMs. In WebSphere
-    terms, this is either between two different application servers or between a client
-    application and an application server running in different JVMs. CORBA information,
-    such as an <code>iiop://</code> provider URL, in an EJB lookup is also an indicator
-    that remote EJB beans are being used. </p>. <p> If you are referencing EJB beans
-    using a remote interface that are running in the same JVM, the Local interface
-    can be used and will perform better. Where possible, change annotations from @Remote
-    to @Local and from @RemoteHome to @LocalHome and test all your code scenarios.
-    Likewise for ejb-jar.xml configuration, remove the <code>&lt;remote/&gt;</code>
-    and <code>&lt;business-remote/&gt;</code> definitions and test all scenarios.
-    While transaction propagation is supported for this scenario, the best practice
-    is to convert to using local interfaces to improve performance and remove the
-    perception that methods can be called externally from the same JVM. </p>. <h4>If
-    you really need remote interfaces</h4>. <h5>Wrap the EJB beans in a web service
-    (JAX-WS)</h5>. <p> For those EJB beans that require remote access, best practice
-    is to wrap them in a web service. Refer to <a href="https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service');
-    return false;"> Annotating an EJB bean to create a web service</a> for instructions
+    </p> \n <p>This rule flags Java code that references the following EJB annotations
+    that indicate the use of remote business or home interfaces:</p> \n <ul> \n <li><code>javax.ejb.Remote</code></li>
+    \n <li><code>javax.ejb.RemoteHome</code></li> \n </ul> \n <p>This rule also flags
+    the following references in the <span class=\"FilePath\">ejb-jar.xml</span> file:</p>
+    \n <ul> \n <li><code>&lt;remote/&gt;</code></li> \n <li><code>&lt;business-remote/&gt;</code></li>
+    \n </ul> \n <p> The EJB specification requires products that support outbound
+    transaction propagation to still send a null transaction context. This context
+    must be rejected by EJB components that use the <code>Required</code> (default),
+    <code>Mandatory</code> , or <code>Supports</code> transaction attributes. A client
+    with an active global transaction cannot start an EJB bean with default transaction
+    attributes if either the client or server is on Liberty. </p> \n <p> To enable
+    the client to start the EJB bean, change the EJB bean to use either the <code>RequiresNew</code>
+    or <code>NotSupported</code> transaction attribute. Although these attributes
+    will allow the EJB bean to start, the transactional work that is done by the EJB
+    bean is not committed as part of the client transactions. </p> \n <p> Note that
+    transaction propagation is supported for EJB remote interfaces that are running
+    in the same JVM, however this may only be determined with further investigation
+    of the application behavior. </p> \n <h4>Make sure remote EJB interfaces are needed</h4>
+    \n <p> Often EJB 2.x beans configure the remote interfaces in ejb-jar.xml even
+    when they are not used. You only need remote interfaces if you have code running
+    across two different JVMs. In WebSphere terms, this is either between two different
+    application servers or between a client application and an application server
+    running in different JVMs. CORBA information, such as an <code>iiop://</code>
+    provider URL, in an EJB lookup is also an indicator that remote EJB beans are
+    being used. </p> \n <p> If you are referencing EJB beans using a remote interface
+    that are running in the same JVM, the Local interface can be used and will perform
+    better. Where possible, change annotations from @Remote to @Local and from @RemoteHome
+    to @LocalHome and test all your code scenarios. Likewise for ejb-jar.xml configuration,
+    remove the <code>&lt;remote/&gt;</code> and <code>&lt;business-remote/&gt;</code>
+    definitions and test all scenarios. While transaction propagation is supported
+    for this scenario, the best practice is to convert to using local interfaces to
+    improve performance and remove the perception that methods can be called externally
+    from the same JVM. </p> \n <h4>If you really need remote interfaces</h4> \n <h5>Wrap
+    the EJB beans in a web service (JAX-WS)</h5> \n <p> For those EJB beans that require
+    remote access, best practice is to wrap them in a web service. Refer to <a href=\"https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/wasdtfe?topic=annotations-annotating-ejb-bean-create-web-service');
+    return false;\"> Annotating an EJB bean to create a web service</a> for instructions
     on using WebSphere Application Server Developer Tools for Eclipse to make these
     code changes. After wrapping the EJB beans in web services, use the web service
     client to call the EJB web service. After testing, you can remove the EJB remote
-    annotations or configuration. </p>. <h5>Handling Transaction Propagation</h5>
+    annotations or configuration. </p> \n <h5>Handling Transaction Propagation</h5>
     Liberty provides Web Services Atomic Transaction (WS-AT) support which enables
     distributed global transactions. When your EJB are deployed as web services, WS-AT
-    can be used to manage the transactions. See <a href="https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview');
-    return false;"> Web Services Atomic Transaction overview</a> for more information..
-    <p> For more information on related topics, see </p>. <ul>. <li><a href="https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces');
-    return false;"> Using enterprise JavaBeans with remote interfaces on Liberty</a></li>.
-    <li><a href="https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application"
-    title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application');
-    return false;"> Using enterprise JavaBeans applications that call local EJB components
-    in another application</a></li>. </ul>. </div>
+    can be used to manage the transactions. See <a href=\"https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/base?topic=liberty-web-services-atomic-transaction-overview');
+    return false;\"> Web Services Atomic Transaction overview</a> for more information.
+    \n <p> For more information on related topics, see </p> \n <ul> \n <li><a href=\"https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/nd?topic=liberty-using-enterprise-javabeans-remote-interfaces');
+    return false;\"> Using enterprise JavaBeans with remote interfaces on Liberty</a></li>
+    \n <li><a href=\"https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-liberty/core?topic=deal-using-enterprise-javabeans-applications-that-call-local-ejb-components-in-another-application');
+    return false;\"> Using enterprise JavaBeans applications that call local EJB components
+    in another application</a></li> \n </ul> \n</div>"
   ruleID: DetectTransactionPropagationEJBRemote
   when:
     or:
@@ -266,9 +253,7 @@
         xpath: //*[local-name()='remote' or local-name()='business-remote']
 - category: mandatory
   customVariables: []
-  description: |-
-    Java API for XML-based RPC (JAX-RPC) is unavailable
-    <div class="Text"><p>This rule flags the use of any JAX-RPC specific packages and configuration files. Also, this rule will flag any use of the. <code>jaxrpc-mapping-file</code> tag in XML Mapping files. The following table lists Java packages, configuration files and. XML mapping files impacted by this rule:</p>. <h3>Packages</h3>. <ul>. <li>javax.xml.rpc</li>. <li>javax.xml.rpc.encoding</li>. <li>javax.xml.rpc.handler</li>. <li>javax.xml.rpc.handler.soap</li>. <li>javax.xml.rpc.holders</li>. <li>javax.xml.rpc.server</li>. <li>javax.xml.rpc.soap</li>. </ul>. <h3>Configuration Files</h3>. <ul>. <li>ibm-webservices-ext.xmi</li>. <li>ibm-webservices-bnd.xmi</li>. <li>ibm-webservicesclient-ext.xmi</li>. <li>ibm-webservicesclient-bnd.xmi</li>. <li>ws-security.xml</li>. </ul>. <h3>XML Mapping Files</h3>. <ul>. <li>webservices.xml</li>. <li>web.xml</li>. <li>ejb-jar.xml</li>. <li>ibm-webservicesclient-bnd.xmi</li>. <li>application.xml</li>. </ul>. <p>. The Java API for XML-based RPC (JAX-RPC) is not supported on Liberty or Liberty Core.. The technology is deprecated in WebSphere Application Server traditional V9.0 and might be removed in a later version.. If your application uses JAX-RPC, the preferred migration path is to use JAX-WS, but here are the alternatives:</p>. <ul>. <li>Option 1: Migrate JAX-RPC web services to JAX-WS web services</li>. <li>Option 2: Use the Apache Axis 1 JAX-RPC engine on Liberty</li>. <li>Option 3: Use WebSphere Application Server traditional with its native JAX-RPC engine</li>. </ul>. </div>
+  description: Java API for XML-based RPC (JAX-RPC) is unavailable
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -276,24 +261,50 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text"><p>This rule flags the use of any JAX-RPC specific packages
-    and configuration files. Also, this rule will flag any use of the. <code>jaxrpc-mapping-file</code>
-    tag in XML Mapping files. The following table lists Java packages, configuration
-    files and. XML mapping files impacted by this rule:</p>. <h3>Packages</h3>. <ul>.
-    <li>javax.xml.rpc</li>. <li>javax.xml.rpc.encoding</li>. <li>javax.xml.rpc.handler</li>.
-    <li>javax.xml.rpc.handler.soap</li>. <li>javax.xml.rpc.holders</li>. <li>javax.xml.rpc.server</li>.
-    <li>javax.xml.rpc.soap</li>. </ul>. <h3>Configuration Files</h3>. <ul>. <li>ibm-webservices-ext.xmi</li>.
-    <li>ibm-webservices-bnd.xmi</li>. <li>ibm-webservicesclient-ext.xmi</li>. <li>ibm-webservicesclient-bnd.xmi</li>.
-    <li>ws-security.xml</li>. </ul>. <h3>XML Mapping Files</h3>. <ul>. <li>webservices.xml</li>.
-    <li>web.xml</li>. <li>ejb-jar.xml</li>. <li>ibm-webservicesclient-bnd.xmi</li>.
-    <li>application.xml</li>. </ul>. <p>. The Java API for XML-based RPC (JAX-RPC)
-    is not supported on Liberty or Liberty Core.. The technology is deprecated in
-    WebSphere Application Server traditional V9.0 and might be removed in a later
-    version.. If your application uses JAX-RPC, the preferred migration path is to
-    use JAX-WS, but here are the alternatives:</p>. <ul>. <li>Option 1: Migrate JAX-RPC
-    web services to JAX-WS web services</li>. <li>Option 2: Use the Apache Axis 1
-    JAX-RPC engine on Liberty</li>. <li>Option 3: Use WebSphere Application Server
-    traditional with its native JAX-RPC engine</li>. </ul>. </div>'
+  message: |-
+    <div class="Text"><p>This rule flags the use of any JAX-RPC specific packages and configuration files. Also, this rule will flag any use of the
+     <code>jaxrpc-mapping-file</code> tag in XML Mapping files. The following table lists Java packages, configuration files and
+     XML mapping files impacted by this rule:</p>
+
+     <h3>Packages</h3>
+     <ul>
+     <li>javax.xml.rpc</li>
+     <li>javax.xml.rpc.encoding</li>
+     <li>javax.xml.rpc.handler</li>
+     <li>javax.xml.rpc.handler.soap</li>
+     <li>javax.xml.rpc.holders</li>
+     <li>javax.xml.rpc.server</li>
+     <li>javax.xml.rpc.soap</li>
+     </ul>
+     <h3>Configuration Files</h3>
+     <ul>
+     <li>ibm-webservices-ext.xmi</li>
+     <li>ibm-webservices-bnd.xmi</li>
+     <li>ibm-webservicesclient-ext.xmi</li>
+     <li>ibm-webservicesclient-bnd.xmi</li>
+     <li>ws-security.xml</li>
+     </ul>
+     <h3>XML Mapping Files</h3>
+     <ul>
+     <li>webservices.xml</li>
+     <li>web.xml</li>
+     <li>ejb-jar.xml</li>
+     <li>ibm-webservicesclient-bnd.xmi</li>
+     <li>application.xml</li>
+     </ul>
+
+     <p>
+     The Java API for XML-based RPC (JAX-RPC) is not supported on Liberty or Liberty Core.
+     The technology is deprecated in WebSphere Application Server traditional V9.0 and might be removed in a later version.
+     If your application uses JAX-RPC, the preferred migration path is to use JAX-WS, but here are the alternatives:</p>
+
+     <ul>
+     <li>Option 1: Migrate JAX-RPC web services to JAX-WS web services</li>
+     <li>Option 2: Use the Apache Axis 1 JAX-RPC engine on Liberty</li>
+     <li>Option 3: Use WebSphere Application Server traditional with its native JAX-RPC engine</li>
+     </ul>
+
+     </div>
   ruleID: DetectJAXRPC
   when:
     or:
diff --git a/default/generated/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml b/default/generated/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml
index eae56399..8e6389d4 100644
--- a/default/generated/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml
+++ b/default/generated/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    The Activity Session service is unavailable
-    <div class="Text">. <p> The Activity Session service is unavailable on Liberty. This rule flags the following items: </p>. <ul>. <li>References to APIs in the <code>com.ibm.websphere.ActivitySession</code> package</li>. <li>The activity session JNDI name <code>java:comp/websphere/UserActivitySession</code></li>. <li>Elements that are related to activity sessions in Java Platform, Enterprise Edition (Java EE) extension deployment descriptors</li>. </ul>. </div>
+  description: The Activity Session service is unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -10,12 +8,12 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The Activity Session service is unavailable on
-    Liberty. This rule flags the following items: </p>. <ul>. <li>References to APIs
-    in the <code>com.ibm.websphere.ActivitySession</code> package</li>. <li>The activity
-    session JNDI name <code>java:comp/websphere/UserActivitySession</code></li>. <li>Elements
-    that are related to activity sessions in Java Platform, Enterprise Edition (Java
-    EE) extension deployment descriptors</li>. </ul>. </div>'
+  message: "<div class=\"Text\"> \n <p> The Activity Session service is unavailable
+    on Liberty. This rule flags the following items: </p> \n <ul> \n <li>References
+    to APIs in the <code>com.ibm.websphere.ActivitySession</code> package</li> \n
+    <li>The activity session JNDI name <code>java:comp/websphere/UserActivitySession</code></li>
+    \n <li>Elements that are related to activity sessions in Java Platform, Enterprise
+    Edition (Java EE) extension deployment descriptors</li> \n </ul> \n</div>"
   ruleID: ActivitySessionRule
   when:
     or:
@@ -66,9 +64,7 @@
         xpath: //*[local-name()='activitySessionEJBJarExtension']
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Application Profiling APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Application Profiling APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.appprofile</code></li>. <li><code>com.ibm.websphere.appprofile.accessintent</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Application Profiling APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -76,10 +72,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Application Profiling
-    APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.appprofile</code></li>.
-    <li><code>com.ibm.websphere.appprofile.accessintent</code></li>. </ul>. <p>You
-    must modify the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Application Profiling
+    APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.appprofile</code></li>
+    \n <li><code>com.ibm.websphere.appprofile.accessintent</code></li> \n </ul> \n
+    <p>You must modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: AppProfileRule
   when:
     java.referenced:
@@ -90,9 +86,7 @@
   - name: AsyncBeansSchedulerRule_0_packages
     nameOfCaptureGroup: AsyncBeansSchedulerRule_0_packages
     pattern: (?P<AsyncBeansSchedulerRule_0_packages>(com.ibm.websphere.asynchbeans\.[^.]+|com.ibm.websphere.asynchbeans.pool\.[^.]+))
-  description: |-
-    The WebSphere Asynchronous Beans API was superseded by a newer implementation
-    <span class="SubHeader">WebSphere Asynchronous Beans API</span>. <div class="Text">. <p> This rule flags APIs from the <code>com.ibm.websphere.asynchbeans</code> package. These APIs are not provided on Liberty and are marked as deprecated in WebSphere Application Server traditional V9.0. The WebSphere Asynchronous Beans API are replaced by JSR 236, Concurrency Utilities for Java EE. </p>. <p> <b>Note:</b> Concurrency Utilities for Java EE provides no replacement for the <code>com.ibm.websphere.asynchbeans.pool</code> APIs. </p>. <p> For information and examples about how to use Concurrency Utilities for Java EE instead of Asynchronous beans in WebSphere traditional, see <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency" title="Opens a new window" onclick="javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency'); return false;"> Examples to migrate to EE Concurrency from Asynchronous beans and CommonJ</a>. </p>. <p> For information about the Concurrency Utilities for Java EE feature <code>concurrent-1.0</code> in Liberty, see the link below. </div>
+  description: The WebSphere Asynchronous Beans API was superseded by a newer implementation
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -102,27 +96,25 @@
     url: https://www.ibm.com/docs/en/was-liberty/nd?topic=features-concurrency-utilities-java-ee-10
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <span class="SubHeader">WebSphere Asynchronous Beans API</span>. <div class="Text">.
-    <p> This rule flags APIs from the <code>com.ibm.websphere.asynchbeans</code> package.
-    These APIs are not provided on Liberty and are marked as deprecated in WebSphere
-    Application Server traditional V9.0. The WebSphere Asynchronous Beans API are
-    replaced by JSR 236, Concurrency Utilities for Java EE. </p>. <p> <b>Note:</b>
+  message: "<span class=\"SubHeader\">WebSphere Asynchronous Beans API</span> \n<div
+    class=\"Text\"> \n <p> This rule flags APIs from the <code>com.ibm.websphere.asynchbeans</code>
+    package. These APIs are not provided on Liberty and are marked as deprecated in
+    WebSphere Application Server traditional V9.0. The WebSphere Asynchronous Beans
+    API are replaced by JSR 236, Concurrency Utilities for Java EE. </p> \n <p> <b>Note:</b>
     Concurrency Utilities for Java EE provides no replacement for the <code>com.ibm.websphere.asynchbeans.pool</code>
-    APIs. </p>. <p> For information and examples about how to use Concurrency Utilities
-    for Java EE instead of Asynchronous beans in WebSphere traditional, see <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency"
-    title="Opens a new window" onclick="javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency');
-    return false;"> Examples to migrate to EE Concurrency from Asynchronous beans
-    and CommonJ</a>. </p>. <p> For information about the Concurrency Utilities for
-    Java EE feature <code>concurrent-1.0</code> in Liberty, see the link below. </div>
+    APIs. </p> \n <p> For information and examples about how to use Concurrency Utilities
+    for Java EE instead of Asynchronous beans in WebSphere traditional, see <a href=\"http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=rasb_migrate_to_eeconcurrency');
+    return false;\"> Examples to migrate to EE Concurrency from Asynchronous beans
+    and CommonJ</a>. </p> \n <p> For information about the Concurrency Utilities for
+    Java EE feature <code>concurrent-1.0</code> in Liberty, see the link below \n</div>"
   ruleID: AsyncBeansSchedulerRule
   when:
     java.referenced:
       pattern: (com.ibm.websphere.asynchbeans*|com.ibm.websphere.asynchbeans.pool*)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Batch API and SPI are unavailable
-    <div class="Text">. <p>WebSphere Batch API and SPI are unavailable on Liberty. This rule flags the following packages:</p>. <ul>. <li><code>com.ibm.websphere.batch*</code></li>. <li><code>com.ibm.websphere.ci</code></li>. <li><code>com.ibm.websphere.grid.spi</code></li>. <li><code>com.ibm.websphere.longrun</code></li>. <li><code>com.ibm.wsspi.batch*</code></li>. </ul>. <p> For information on Liberty Batch, see <a href="http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544" title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544'); return false;"> IBM WebSphere Liberty Java Batch</a>. </p>. <p> For information on transitioning to WebSphere Liberty Batch, see the <a href="http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638" title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638'); return false;"> WebSphere Liberty Batch Migration</a> documentation. </p>. </div>
+  description: The WebSphere Batch API and SPI are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -130,16 +122,16 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p>WebSphere Batch API and SPI are unavailable on Liberty.
-    This rule flags the following packages:</p>. <ul>. <li><code>com.ibm.websphere.batch*</code></li>.
-    <li><code>com.ibm.websphere.ci</code></li>. <li><code>com.ibm.websphere.grid.spi</code></li>.
-    <li><code>com.ibm.websphere.longrun</code></li>. <li><code>com.ibm.wsspi.batch*</code></li>.
-    </ul>. <p> For information on Liberty Batch, see <a href="http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544"
-    title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544');
-    return false;"> IBM WebSphere Liberty Java Batch</a>. </p>. <p> For information
-    on transitioning to WebSphere Liberty Batch, see the <a href="http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638"
-    title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638');
-    return false;"> WebSphere Liberty Batch Migration</a> documentation. </p>. </div>
+  message: "<div class=\"Text\"> \n <p>WebSphere Batch API and SPI are unavailable
+    on Liberty. This rule flags the following packages:</p> \n <ul> \n <li><code>com.ibm.websphere.batch*</code></li>
+    \n <li><code>com.ibm.websphere.ci</code></li> \n <li><code>com.ibm.websphere.grid.spi</code></li>
+    \n <li><code>com.ibm.websphere.longrun</code></li> \n <li><code>com.ibm.wsspi.batch*</code></li>
+    \n </ul> \n <p> For information on Liberty Batch, see <a href=\"http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102544');
+    return false;\"> IBM WebSphere Liberty Java Batch</a>. </p> \n <p> For information
+    on transitioning to WebSphere Liberty Batch, see the <a href=\"http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www.ibm.com/support/techdocs/atsmastr.nsf/WebIndex/WP102638');
+    return false;\"> WebSphere Liberty Batch Migration</a> documentation. </p> \n</div>"
   ruleID: BatchFeaturePackRule
   when:
     or:
@@ -153,9 +145,7 @@
           'com\.ibm\.websphere\.batch\..*')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Web Services Policy Sets are unavailable in Liberty
-    <div class="Text"> <span class="SubHeader">Web Services Policy Sets are unavailable in Liberty.</span>. <p> This rule detects the following generated files when using web services Policy Sets in WebSphere traditional: </p>. <ul>. <li>policySet.xml</li>. <li>policyAttachments.xml</li>. <li>clientPolicyAttachments.xml</li>. <li>policy.xml</li>. <li>bindings.xml</li>. <li>bindingDefinition.xml</li>. </ul>. <p> In Liberty, web services Policy Sets are no longer used. Changes are needed to migrate an application to the Web Services Policy implementation on Liberty. For more information on using WS-Policy in Liberty see <a href="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html'); return false;"> Defining web service policy via policy attachment</a>. </p>. <p> The web services security implementation for Liberty is different than WebSphere traditional. If an application is using the WebSphere traditional web services security adhering to the OASIS specification changes may not be necessary. Review the <a href="https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html'); return false;"> WS-Security behavior differences between traditional and Liberty</a> for more information about behavior differences that may require changes in your application. </p>. <p> For more information on the OASIS specification see <a href="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html" title="Opens a new window" onclick="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html'); return false;"> Web Services Security specifications and standards</a>. </p>. </div>
+  description: Web Services Policy Sets are unavailable in Liberty
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -163,37 +153,35 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text"> <span class="SubHeader">Web Services Policy Sets are
-    unavailable in Liberty.</span>. <p> This rule detects the following generated
-    files when using web services Policy Sets in WebSphere traditional: </p>. <ul>.
-    <li>policySet.xml</li>. <li>policyAttachments.xml</li>. <li>clientPolicyAttachments.xml</li>.
-    <li>policy.xml</li>. <li>bindings.xml</li>. <li>bindingDefinition.xml</li>. </ul>.
-    <p> In Liberty, web services Policy Sets are no longer used. Changes are needed
-    to migrate an application to the Web Services Policy implementation on Liberty.
-    For more information on using WS-Policy in Liberty see <a href="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html'');
-    return false;"> Defining web service policy via policy attachment</a>. </p>. <p>
-    The web services security implementation for Liberty is different than WebSphere
+  message: "<div class=\"Text\"> <span class=\"SubHeader\">Web Services Policy Sets
+    are unavailable in Liberty.</span> \n <p> This rule detects the following generated
+    files when using web services Policy Sets in WebSphere traditional: </p> \n <ul>
+    \n <li>policySet.xml</li> \n <li>policyAttachments.xml</li> \n <li>clientPolicyAttachments.xml</li>
+    \n <li>policy.xml</li> \n <li>bindings.xml</li> \n <li>bindingDefinition.xml</li>
+    \n </ul> \n <p> In Liberty, web services Policy Sets are no longer used. Changes
+    are needed to migrate an application to the Web Services Policy implementation
+    on Liberty. For more information on using WS-Policy in Liberty see <a href=\"https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/twlp_dep_policyattach.html');
+    return false;\"> Defining web service policy via policy attachment</a>. </p> \n
+    <p> The web services security implementation for Liberty is different than WebSphere
     traditional. If an application is using the WebSphere traditional web services
     security adhering to the OASIS specification changes may not be necessary. Review
-    the <a href="https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html'');
-    return false;"> WS-Security behavior differences between traditional and Liberty</a>
+    the <a href=\"https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/cwlp_wssec_cxf_diff.html');
+    return false;\"> WS-Security behavior differences between traditional and Liberty</a>
     for more information about behavior differences that may require changes in your
-    application. </p>. <p> For more information on the OASIS specification see <a
-    href="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html"
-    title="Opens a new window" onclick="https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html'');
-    return false;"> Web Services Security specifications and standards</a>. </p>.
-    </div>'
+    application. </p> \n <p> For more information on the OASIS specification see <a
+    href=\"https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html\"
+    title=\"Opens a new window\" onclick=\"https://www.ibm.com/support/knowledgecenter/en/SSEQTP_liberty/com.ibm.websphere.wlp.doc/ae/cwlp_wssec_specs.html');
+    return false;\"> Web Services Security specifications and standards</a>. </p>
+    \n</div>"
   ruleID: DetectPolicySetAndWsSecurity
   when:
     builtin.file:
       pattern: policySet\\.xml|policyAttachments\\.xml|clientPolicyAttachments\\.xml|policy\\.xml|bindings\\.xml|bindingDefinition\\.xml
 - category: optional
   customVariables: []
-  description: |-
-    Web Services Atomic Transaction (WS-AT) Version 1.2 is available
-    <div class="Text">. <p> Web Services Atomic Transaction (WS-AT) Version 1.2 is now available on Liberty. This rule flags the following unsupported WS-AT attributes in IBM deployment descriptor extensions: </p>. <ul>. <li><code>execute-using-wsat="true"</code></li>. <li><code>sendWSAT="true"</code></li>. <li><code>send-wsat-context="true"</code></li>. <li><code>supportsWSAT="true"</code></li>. </ul>. <p> Liberty does not provide support for WS-AT with EJB global transactions, but Liberty applications can use the WS-AT Version 1.2 specification. </p>. <p> For more information, see the knowledge center topics starting at <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib" title="Opens a new window" onclick="javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib'); return false;"> Web Services Atomic Transaction in Liberty</a>. </p>. </div>
+  description: Web Services Atomic Transaction (WS-AT) Version 1.2 is available
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -201,16 +189,16 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> Web Services Atomic Transaction (WS-AT) Version
+  message: "<div class=\"Text\"> \n <p> Web Services Atomic Transaction (WS-AT) Version
     1.2 is now available on Liberty. This rule flags the following unsupported WS-AT
-    attributes in IBM deployment descriptor extensions: </p>. <ul>. <li><code>execute-using-wsat="true"</code></li>.
-    <li><code>sendWSAT="true"</code></li>. <li><code>send-wsat-context="true"</code></li>.
-    <li><code>supportsWSAT="true"</code></li>. </ul>. <p> Liberty does not provide
-    support for WS-AT with EJB global transactions, but Liberty applications can use
-    the WS-AT Version 1.2 specification. </p>. <p> For more information, see the knowledge
-    center topics starting at <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib"
-    title="Opens a new window" onclick="javascript:helpWindow(''http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib'');
-    return false;"> Web Services Atomic Transaction in Liberty</a>. </p>. </div>'
+    attributes in IBM deployment descriptor extensions: </p> \n <ul> \n <li><code>execute-using-wsat=\"true\"</code></li>
+    \n <li><code>sendWSAT=\"true\"</code></li> \n <li><code>send-wsat-context=\"true\"</code></li>
+    \n <li><code>supportsWSAT=\"true\"</code></li> \n </ul> \n <p> Liberty does not
+    provide support for WS-AT with EJB global transactions, but Liberty applications
+    can use the WS-AT Version 1.2 specification. </p> \n <p> For more information,
+    see the knowledge center topics starting at <a href=\"http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=cord&amp;product=was-nd-mp&amp;topic=twlp_dep_wsat_lib');
+    return false;\"> Web Services Atomic Transaction in Liberty</a>. </p>\n</div>"
   ruleID: DetectWSATXML
   when:
     or:
@@ -242,9 +230,7 @@
           '(?i:true)')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Web Services Business Activity (WS-BA) is unavailable
-    <div class="Text">. <p> Web Services Business Activity (WS-BA) is unavailable on Liberty. This rule flags references to APIs in the com.ibm.websphere.wsba package and the business activity JNDI name <code>java:comp/websphere/UserBusinessActivity</code>. </p>. </div>
+  description: Web Services Business Activity (WS-BA) is unavailable
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -252,10 +238,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> Web Services Business Activity (WS-BA) is unavailable
-    on Liberty. This rule flags references to APIs in the com.ibm.websphere.wsba package
-    and the business activity JNDI name <code>java:comp/websphere/UserBusinessActivity</code>.
-    </p>. </div>
+  message: "<div class=\"Text\"> \n <p> Web Services Business Activity (WS-BA) is
+    unavailable on Liberty. This rule flags references to APIs in the com.ibm.websphere.wsba
+    package and the business activity JNDI name <code>java:comp/websphere/UserBusinessActivity</code>.
+    </p> \n</div>"
   ruleID: DetectWSBAJava
   when:
     or:
@@ -270,9 +256,7 @@
   - name: DynamicCacheRule_0_packages
     nameOfCaptureGroup: DynamicCacheRule_0_packages
     pattern: (?P<DynamicCacheRule_0_packages>(com.ibm.websphere.cache*\.[^.]+|com.ibm.websphere.servlet.cache*\.[^.]+|com.ibm.ws.cache*\.[^.]+|com.ibm.wsspi.cache*\.[^.]+))
-  description: |-
-    Review use of the dynamic cache service
-    <div class="Text">. <p> On Liberty, the dynamic cache service is provided by the Distributed Map Interface for Dynamic Caching feature, <code>distributedMap-1.0</code>, and the Web Response Cache feature, <code>webCache-1.0</code>. The implementation has the following restrictions: </p>. <ul>. <li>No cache replication</li>. <li>Only the high-performance disk caching mode is supported with random and size eviction techniques</li>. <li>There is no support for Web Services client and server side caching as well as portlet caching in the cachespec.xml file</li>. <li>Servlet caching of SingleThreadModel servlets is not supported</li>. <li>Defining cache configuration by using properties files is not supported for JAR files that contain only Enterprise JavaBeans</li>. <li>Limiting the memory cache sizes in megabytes works only for 32-bit Java Virtual Machines</li>. </ul>. <p> This rule flags Java code that has references to the following packages: </p>. <ul>. <li><code>com.ibm.websphere.cache</code></li>. <li><code>com.ibm.ws.cache</code></li>. <li><code>com.ibm.wsspi.cache</code></li>. <li><code>com.ibm.websphere.servlet.cache</code></li>. </ul>. <p> The following APIs and SPIs are not available in Liberty: </p>. <ul>. <li><code>com.ibm.websphere.cache.ServletCache</code></li>. <li><code>com.ibm.wsspi.cache.CacheInstanceResourceBinder</code></li>. <li><code>com.ibm.wsspi.cache.CacheMonitor</code></li>. <li><code>com.ibm.wsspi.cache.ESIStats</code></li>. <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats</code></li>. <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats</code></li>. <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats$ESICacheEntryStats</code></li>. </ul>. <p> For detailed information about dynamic cache on Liberty, see the following resources: </p>. <ul>. <li> <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict" title="Opens a new window" onclick="javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict'); return false;"> Liberty:Runtime environment known issues and restrictions</a> </li>. <li> <a href="https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz" title="Opens a new window" onclick="javascript:helpWindow('https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz'); return false;"> Dynamic cache in Liberty</a> document </li>. </div>
+  description: Review use of the dynamic cache service
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -284,41 +268,39 @@
     url: https://www.ibm.com/docs/en/was-liberty/nd?topic=features-web-response-cache-10
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> On Liberty, the dynamic cache service is provided
+  message: "<div class=\"Text\"> \n <p> On Liberty, the dynamic cache service is provided
     by the Distributed Map Interface for Dynamic Caching feature, <code>distributedMap-1.0</code>,
     and the Web Response Cache feature, <code>webCache-1.0</code>. The implementation
-    has the following restrictions: </p>. <ul>. <li>No cache replication</li>. <li>Only
-    the high-performance disk caching mode is supported with random and size eviction
-    techniques</li>. <li>There is no support for Web Services client and server side
-    caching as well as portlet caching in the cachespec.xml file</li>. <li>Servlet
-    caching of SingleThreadModel servlets is not supported</li>. <li>Defining cache
-    configuration by using properties files is not supported for JAR files that contain
-    only Enterprise JavaBeans</li>. <li>Limiting the memory cache sizes in megabytes
-    works only for 32-bit Java Virtual Machines</li>. </ul>. <p> This rule flags Java
-    code that has references to the following packages: </p>. <ul>. <li><code>com.ibm.websphere.cache</code></li>.
-    <li><code>com.ibm.ws.cache</code></li>. <li><code>com.ibm.wsspi.cache</code></li>.
-    <li><code>com.ibm.websphere.servlet.cache</code></li>. </ul>. <p> The following
-    APIs and SPIs are not available in Liberty: </p>. <ul>. <li><code>com.ibm.websphere.cache.ServletCache</code></li>.
-    <li><code>com.ibm.wsspi.cache.CacheInstanceResourceBinder</code></li>. <li><code>com.ibm.wsspi.cache.CacheMonitor</code></li>.
-    <li><code>com.ibm.wsspi.cache.ESIStats</code></li>. <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats</code></li>.
-    <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats</code></li>.
-    <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats$ESICacheEntryStats</code></li>.
-    </ul>. <p> For detailed information about dynamic cache on Liberty, see the following
-    resources: </p>. <ul>. <li> <a href="http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict"
-    title="Opens a new window" onclick="javascript:helpWindow(''http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict'');
-    return false;"> Liberty:Runtime environment known issues and restrictions</a>
-    </li>. <li> <a href="https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz'');
-    return false;"> Dynamic cache in Liberty</a> document </li>. </div>'
+    has the following restrictions: </p> \n <ul> \n <li>No cache replication</li>
+    \n <li>Only the high-performance disk caching mode is supported with random and
+    size eviction techniques</li> \n <li>There is no support for Web Services client
+    and server side caching as well as portlet caching in the cachespec.xml file</li>
+    \n <li>Servlet caching of SingleThreadModel servlets is not supported</li> \n
+    <li>Defining cache configuration by using properties files is not supported for
+    JAR files that contain only Enterprise JavaBeans</li> \n <li>Limiting the memory
+    cache sizes in megabytes works only for 32-bit Java Virtual Machines</li> \n </ul>
+    \n <p> This rule flags Java code that has references to the following packages:
+    </p> \n <ul> \n <li><code>com.ibm.websphere.cache</code></li> \n <li><code>com.ibm.ws.cache</code></li>
+    \n <li><code>com.ibm.wsspi.cache</code></li> \n <li><code>com.ibm.websphere.servlet.cache</code></li>
+    \n </ul> \n <p> The following APIs and SPIs are not available in Liberty: </p>
+    \n <ul> \n <li><code>com.ibm.websphere.cache.ServletCache</code></li> \n <li><code>com.ibm.wsspi.cache.CacheInstanceResourceBinder</code></li>
+    \n <li><code>com.ibm.wsspi.cache.CacheMonitor</code></li> \n <li><code>com.ibm.wsspi.cache.ESIStats</code></li>
+    \n <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats</code></li> \n <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats</code></li>
+    \n <li><code>com.ibm.wsspi.cache.ESIStats$ESIServerStats$ESIProcessorStats$ESICacheEntryStats</code></li>
+    \n </ul> \n <p> For detailed information about dynamic cache on Liberty, see the
+    following resources: </p> \n <ul> \n <li> <a href=\"http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www14.software.ibm.com/webapp/wsbroker/redirect?version=phil&amp;product=was-nd-mp&amp;topic=rwlp_restrict#rwlp_restrict__dynacache-restrict');
+    return false;\"> Liberty:Runtime environment known issues and restrictions</a>
+    </li> \n <li> <a href=\"https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://mediacenter.ibm.com/media/Dynamic+cache+in+Liberty/0_bnh3uidz');
+    return false;\"> Dynamic cache in Liberty</a> document </li>\n </div> \n"
   ruleID: DynamicCacheRule
   when:
     java.referenced:
       pattern: (com.ibm.websphere.cache*|com.ibm.websphere.servlet.cache*|com.ibm.ws.cache*|com.ibm.wsspi.cache*)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere EJB Query API is unavailable
-    <div class="Text">. <p> The WebSphere Enterprise JavaBeans (EJB) query service is not available on Liberty. </p>. <p> This rule flags Java code that has references to the <code>com.ibm.websphere.ejbquery</code> package. </p>. <p> WebSphere EJB query service is used to query entity beans, which are not available on Liberty. </p>. </div>
+  description: The WebSphere EJB Query API is unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -326,11 +308,11 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> The WebSphere Enterprise JavaBeans (EJB) query
-    service is not available on Liberty. </p>. <p> This rule flags Java code that
-    has references to the <code>com.ibm.websphere.ejbquery</code> package. </p>. <p>
-    WebSphere EJB query service is used to query entity beans, which are not available
-    on Liberty. </p>. </div>
+  message: "<div class=\"Text\"> \n <p> The WebSphere Enterprise JavaBeans (EJB) query
+    service is not available on Liberty. </p> \n <p> This rule flags Java code that
+    has references to the <code>com.ibm.websphere.ejbquery</code> package. </p> \n
+    <p> WebSphere EJB query service is used to query entity beans, which are not available
+    on Liberty. </p> \n</div>"
   ruleID: DynamicQueryRule
   when:
     or:
@@ -348,9 +330,7 @@
   - name: I18nRule_0_packages
     nameOfCaptureGroup: I18nRule_0_packages
     pattern: (?P<I18nRule_0_packages>(com.ibm.websphere.i18n.context\.[^.]+|com.ibm.wsspi.i18n.context.util\.[^.]+))
-  description: |-
-    The WebSphere i18n APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere i18n APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.i18n.context</code></li>. <li><code>com.ibm.wsspi.i18n.context.util</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere i18n APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -358,18 +338,17 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere i18n APIs and SPIs are
-    not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.i18n.context</code></li>.
-    <li><code>com.ibm.wsspi.i18n.context.util</code></li>. </ul>. <p>You must modify
-    the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere i18n APIs and SPIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.i18n.context</code></li>
+    \n <li><code>com.ibm.wsspi.i18n.context.util</code></li> \n </ul> \n <p>You must
+    modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: I18nRule
   when:
     java.referenced:
       pattern: (com.ibm.websphere.i18n.context*|com.ibm.wsspi.i18n.context.util*)
 - category: optional
   customVariables: []
-  description: |
-    Review use of the javax.activation.DataHandler object
+  description: Review use of the javax.activation.DataHandler object
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -377,25 +356,25 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> On Liberty, each DataHandler object can be written
-    to an output stream only once. Writing a DataHandler object to an OutputStream
+  message: "<div class=\"Text\"> \n <p> On Liberty, each DataHandler object can be
+    written to an output stream only once. Writing a DataHandler object to an OutputStream
     object more than once results in an empty file. After you call the <code>javax.activation.DataHandler.writeTo(OutputStream)</code>
     method, you cannot pass the DataHandler object to another method, return it, or
-    store it for later use. </p>. <p> As a workaround, you can create a new DataHandler
+    store it for later use. </p> \n <p> As a workaround, you can create a new DataHandler
     object and initialize the DataHandler object with the content that was already
     retrieved from the existing DataHandler object using the <code>writeTo</code>
-    method. For example: </p>. <table class="code">. <tbody>. <tr>. <td> <span class="Code">
-    <span class="JavaType">File</span> f = <span class="JavaKeyword">new</span> File("received_image");<br>
-    <span class="JavaKeyword">if</span> (f.exists()) {{<br> <span class="indent"></span>f.delete();<br>
-    }}<br> <br> <span class="JavaType">FileOutputStream</span> fos = <span class="JavaKeyword">new</span>
-    FileOutputStream(f);<br> <br> // Write the DataHandler object to the output stream.<br>
-    img_in.writeTo(fos);<br> <br> // Create a new DataHandler object and initialize
-    it with<br> // the content that was retrieved using the writeTo method above.<br>
-    <br> <span class="JavaType">FileDataSource</span> fos_out = <span class="JavaKeyword">new</span>
-    FileDataSource(f);<br> <br> <span class="JavaType">DataHandler</span> img_out
-    = <span class="JavaKeyword">new</span> DataHandler(fos_out);<br> <br> <br> <span
-    class="JavaKeyword">return</span> img_out; </span> </td>. </tr>. </tbody>. </table>.
-    </div>'
+    method. For example: </p> \n <table class=\"code\"> \n <tbody>\n <tr> \n <td>
+    <span class=\"Code\"> <span class=\"JavaType\">File</span> f = <span class=\"JavaKeyword\">new</span>
+    File(\"received_image\");<br> <span class=\"JavaKeyword\">if</span> (f.exists())
+    {{<br> <span class=\"indent\"></span>f.delete();<br> }}<br> <br> <span class=\"JavaType\">FileOutputStream</span>
+    fos = <span class=\"JavaKeyword\">new</span> FileOutputStream(f);<br> <br> //
+    Write the DataHandler object to the output stream.<br> img_in.writeTo(fos);<br>
+    <br> // Create a new DataHandler object and initialize it with<br> // the content
+    that was retrieved using the writeTo method above.<br> <br> <span class=\"JavaType\">FileDataSource</span>
+    fos_out = <span class=\"JavaKeyword\">new</span> FileDataSource(f);<br> <br> <span
+    class=\"JavaType\">DataHandler</span> img_out = <span class=\"JavaKeyword\">new</span>
+    DataHandler(fos_out);<br> <br> <br> <span class=\"JavaKeyword\">return</span>
+    img_out; </span> </td>\n </tr>\n </tbody>\n </table> \n</div>"
   ruleID: MTOMRule
   when:
     java.referenced:
@@ -403,9 +382,7 @@
       pattern: javax.activation.DataHandler.writeTo(java.io.OutputStream)
 - category: mandatory
   customVariables: []
-  description: |-
-    Getting the server name on Liberty
-    <div class="Text">. <p> This rule flags references to the following methods: </p>. <ul>. <li><code>com.ibm.websphere.management.AdminService.getProcessName()</code></li>. <li><code>com.ibm.ejs.ras.RasHelper.getServerName()</code></li>. <li><code>com.ibm.websphere.runtime.ServerName.getDisplayName()</code></li>. <li><code>com.ibm.websphere.runtime.ServerName.getFullName()</code></li>. </ul>. <p> These methods are not available on Liberty. </p>. <p> The source scanner has a quick fix to change any reference to the methods mentioned earlier to <code>java.lang.System.getProperty("wlp.server.name")</code> which retrieves the name of your Liberty server. This solution does not work on WebSphere Application Server traditional. </p>. <p> For alternative solutions, see the <a href="https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961'); return false;"> Programmatic access to location properties</a> section in the Knowledge Center. </p>. </div>
+  description: Getting the server name on Liberty
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -413,18 +390,18 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> This rule flags references to the following methods:
-    </p>. <ul>. <li><code>com.ibm.websphere.management.AdminService.getProcessName()</code></li>.
-    <li><code>com.ibm.ejs.ras.RasHelper.getServerName()</code></li>. <li><code>com.ibm.websphere.runtime.ServerName.getDisplayName()</code></li>.
-    <li><code>com.ibm.websphere.runtime.ServerName.getFullName()</code></li>. </ul>.
-    <p> These methods are not available on Liberty. </p>. <p> The source scanner has
-    a quick fix to change any reference to the methods mentioned earlier to <code>java.lang.System.getProperty("wlp.server.name")</code>
-    which retrieves the name of your Liberty server. This solution does not work on
-    WebSphere Application Server traditional. </p>. <p> For alternative solutions,
-    see the <a href="https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961'');
-    return false;"> Programmatic access to location properties</a> section in the
-    Knowledge Center. </p>. </div>'
+  message: "<div class=\"Text\"> \n <p> This rule flags references to the following
+    methods: </p> \n <ul> \n <li><code>com.ibm.websphere.management.AdminService.getProcessName()</code></li>
+    \n <li><code>com.ibm.ejs.ras.RasHelper.getServerName()</code></li> \n <li><code>com.ibm.websphere.runtime.ServerName.getDisplayName()</code></li>
+    \n <li><code>com.ibm.websphere.runtime.ServerName.getFullName()</code></li> \n
+    </ul> \n <p> These methods are not available on Liberty. </p> \n <p> The source
+    scanner has a quick fix to change any reference to the methods mentioned earlier
+    to <code>java.lang.System.getProperty(\"wlp.server.name\")</code> which retrieves
+    the name of your Liberty server. This solution does not work on WebSphere Application
+    Server traditional. </p>\n <p> For alternative solutions, see the <a href=\"https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSEQTP_liberty/com.ibm.websphere.wlp.nd.multiplatform.doc/ae/rwlp_dirs.html#d132906e961');
+    return false;\"> Programmatic access to location properties</a> section in the
+    Knowledge Center. </p> \n</div>"
   ruleID: ServerName
   when:
     or:
@@ -439,9 +416,7 @@
         pattern: com.ibm.websphere.runtime.ServerName.(getDisplayName|getFullName)*
 - category: mandatory
   customVariables: []
-  description: |-
-    SOAP over Java Message Service (JMS) is unavailable
-    <div class="Text">. <p> Liberty does not support Simple Object Access Protocol (SOAP) over Java Message Service (JMS). References to the following namespaces indicate usage of SOAP over JMS: </p>. <ul>. <li>http://www.w3.org/2010/soapjms/</li>. <li>http://www.w3.org/2010/soapjms/soap1.1</li>. <li>http://www.w3.org/2010/soapjms/soap1.2</li>. </ul> This rule flags the following items:. <p></p>. <ul>. <li><code>javax.xml.ws.BindingType</code> annotations with a <code>value</code> attribute that references one of the described namespaces</li>. <li>WSDL files with a <code>transport</code> attribute on the <span class="XmlDefinition">&lt;binding&gt;</span> element that references one of the described namespaces</li>. </ul>. </div>
+  description: SOAP over Java Message Service (JMS) is unavailable
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -449,15 +424,15 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> Liberty does not support Simple Object Access
+  message: "<div class=\"Text\"> \n <p> Liberty does not support Simple Object Access
     Protocol (SOAP) over Java Message Service (JMS). References to the following namespaces
-    indicate usage of SOAP over JMS: </p>. <ul>. <li>http://www.w3.org/2010/soapjms/</li>.
-    <li>http://www.w3.org/2010/soapjms/soap1.1</li>. <li>http://www.w3.org/2010/soapjms/soap1.2</li>.
-    </ul> This rule flags the following items:. <p></p>. <ul>. <li><code>javax.xml.ws.BindingType</code>
+    indicate usage of SOAP over JMS: </p> \n <ul> \n <li>http://www.w3.org/2010/soapjms/</li>
+    \n <li>http://www.w3.org/2010/soapjms/soap1.1</li> \n <li>http://www.w3.org/2010/soapjms/soap1.2</li>
+    \n </ul> This rule flags the following items: \n <p></p> \n <ul> \n <li><code>javax.xml.ws.BindingType</code>
     annotations with a <code>value</code> attribute that references one of the described
-    namespaces</li>. <li>WSDL files with a <code>transport</code> attribute on the
-    <span class="XmlDefinition">&lt;binding&gt;</span> element that references one
-    of the described namespaces</li>. </ul>. </div>'
+    namespaces</li> \n <li>WSDL files with a <code>transport</code> attribute on the
+    <span class=\"XmlDefinition\">&lt;binding&gt;</span> element that references one
+    of the described namespaces</li> \n </ul> \n</div>"
   ruleID: SOAPOverJMSRule
   when:
     or:
@@ -471,9 +446,7 @@
         xpath: //*[local-name()='binding']/@transport[matches(self::node(), '.*/soapjms(/.*)?')]
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Startup Beans Service API was superseded by a newer implementation
-    <div class="Text">. <p> The WebSphere startup bean service was superseded by the startup beans in Enterprise JavaBeans (EJB) 3.1. The service is deprecated in WebSphere Application Server traditional V8.0 and is not available on Liberty. </p>. <p> This rule flags Java code that has references to the <code>com.ibm.websphere.startupservice</code> package. </p>. <p> For information about EJB 3.1 startup beans, see the following resources: </p>. <ul>. <li> <a href="https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html'); return false;"> Using startup beans</a> IBM knowledge center documentation </li>. <li> <a href="http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html" title="Opens a new window" onclick="javascript:helpWindow('http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html'); return false;"> javax.ejb.Startup</a> annotation Java documentation </li>. <li> <a href="http://www.redbooks.ibm.com/abstracts/redp4885.html" title="Opens a new window" onclick="javascript:helpWindow('http://www.redbooks.ibm.com/abstracts/redp4885.html'); return false;"> Developing Enterprise JavaBeans Applications</a> Redpaper </li>. </ul>. </div>
+  description: The WebSphere Startup Beans Service API was superseded by a newer implementation
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -481,21 +454,21 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The WebSphere startup bean service was superseded
+  message: "<div class=\"Text\"> \n <p> The WebSphere startup bean service was superseded
     by the startup beans in Enterprise JavaBeans (EJB) 3.1. The service is deprecated
     in WebSphere Application Server traditional V8.0 and is not available on Liberty.
-    </p>. <p> This rule flags Java code that has references to the <code>com.ibm.websphere.startupservice</code>
-    package. </p>. <p> For information about EJB 3.1 startup beans, see the following
-    resources: </p>. <ul>. <li> <a href="https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html'');
-    return false;"> Using startup beans</a> IBM knowledge center documentation </li>.
-    <li> <a href="http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html" title="Opens
-    a new window" onclick="javascript:helpWindow(''http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html'');
-    return false;"> javax.ejb.Startup</a> annotation Java documentation </li>. <li>
-    <a href="http://www.redbooks.ibm.com/abstracts/redp4885.html" title="Opens a new
-    window" onclick="javascript:helpWindow(''http://www.redbooks.ibm.com/abstracts/redp4885.html'');
-    return false;"> Developing Enterprise JavaBeans Applications</a> Redpaper </li>.
-    </ul>. </div>'
+    </p> \n <p> This rule flags Java code that has references to the <code>com.ibm.websphere.startupservice</code>
+    package. </p> \n <p> For information about EJB 3.1 startup beans, see the following
+    resources: </p> \n <ul> \n <li> <a href=\"https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/en/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/asyncbns/tasks/tasb_confstb.html');
+    return false;\"> Using startup beans</a> IBM knowledge center documentation </li>
+    \n <li> <a href=\"http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html');
+    return false;\"> javax.ejb.Startup</a> annotation Java documentation </li> \n
+    <li> <a href=\"http://www.redbooks.ibm.com/abstracts/redp4885.html\" title=\"Opens
+    a new window\" onclick=\"javascript:helpWindow('http://www.redbooks.ibm.com/abstracts/redp4885.html');
+    return false;\"> Developing Enterprise JavaBeans Applications</a> Redpaper </li>
+    \n </ul> \n</div>"
   ruleID: StartupBeanRule
   when:
     or:
@@ -513,9 +486,7 @@
   - name: WebSphereSdoRule_0_packages
     nameOfCaptureGroup: WebSphereSdoRule_0_packages
     pattern: (?P<WebSphereSdoRule_0_packages>(com.ibm.websphere.sdo*\.[^.]+|com.ibm.websphere.sdox*\.[^.]+))
-  description: |-
-    The WebSphere Service Data Objects (SDO) APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Service Data Objects (SDO) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.sdo</code></li>. <li><code>com.ibm.websphere.sdox</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Service Data Objects (SDO) APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -523,19 +494,17 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Service Data Objects (SDO)
-    APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.sdo</code></li>.
-    <li><code>com.ibm.websphere.sdox</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Service Data Objects
+    (SDO) APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.sdo</code></li>
+    \n <li><code>com.ibm.websphere.sdox</code></li> \n </ul> \n <p>You must modify
+    the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereSdoRule
   when:
     java.referenced:
       pattern: (com.ibm.websphere.sdo*|com.ibm.websphere.sdox*)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Scheduler API was superseded by a newer implementation
-    <div class="Text">. <p> The WebSphere Scheduler API was superseded by Enterprise JavaBeans Persistent Timers 3.2, which is enabled by the ejbPersistentTimer-3.2 Liberty feature. </p>. <p> This rule flags references to the <code>com.ibm.websphere.scheduler</code> package because it is not available on Liberty. </p>. <p> For information about the Enterprise JavaBeans Persistent Timers feature, see the link below. </div>
+  description: The WebSphere Scheduler API was superseded by a newer implementation
   effort: 5
   labels:
   - konveyor.io/source=websphere
@@ -545,11 +514,11 @@
     url: https://www.ibm.com/docs/en/was-liberty/nd?topic=features-enterprise-javabeans-persistent-timers-32
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> The WebSphere Scheduler API was superseded by Enterprise
-    JavaBeans Persistent Timers 3.2, which is enabled by the ejbPersistentTimer-3.2
-    Liberty feature. </p>. <p> This rule flags references to the <code>com.ibm.websphere.scheduler</code>
-    package because it is not available on Liberty. </p>. <p> For information about
-    the Enterprise JavaBeans Persistent Timers feature, see the link below. </div>
+  message: "<div class=\"Text\"> \n <p> The WebSphere Scheduler API was superseded
+    by Enterprise JavaBeans Persistent Timers 3.2, which is enabled by the ejbPersistentTimer-3.2
+    Liberty feature. </p> \n <p> This rule flags references to the <code>com.ibm.websphere.scheduler</code>
+    package because it is not available on Liberty. </p> \n <p> For information about
+    the Enterprise JavaBeans Persistent Timers feature, see the link below \n</div>"
   ruleID: WebSphereSchedulerRule
   when:
     or:
@@ -564,9 +533,7 @@
           'com\.ibm\.websphere\.scheduler\..*')]
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Servlet API was superseded by a newer implementation
-    <div class="Text">. <p> The WebSphere Servlet API was superseded by standard Servlet 3.0 functionality. </p>. <p> This rule flags Java code that has references to the following classes and packages because they are not available on Liberty. </p>. <ul>. <li><code>com.ibm.servlet.ClientList</code></li>. <li><code>com.ibm.servlet.ClientListElement</code></li>. <li><code>com.ibm.servlet.MLNotFoundException</code></li>. <li><code>com.ibm.servlet.PageListServlet</code></li>. <li><code>com.ibm.servlet.PageNotFoundException</code></li>. <li><code>com.ibm.websphere.servlet.filter.ChainedRequest</code></li>. <li><code>com.ibm.websphere.servlet.filter.ChainedResponse</code></li>. <li><code>com.ibm.websphere.servlet.filter.ChainerServlet</code></li>. <li><code>com.ibm.websphere.servlet.filter.ServletChain</code></li>. <li><code>com.ibm.websphere.servlet.response.IResponse</code></li>. <li><code>com.ibm.websphere.servlet.response.StoredResponseCompat</code></li>. <li><code>com.ibm.websphere.servlet.response.HttpServletResponseProxy</code></li>. <li><code>com.ibm.websphere.servlet.response.ResponseUtils</code></li>. <li><code>com.ibm.websphere.servlet.response.ServletOutputStreamAdapter</code></li>. <li><code>com.ibm.websphere.servlet.response.ResponseErrorReport</code></li>. <li><code>com.ibm.websphere.servlet.request</code></li>. <li><code>com.ibm.websphere.webcontainer.async</code></li>. </ul>. <p> For information about the Java EE Servlet APIs, see the <a href="http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html" title="Opens a new window" onclick="javascript:helpWindow('http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html'); return false;"> javax.servlet</a> package Java documentation. </p>. <p> For information about the WebSphere Servlet APIs, see the <a href="http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html" title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html'); return false;"> IBM WebSphere Application Server, Release 8.5 API Specification</a>. </p>. </div>
+  description: The WebSphere Servlet API was superseded by a newer implementation
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -574,26 +541,26 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> The WebSphere Servlet API was superseded by standard
-    Servlet 3.0 functionality. </p>. <p> This rule flags Java code that has references
-    to the following classes and packages because they are not available on Liberty.
-    </p>. <ul>. <li><code>com.ibm.servlet.ClientList</code></li>. <li><code>com.ibm.servlet.ClientListElement</code></li>.
-    <li><code>com.ibm.servlet.MLNotFoundException</code></li>. <li><code>com.ibm.servlet.PageListServlet</code></li>.
-    <li><code>com.ibm.servlet.PageNotFoundException</code></li>. <li><code>com.ibm.websphere.servlet.filter.ChainedRequest</code></li>.
-    <li><code>com.ibm.websphere.servlet.filter.ChainedResponse</code></li>. <li><code>com.ibm.websphere.servlet.filter.ChainerServlet</code></li>.
-    <li><code>com.ibm.websphere.servlet.filter.ServletChain</code></li>. <li><code>com.ibm.websphere.servlet.response.IResponse</code></li>.
-    <li><code>com.ibm.websphere.servlet.response.StoredResponseCompat</code></li>.
-    <li><code>com.ibm.websphere.servlet.response.HttpServletResponseProxy</code></li>.
-    <li><code>com.ibm.websphere.servlet.response.ResponseUtils</code></li>. <li><code>com.ibm.websphere.servlet.response.ServletOutputStreamAdapter</code></li>.
-    <li><code>com.ibm.websphere.servlet.response.ResponseErrorReport</code></li>.
-    <li><code>com.ibm.websphere.servlet.request</code></li>. <li><code>com.ibm.websphere.webcontainer.async</code></li>.
-    </ul>. <p> For information about the Java EE Servlet APIs, see the <a href="http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html"
-    title="Opens a new window" onclick="javascript:helpWindow('http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html');
-    return false;"> javax.servlet</a> package Java documentation. </p>. <p> For information
-    about the WebSphere Servlet APIs, see the <a href="http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html"
-    title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html');
-    return false;"> IBM WebSphere Application Server, Release 8.5 API Specification</a>.
-    </p>. </div>
+  message: "<div class=\"Text\"> \n <p> The WebSphere Servlet API was superseded by
+    standard Servlet 3.0 functionality. </p> \n <p> This rule flags Java code that
+    has references to the following classes and packages because they are not available
+    on Liberty. </p>\n <ul> \n <li><code>com.ibm.servlet.ClientList</code></li> \n
+    <li><code>com.ibm.servlet.ClientListElement</code></li> \n <li><code>com.ibm.servlet.MLNotFoundException</code></li>
+    \n <li><code>com.ibm.servlet.PageListServlet</code></li> \n <li><code>com.ibm.servlet.PageNotFoundException</code></li>
+    \n <li><code>com.ibm.websphere.servlet.filter.ChainedRequest</code></li> \n <li><code>com.ibm.websphere.servlet.filter.ChainedResponse</code></li>
+    \n <li><code>com.ibm.websphere.servlet.filter.ChainerServlet</code></li> \n <li><code>com.ibm.websphere.servlet.filter.ServletChain</code></li>
+    \n <li><code>com.ibm.websphere.servlet.response.IResponse</code></li> \n <li><code>com.ibm.websphere.servlet.response.StoredResponseCompat</code></li>
+    \n <li><code>com.ibm.websphere.servlet.response.HttpServletResponseProxy</code></li>
+    \n <li><code>com.ibm.websphere.servlet.response.ResponseUtils</code></li> \n <li><code>com.ibm.websphere.servlet.response.ServletOutputStreamAdapter</code></li>
+    \n <li><code>com.ibm.websphere.servlet.response.ResponseErrorReport</code></li>
+    \n <li><code>com.ibm.websphere.servlet.request</code></li> \n <li><code>com.ibm.websphere.webcontainer.async</code></li>
+    \n </ul> \n <p> For information about the Java EE Servlet APIs, see the <a href=\"http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://docs.oracle.com/javaee/6/api/?javax/servlet/package-summary.html');
+    return false;\"> javax.servlet</a> package Java documentation. </p> \n <p> For
+    information about the WebSphere Servlet APIs, see the <a href=\"http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/overview-summary.html');
+    return false;\"> IBM WebSphere Application Server, Release 8.5 API Specification</a>.
+    </p> \n</div>"
   ruleID: WebSphereServletRule
   when:
     or:
@@ -606,9 +573,7 @@
   - name: WebSphereUnavailableAPIsAppClient_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsAppClient_0_packages
     pattern: (?P<WebSphereUnavailableAPIsAppClient_0_packages>com.ibm.websphere.client.applicationclient\.[^.]+)
-  description: |-
-    The WebSphere Application Client APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Application Client APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.client.applicationclient</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Application Client APIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -616,10 +581,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Application Client APIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.client.applicationclient</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Application Client
+    APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.client.applicationclient</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsAppClient
   when:
     java.referenced:
@@ -630,9 +595,7 @@
   - name: WebSphereUnavailableAPIsConnectorArchitecture_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsConnectorArchitecture_0_packages
     pattern: (?P<WebSphereUnavailableAPIsConnectorArchitecture_0_packages>com.ibm.websphere.j2c\.[^.]+)
-  description: |-
-    The WebSphere Connector Architecture APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Connector Architecture APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.j2c</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Connector Architecture APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -640,10 +603,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Connector Architecture
-    APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.j2c</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Connector Architecture
+    APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.j2c</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsConnectorArchitecture
   when:
     java.referenced:
@@ -654,9 +617,7 @@
   - name: WebSphereUnavailableAPIsEnterpriseJavaBeans_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsEnterpriseJavaBeans_0_packages
     pattern: (?P<WebSphereUnavailableAPIsEnterpriseJavaBeans_0_packages>(com.ibm.websphere.ejbcontainer*\.[^.]+|com.ibm.websphere.ejbpersistence*\.[^.]+|com.ibm.wsspi.ejbpersistence\.[^.]+|com.ibm.websphere.csi\.[^.]+))
-  description: |-
-    The WebSphere Enterprise JavaBeans APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Enterprise JavaBeans APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ejbcontainer</code></li>. <li><code>com.ibm.websphere.ejbpersistence</code></li>. <li><code>com.ibm.websphere.csi</code></li>. <li><code>com.ibm.wsspi.ejbpersistence</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Enterprise JavaBeans APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -664,20 +625,18 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Enterprise JavaBeans APIs
-    and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ejbcontainer</code></li>.
-    <li><code>com.ibm.websphere.ejbpersistence</code></li>. <li><code>com.ibm.websphere.csi</code></li>.
-    <li><code>com.ibm.wsspi.ejbpersistence</code></li>. </ul>. <p>You must modify
-    the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Enterprise JavaBeans
+    APIs and SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.ejbcontainer</code></li>
+    \n <li><code>com.ibm.websphere.ejbpersistence</code></li> \n <li><code>com.ibm.websphere.csi</code></li>
+    \n <li><code>com.ibm.wsspi.ejbpersistence</code></li> \n </ul> \n <p>You must
+    modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsEnterpriseJavaBeans
   when:
     java.referenced:
       pattern: (com.ibm.websphere.ejbcontainer*|com.ibm.websphere.ejbpersistence*|com.ibm.wsspi.ejbpersistence*|com.ibm.websphere.csi*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Some WebSphere Exception APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Exception APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.exception.DistributedEJBCreateException</code></li>. <li><code>com.ibm.websphere.exception.DistributedEJBRemoveException</code></li>. <li><code>com.ibm.ws.exception</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: Some WebSphere Exception APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -685,11 +644,11 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Exception APIs and SPIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.exception.DistributedEJBCreateException</code></li>.
-    <li><code>com.ibm.websphere.exception.DistributedEJBRemoveException</code></li>.
-    <li><code>com.ibm.ws.exception</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Exception APIs and
+    SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.exception.DistributedEJBCreateException</code></li>
+    \n <li><code>com.ibm.websphere.exception.DistributedEJBRemoveException</code></li>
+    \n <li><code>com.ibm.ws.exception</code></li> \n </ul> \n <p>You must modify the
+    application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsExceptions
   when:
     or:
@@ -700,9 +659,7 @@
         pattern: com.ibm.ws.exception*
 - category: mandatory
   customVariables: []
-  description: |-
-    The Extension Registry APIs are unavailable
-    <div class="Text">. <p> The following Extension Registry APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.workplace.extension</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The Extension Registry APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -710,10 +667,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following Extension Registry APIs are not
-    available on Liberty: </p>. <ul>. <li><code>com.ibm.workplace.extension</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following Extension Registry APIs are
+    not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.workplace.extension</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsExtensionRegistry
   when:
     java.referenced:
@@ -721,9 +678,7 @@
       pattern: com.ibm.workplace.extension*
 - category: mandatory
   customVariables: []
-  description: |-
-    The Integrated Solutions Console (ISC) APIs are unavailable
-    <div class="Text">. <p> The following Integrated Solutions Console (ISC) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.isc.api.platform</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The Integrated Solutions Console (ISC) APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -731,10 +686,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following Integrated Solutions Console (ISC)
-    APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.isc.api.platform</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following Integrated Solutions Console
+    (ISC) APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.isc.api.platform</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsISC
   when:
     java.referenced:
@@ -742,9 +697,7 @@
       pattern: com.ibm.isc.api.platform*
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere logging and RAS APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere logging and RAS APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.logging.RawTraceList</code></li>. <li><code>com.ibm.websphere.logging.RawTraceList$PatternLevel</code></li>. <li><code>com.ibm.websphere.logging.MessageConverter</code></li>. <li><code>com.ibm.websphere.logging.WsLevel</code></li>. <li><code>com.ibm.ejs.ras</code></li>. <li><code>com.ibm.ffdc</code></li>. <li><code>com.ibm.ras</code></li>. <li><code>com.ibm.websphere.als</code></li>. <li><code>com.ibm.websphere.logging.cbe</code></li>. <li><code>com.ibm.websphere.ras</code></li>. <li><code>com.ibm.wsspi.rasdiag</code></li>. <li><code>com.ibm.wsspi.xct</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere logging and RAS APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -752,15 +705,16 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere logging and RAS APIs and
-    SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.logging.RawTraceList</code></li>.
-    <li><code>com.ibm.websphere.logging.RawTraceList$PatternLevel</code></li>. <li><code>com.ibm.websphere.logging.MessageConverter</code></li>.
-    <li><code>com.ibm.websphere.logging.WsLevel</code></li>. <li><code>com.ibm.ejs.ras</code></li>.
-    <li><code>com.ibm.ffdc</code></li>. <li><code>com.ibm.ras</code></li>. <li><code>com.ibm.websphere.als</code></li>.
-    <li><code>com.ibm.websphere.logging.cbe</code></li>. <li><code>com.ibm.websphere.ras</code></li>.
-    <li><code>com.ibm.wsspi.rasdiag</code></li>. <li><code>com.ibm.wsspi.xct</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere logging and RAS APIs
+    and SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.logging.RawTraceList</code></li>
+    \n <li><code>com.ibm.websphere.logging.RawTraceList$PatternLevel</code></li> \n
+    <li><code>com.ibm.websphere.logging.MessageConverter</code></li> \n <li><code>com.ibm.websphere.logging.WsLevel</code></li>
+    \n <li><code>com.ibm.ejs.ras</code></li> \n <li><code>com.ibm.ffdc</code></li>
+    \n <li><code>com.ibm.ras</code></li> \n <li><code>com.ibm.websphere.als</code></li>
+    \n <li><code>com.ibm.websphere.logging.cbe</code></li> \n <li><code>com.ibm.websphere.ras</code></li>
+    \n <li><code>com.ibm.wsspi.rasdiag</code></li> \n <li><code>com.ibm.wsspi.xct</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsLoggingAndRAS
   when:
     or:
@@ -773,9 +727,7 @@
   - name: WebSphereUnavailableAPIsManagement_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsManagement_0_packages
     pattern: (?P<WebSphereUnavailableAPIsManagement_0_packages>(com.ibm.websphere.ant.tasks*\.[^.]+|com.ibm.websphere.hamanager.jmx*\.[^.]+|com.ibm.websphere.interrupt*\.[^.]+|com.ibm.websphere.management*\.[^.]+|com.ibm.websphere.naming*\.[^.]+|com.ibm.websphere.product*\.[^.]+|com.ibm.wsspi.management.metadata\.[^.]+))
-  description: |-
-    The WebSphere Management APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Management APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ant.tasks</code></li>. <li><code>com.ibm.websphere.hamanager.jmx</code></li>. <li><code>com.ibm.websphere.interrupt</code></li>. <li><code>com.ibm.websphere.management</code></li>. <li><code>com.ibm.websphere.naming</code></li>. <li><code>com.ibm.websphere.product</code></li>. <li><code>com.ibm.wsspi.management.metadata</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Management APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -783,13 +735,13 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Management APIs and SPIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ant.tasks</code></li>.
-    <li><code>com.ibm.websphere.hamanager.jmx</code></li>. <li><code>com.ibm.websphere.interrupt</code></li>.
-    <li><code>com.ibm.websphere.management</code></li>. <li><code>com.ibm.websphere.naming</code></li>.
-    <li><code>com.ibm.websphere.product</code></li>. <li><code>com.ibm.wsspi.management.metadata</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Management APIs and
+    SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.ant.tasks</code></li>
+    \n <li><code>com.ibm.websphere.hamanager.jmx</code></li> \n <li><code>com.ibm.websphere.interrupt</code></li>
+    \n <li><code>com.ibm.websphere.management</code></li> \n <li><code>com.ibm.websphere.naming</code></li>
+    \n <li><code>com.ibm.websphere.product</code></li> \n <li><code>com.ibm.wsspi.management.metadata</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsManagement
   when:
     java.referenced:
@@ -799,9 +751,7 @@
   - name: WebSphereUnavailableAPIsORB_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsORB_0_packages
     pattern: (?P<WebSphereUnavailableAPIsORB_0_packages>(com.ibm.websphere.orbext*\.[^.]+|com.ibm.ejs.oa.EJSORB*\.[^.]+))
-  description: |-
-    The WebSphere ORB Extensions APIs are unavailable
-    <div class="Text">. <p> The following WebSphere ORB Extensions APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.orbext</code></li>. <li><code>com.ibm.ejs.oa.EJSORB</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere ORB Extensions APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -809,10 +759,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere ORB Extensions APIs are
-    not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.orbext</code></li>.
-    <li><code>com.ibm.ejs.oa.EJSORB</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere ORB Extensions APIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.orbext</code></li>
+    \n <li><code>com.ibm.ejs.oa.EJSORB</code></li> \n </ul> \n <p>You must modify
+    the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsORB
   when:
     java.referenced:
@@ -822,9 +772,8 @@
   - name: WebSphereUnavailableAPIsPMI_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsPMI_0_packages
     pattern: (?P<WebSphereUnavailableAPIsPMI_0_packages>(com.ibm.websphere.pmi*\.[^.]+|com.ibm.wsspi.pmi*\.[^.]+|com.ibm.ws.pmi.server\.[^.]+|com.ibm.ws.performance.tuning.rule\.[^.]+))
-  description: |-
-    The WebSphere Performance Monitoring Infrastructure (PMI) APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Performance Monitoring Infrastructure (PMI) APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.pmi</code></li>. <li><code>com.ibm.wsspi.pmi</code></li>. <li><code>com.ibm.ws.performance.tuning.rule</code></li>. <li><code>com.ibm.ws.pmi.server</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Performance Monitoring Infrastructure (PMI) APIs and
+    SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -832,20 +781,19 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Performance Monitoring
-    Infrastructure (PMI) APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.pmi</code></li>.
-    <li><code>com.ibm.wsspi.pmi</code></li>. <li><code>com.ibm.ws.performance.tuning.rule</code></li>.
-    <li><code>com.ibm.ws.pmi.server</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Performance Monitoring
+    Infrastructure (PMI) APIs and SPIs are not available on Liberty: </p> \n <ul>
+    \n <li><code>com.ibm.websphere.pmi</code></li> \n <li><code>com.ibm.wsspi.pmi</code></li>
+    \n <li><code>com.ibm.ws.performance.tuning.rule</code></li> \n <li><code>com.ibm.ws.pmi.server</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsPMI
   when:
     java.referenced:
       pattern: (com.ibm.websphere.pmi*|com.ibm.wsspi.pmi*|com.ibm.ws.pmi.server*|com.ibm.ws.performance.tuning.rule*)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Portal APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Portal APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.portal</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Portal APIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -853,9 +801,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Portal APIs are not available
-    on Liberty: </p>. <ul>. <li><code>com.ibm.portal</code></li>. </ul>. <p>You must
-    modify the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Portal APIs are not
+    available on Liberty: </p> \n <ul> \n <li><code>com.ibm.portal</code></li> \n
+    </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsPortal
   when:
     java.referenced:
@@ -866,9 +815,7 @@
   - name: WebSphereUnavailableAPIsResourceAdapter_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsResourceAdapter_0_packages
     pattern: (?P<WebSphereUnavailableAPIsResourceAdapter_0_packages>(com.ibm.websphere.rsadapter*\.[^.]+|com.ibm.wsspi.rsadapter\.[^.]+|com.ibm.wsspi.rawrapper\.[^.]+))
-  description: |-
-    The WebSphere Resource Adapter APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Resource Adapter APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.rsadapter</code></li>. <li><code>com.ibm.wsspi.rsadapter</code></li>. <li><code>com.ibm.wsspi.rawrapper</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Resource Adapter APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -876,20 +823,18 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Resource Adapter APIs
-    and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.rsadapter</code></li>.
-    <li><code>com.ibm.wsspi.rsadapter</code></li>. <li><code>com.ibm.wsspi.rawrapper</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Resource Adapter APIs
+    and SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.rsadapter</code></li>
+    \n <li><code>com.ibm.wsspi.rsadapter</code></li> \n <li><code>com.ibm.wsspi.rawrapper</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsResourceAdapter
   when:
     java.referenced:
       pattern: (com.ibm.websphere.rsadapter*|com.ibm.wsspi.rsadapter*|com.ibm.wsspi.rawrapper*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Some WebSphere Security APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Security APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.crypto.KeyGenerator</code></li>. <li><code>com.ibm.websphere.crypto.KeyPair</code></li>. <li><code>com.ibm.websphere.crypto.KeyPairGenerator</code></li>. <li><code>com.ibm.websphere.crypto.KeySetHelper</code></li>. <li><code>com.ibm.websphere.security.auth.WSPrincipal</code></li>. <li><code>com.ibm.websphere.security.auth.IdentityPrincipal</code></li>. <li><code>com.ibm.websphere.security.auth.MappingAuthData</code></li>. <li><code>com.ibm.websphere.security.auth.AuthenticationFailedException</code></li>. <li><code>com.ibm.websphere.security.auth.AuthenticationNotSupportedException</code></li>. <li><code>com.ibm.websphere.security.auth.MapCredentialFailedException</code></li>. <li><code>com.ibm.websphere.security.auth.MapCredentialNotSupportedException</code></li>. <li><code>com.ibm.websphere.security.auth.UnsupportedRealmException</code></li>. <li><code>com.ibm.websphere.security.auth.ValidationFailedException</code></li>. <li><code>com.ibm.websphere.security.auth.ValidationNotSupportedException</code></li>. <li><code>com.ibm.websphere.security.auth.callback.NonPromptCallbackHandler</code></li>. <li><code>com.ibm.websphere.security.auth.callback.WSCcacheCallBackHandlerImpl</code></li>. <li><code>com.ibm.websphere.security.auth.callback.WSGUICallbackHandlerImpl</code></li>. <li><code>com.ibm.websphere.security.auth.callback.WSStdinCallbackHandlerImpl</code></li>. <li><code>com.ibm.websphere.security.DistributedUserMappingFailedException</code></li>. <li><code>com.ibm.websphere.security.oidc.util</code></li>. <li><code>com.ibm.websphere.security.ProviderFailureException</code></li>. <li><code>com.ibm.websphere.security.SAFRoleMapper</code></li>. <li><code>com.ibm.websphere.security.TrustAssociationInterceptor</code></li>. <li><code>com.ibm.websphere.security.UserMapping</code></li>. <li><code>com.ibm.websphere.security.UserMappingException</code></li>. <li><code>com.ibm.websphere.security.WebSphereBaseTrustAssociationInterceptor</code></li>. <li><code>com.ibm.websphere.ssl.protocol</code></li>. <li><code>com.ibm.ws.security.core.SecurityContext</code></li>. <li><code>com.ibm.ws.security.util.LoginHelper</code></li>. <li><code>com.ibm.ws.security.util.ByteArray</code></li>. <li><code>com.ibm.wsspi.security.audit</code></li>. <li><code>com.ibm.wsspi.security.auth.callback.WSIdentityCallback</code></li>. <li><code>com.ibm.wsspi.security.auth.callback.WSMappingCallbackHandlerFactory</code></li>. <li><code>com.ibm.wsspi.security.auth.callback.WSProtocolPolicyCallback</code></li>. <li><code>com.ibm.wsspi.security.auth.callback.WSTokenHolderCallback</code></li>. <li><code>com.ibm.wsspi.security.auth.WSSubjectWrapper</code></li>. <li><code>com.ibm.wsspi.security.authorization</code></li>. <li><code>com.ibm.wsspi.security.context</code></li>. <li><code>com.ibm.wsspi.security.crypto.aes</code></li>. <li><code>com.ibm.wsspi.security.csiv2</code></li>. <li><code>com.ibm.wsspi.security.ltpa</code></li>. <li><code>com.ibm.wsspi.security.policy</code></li>. <li><code>com.ibm.wsspi.security.securitydomain</code></li>. <li><code>com.ibm.wsspi.security.spnego</code></li>. <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptor</code></li>. <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptorImpl</code></li>. <li><code>com.ibm.wsspi.security.tai.TrustAssociationInterceptorExt</code></li>. <li><code>com.ibm.wsspi.security.token.AuthenticationToken</code></li>. <li><code>com.ibm.wsspi.security.token.AuthorizationToken</code></li>. <li><code>com.ibm.wsspi.security.token.KerberosToken</code></li>. <li><code>com.ibm.wsspi.security.token.PropagationToken</code></li>. <li><code>com.ibm.wsspi.security.token.TokenHolder</code></li>. <li><code>com.ibm.wsspi.security.token.WSOpaqueTokenHelper</code></li>. <li><code>com.ibm.wsspi.security.web.saml</code></li>. <li><code>com.ibm.wsspi.ssl.RetrieveSignersHelper</code></li>. <li><code>com.ibm.wsspi.ssl.WSPKIClient</code></li>. <li><code>com.ibm.IExtendedSecurity</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: Some WebSphere Security APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -897,47 +842,47 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Security APIs and SPIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.crypto.KeyGenerator</code></li>.
-    <li><code>com.ibm.websphere.crypto.KeyPair</code></li>. <li><code>com.ibm.websphere.crypto.KeyPairGenerator</code></li>.
-    <li><code>com.ibm.websphere.crypto.KeySetHelper</code></li>. <li><code>com.ibm.websphere.security.auth.WSPrincipal</code></li>.
-    <li><code>com.ibm.websphere.security.auth.IdentityPrincipal</code></li>. <li><code>com.ibm.websphere.security.auth.MappingAuthData</code></li>.
-    <li><code>com.ibm.websphere.security.auth.AuthenticationFailedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.AuthenticationNotSupportedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.MapCredentialFailedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.MapCredentialNotSupportedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.UnsupportedRealmException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.ValidationFailedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.ValidationNotSupportedException</code></li>.
-    <li><code>com.ibm.websphere.security.auth.callback.NonPromptCallbackHandler</code></li>.
-    <li><code>com.ibm.websphere.security.auth.callback.WSCcacheCallBackHandlerImpl</code></li>.
-    <li><code>com.ibm.websphere.security.auth.callback.WSGUICallbackHandlerImpl</code></li>.
-    <li><code>com.ibm.websphere.security.auth.callback.WSStdinCallbackHandlerImpl</code></li>.
-    <li><code>com.ibm.websphere.security.DistributedUserMappingFailedException</code></li>.
-    <li><code>com.ibm.websphere.security.oidc.util</code></li>. <li><code>com.ibm.websphere.security.ProviderFailureException</code></li>.
-    <li><code>com.ibm.websphere.security.SAFRoleMapper</code></li>. <li><code>com.ibm.websphere.security.TrustAssociationInterceptor</code></li>.
-    <li><code>com.ibm.websphere.security.UserMapping</code></li>. <li><code>com.ibm.websphere.security.UserMappingException</code></li>.
-    <li><code>com.ibm.websphere.security.WebSphereBaseTrustAssociationInterceptor</code></li>.
-    <li><code>com.ibm.websphere.ssl.protocol</code></li>. <li><code>com.ibm.ws.security.core.SecurityContext</code></li>.
-    <li><code>com.ibm.ws.security.util.LoginHelper</code></li>. <li><code>com.ibm.ws.security.util.ByteArray</code></li>.
-    <li><code>com.ibm.wsspi.security.audit</code></li>. <li><code>com.ibm.wsspi.security.auth.callback.WSIdentityCallback</code></li>.
-    <li><code>com.ibm.wsspi.security.auth.callback.WSMappingCallbackHandlerFactory</code></li>.
-    <li><code>com.ibm.wsspi.security.auth.callback.WSProtocolPolicyCallback</code></li>.
-    <li><code>com.ibm.wsspi.security.auth.callback.WSTokenHolderCallback</code></li>.
-    <li><code>com.ibm.wsspi.security.auth.WSSubjectWrapper</code></li>. <li><code>com.ibm.wsspi.security.authorization</code></li>.
-    <li><code>com.ibm.wsspi.security.context</code></li>. <li><code>com.ibm.wsspi.security.crypto.aes</code></li>.
-    <li><code>com.ibm.wsspi.security.csiv2</code></li>. <li><code>com.ibm.wsspi.security.ltpa</code></li>.
-    <li><code>com.ibm.wsspi.security.policy</code></li>. <li><code>com.ibm.wsspi.security.securitydomain</code></li>.
-    <li><code>com.ibm.wsspi.security.spnego</code></li>. <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptor</code></li>.
-    <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptorImpl</code></li>.
-    <li><code>com.ibm.wsspi.security.tai.TrustAssociationInterceptorExt</code></li>.
-    <li><code>com.ibm.wsspi.security.token.AuthenticationToken</code></li>. <li><code>com.ibm.wsspi.security.token.AuthorizationToken</code></li>.
-    <li><code>com.ibm.wsspi.security.token.KerberosToken</code></li>. <li><code>com.ibm.wsspi.security.token.PropagationToken</code></li>.
-    <li><code>com.ibm.wsspi.security.token.TokenHolder</code></li>. <li><code>com.ibm.wsspi.security.token.WSOpaqueTokenHelper</code></li>.
-    <li><code>com.ibm.wsspi.security.web.saml</code></li>. <li><code>com.ibm.wsspi.ssl.RetrieveSignersHelper</code></li>.
-    <li><code>com.ibm.wsspi.ssl.WSPKIClient</code></li>. <li><code>com.ibm.IExtendedSecurity</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Security APIs and
+    SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.crypto.KeyGenerator</code></li>
+    \n <li><code>com.ibm.websphere.crypto.KeyPair</code></li> \n <li><code>com.ibm.websphere.crypto.KeyPairGenerator</code></li>
+    \n <li><code>com.ibm.websphere.crypto.KeySetHelper</code></li> \n <li><code>com.ibm.websphere.security.auth.WSPrincipal</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.IdentityPrincipal</code></li> \n
+    <li><code>com.ibm.websphere.security.auth.MappingAuthData</code></li> \n <li><code>com.ibm.websphere.security.auth.AuthenticationFailedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.AuthenticationNotSupportedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.MapCredentialFailedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.MapCredentialNotSupportedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.UnsupportedRealmException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.ValidationFailedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.ValidationNotSupportedException</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.callback.NonPromptCallbackHandler</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.callback.WSCcacheCallBackHandlerImpl</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.callback.WSGUICallbackHandlerImpl</code></li>
+    \n <li><code>com.ibm.websphere.security.auth.callback.WSStdinCallbackHandlerImpl</code></li>
+    \n <li><code>com.ibm.websphere.security.DistributedUserMappingFailedException</code></li>
+    \n <li><code>com.ibm.websphere.security.oidc.util</code></li> \n <li><code>com.ibm.websphere.security.ProviderFailureException</code></li>
+    \n <li><code>com.ibm.websphere.security.SAFRoleMapper</code></li> \n <li><code>com.ibm.websphere.security.TrustAssociationInterceptor</code></li>
+    \n <li><code>com.ibm.websphere.security.UserMapping</code></li> \n <li><code>com.ibm.websphere.security.UserMappingException</code></li>
+    \n <li><code>com.ibm.websphere.security.WebSphereBaseTrustAssociationInterceptor</code></li>
+    \n <li><code>com.ibm.websphere.ssl.protocol</code></li> \n <li><code>com.ibm.ws.security.core.SecurityContext</code></li>
+    \n <li><code>com.ibm.ws.security.util.LoginHelper</code></li> \n <li><code>com.ibm.ws.security.util.ByteArray</code></li>
+    \n <li><code>com.ibm.wsspi.security.audit</code></li> \n <li><code>com.ibm.wsspi.security.auth.callback.WSIdentityCallback</code></li>
+    \n <li><code>com.ibm.wsspi.security.auth.callback.WSMappingCallbackHandlerFactory</code></li>
+    \n <li><code>com.ibm.wsspi.security.auth.callback.WSProtocolPolicyCallback</code></li>
+    \n <li><code>com.ibm.wsspi.security.auth.callback.WSTokenHolderCallback</code></li>
+    \n <li><code>com.ibm.wsspi.security.auth.WSSubjectWrapper</code></li> \n <li><code>com.ibm.wsspi.security.authorization</code></li>
+    \n <li><code>com.ibm.wsspi.security.context</code></li> \n <li><code>com.ibm.wsspi.security.crypto.aes</code></li>
+    \n <li><code>com.ibm.wsspi.security.csiv2</code></li> \n <li><code>com.ibm.wsspi.security.ltpa</code></li>
+    \n <li><code>com.ibm.wsspi.security.policy</code></li> \n <li><code>com.ibm.wsspi.security.securitydomain</code></li>
+    \n <li><code>com.ibm.wsspi.security.spnego</code></li> \n <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptor</code></li>
+    \n <li><code>com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptorImpl</code></li>
+    \n <li><code>com.ibm.wsspi.security.tai.TrustAssociationInterceptorExt</code></li>
+    \n <li><code>com.ibm.wsspi.security.token.AuthenticationToken</code></li> \n <li><code>com.ibm.wsspi.security.token.AuthorizationToken</code></li>
+    \n <li><code>com.ibm.wsspi.security.token.KerberosToken</code></li> \n <li><code>com.ibm.wsspi.security.token.PropagationToken</code></li>
+    \n <li><code>com.ibm.wsspi.security.token.TokenHolder</code></li> \n <li><code>com.ibm.wsspi.security.token.WSOpaqueTokenHelper</code></li>
+    \n <li><code>com.ibm.wsspi.security.web.saml</code></li> \n <li><code>com.ibm.wsspi.ssl.RetrieveSignersHelper</code></li>
+    \n <li><code>com.ibm.wsspi.ssl.WSPKIClient</code></li> \n <li><code>com.ibm.IExtendedSecurity</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsSecurity
   when:
     or:
@@ -947,9 +892,7 @@
         pattern: (com.ibm.websphere.security.auth.WSPrincipal|com.ibm.websphere.security.auth.IdentityPrincipal|com.ibm.websphere.security.auth.MappingAuthData|com.ibm.websphere.security.auth.AuthenticationFailedException|com.ibm.websphere.security.auth.AuthenticationNotSupportedException|com.ibm.websphere.security.auth.MapCredentialFailedException|com.ibm.websphere.security.auth.MapCredentialNotSupportedException|com.ibm.websphere.security.auth.UnsupportedRealmException|com.ibm.websphere.security.auth.ValidationFailedException|com.ibm.websphere.security.auth.ValidationNotSupportedException|com.ibm.websphere.security.auth.callback.NonPromptCallbackHandler|com.ibm.websphere.security.auth.callback.WSCcacheCallBackHandlerImpl|com.ibm.websphere.security.auth.callback.WSGUICallbackHandlerImpl|com.ibm.websphere.security.auth.callback.WSStdinCallbackHandlerImpl|com.ibm.websphere.security.DistributedUserMappingFailedException|com.ibm.websphere.security.ProviderFailureException|com.ibm.websphere.security.SAFRoleMapper|com.ibm.websphere.security.TrustAssociationInterceptor|com.ibm.websphere.security.UserMapping|com.ibm.websphere.security.UserMappingException|com.ibm.websphere.security.WebSphereBaseTrustAssociationInterceptor|com.ibm.ws.security.core.SecurityContext|com.ibm.ws.security.util.LoginHelper|com.ibm.ws.security.util.ByteArray|com.ibm.websphere.crypto.KeyGenerator|com.ibm.websphere.crypto.KeyPair|com.ibm.websphere.crypto.KeyPairGenerator|com.ibm.websphere.crypto.KeySetHelper|com.ibm.wsspi.ssl.RetrieveSignersHelper|com.ibm.wsspi.ssl.WSPKIClient|com.ibm.wsspi.security.auth.callback.WSIdentityCallback|com.ibm.wsspi.security.auth.callback.WSMappingCallbackHandlerFactory|com.ibm.wsspi.security.auth.callback.WSProtocolPolicyCallback|com.ibm.wsspi.security.auth.callback.WSTokenHolderCallback|com.ibm.wsspi.security.auth.WSSubjectWrapper|com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptor|com.ibm.wsspi.security.tai.NegotiateTrustAssociationInterceptorImpl|com.ibm.wsspi.security.tai.TrustAssociationInterceptorExt|com.ibm.wsspi.security.token.AuthenticationToken|com.ibm.wsspi.security.token.AuthorizationToken|com.ibm.wsspi.security.token.KerberosToken|com.ibm.wsspi.security.token.PropagationToken|com.ibm.wsspi.security.token.TokenHolder|com.ibm.wsspi.security.token.WSOpaqueTokenHelper)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Service Integration Bus (SIB) APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Service Integration Bus (SIB) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.sib</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Service Integration Bus (SIB) APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -957,10 +900,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Service Integration Bus
-    (SIB) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.sib</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Service Integration
+    Bus (SIB) APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.sib</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsSIB
   when:
     java.referenced:
@@ -968,9 +911,7 @@
       pattern: com.ibm.websphere.sib*
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere SMF recording APIs are unavailable
-    <div class="Text">. <p> The following WebSphere SMF recording APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.smf</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere SMF recording APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -978,10 +919,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere SMF recording APIs are
-    not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.smf</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere SMF recording APIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.smf</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsSMF
   when:
     java.referenced:
@@ -989,9 +930,7 @@
       pattern: com.ibm.websphere.smf*
 - category: mandatory
   customVariables: []
-  description: |-
-    The Tivoli Performance Viewer SPIs are unavailable
-    <div class="Text">. <p> The following Tivoli Performance Viewer SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.ws.tpv</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The Tivoli Performance Viewer SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -999,9 +938,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following Tivoli Performance Viewer SPIs are
-    not available on Liberty: </p>. <ul>. <li><code>com.ibm.ws.tpv</code></li>. </ul>.
-    <p>You must modify the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following Tivoli Performance Viewer SPIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.ws.tpv</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsTPV
   when:
     java.referenced:
@@ -1009,9 +949,7 @@
       pattern: com.ibm.ws.tpv*
 - category: mandatory
   customVariables: []
-  description: |-
-    Some WebSphere Extension Helper SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Extension Helper SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.ws.extensionhelper</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: Some WebSphere Extension Helper SPIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -1019,10 +957,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Extension Helper SPIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.ws.extensionhelper</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Extension Helper SPIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.ws.extensionhelper</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsExtHelper
   when:
     java.referenced:
@@ -1030,9 +968,8 @@
       pattern: com.ibm.ws.extensionhelper*
 - category: mandatory
   customVariables: []
-  description: |-
-    The Universal Description, Discovery and Integration (UDDI) APIs are unavailable
-    <div class="Text">. <p> The following Universal Description, Discovery and Integration (UDDI) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.uddi</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The Universal Description, Discovery and Integration (UDDI) APIs are
+    unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1040,10 +977,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following Universal Description, Discovery
-    and Integration (UDDI) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.uddi</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following Universal Description, Discovery
+    and Integration (UDDI) APIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.uddi</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableAPIsUDDI
   when:
     java.referenced:
@@ -1054,9 +991,7 @@
   - name: WebSphereUnavailableAPIsWLM_0_packages
     nameOfCaptureGroup: WebSphereUnavailableAPIsWLM_0_packages
     pattern: (?P<WebSphereUnavailableAPIsWLM_0_packages>(com.ibm.websphere.wlm*\.[^.]+|com.ibm.websphere.wlm.exception*\.[^.]+))
-  description: |-
-    The WebSphere Workload Manager APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Workload Manager APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.wlm</code></li>. <li><code>com.ibm.websphere.wlm.exception</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Workload Manager APIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1064,19 +999,18 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Workload Manager APIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.wlm</code></li>.
-    <li><code>com.ibm.websphere.wlm.exception</code></li>. </ul>. <p>You must modify
-    the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Workload Manager APIs
+    are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.wlm</code></li>
+    \n <li><code>com.ibm.websphere.wlm.exception</code></li> \n </ul> \n <p>You must
+    modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsWLM
   when:
     java.referenced:
       pattern: (com.ibm.websphere.wlm*|com.ibm.websphere.wlm.exception*)
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Studio Application Developer Integration Edition APIs are unavailable
-    <div class="Text">. <p> The following WebSphere Studio Application Developer Integration Edition APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.webtools.runtime.AbstractStudioServlet</code></li>. <li><code>com.ibm.webtools.runtime.BuildNumber</code></li>. <li><code>com.ibm.webtools.runtime.NoDataException</code></li>. <li><code>com.ibm.webtools.runtime.StudioPervasiveServlet</code></li>. <li><code>com.ibm.webtools.runtime.TransactionFailureException</code></li>. <li><code>com.ibm.webtools.runtime.WSUtilities</code></li>. <li><code>com.ibm.etools.ctc.physicalrep</code></li>. <li><code>com.ibm.etools.ctc.plugin.binding.connector</code></li>. <li><code>com.ibm.etools.ctc.wsdl.extensions.physicalrep</code></li>. <li><code>com.ibm.etools.logging</code></li>. <li><code>com.ibm.etools.xsltypeconverter</code></li>. <li><code>com.ibm.jca.importservice</code></li>. <li><code>com.ibm.wsdl.extensions.physicalrep</code></li>. <li><code>com.ibm.wsdl.extensions.transformer</code></li>. <li><code>com.ibm.wsif.format.jca</code></li>. <li><code>com.ibm.wsif.format.literal</code></li>. <li><code>com.ibm.wsif.format.transformer</code></li>. <li><code>com.ibm.wsif.jca</code></li>. <li><code>com.ibm.wsif.providers.ejb.proxy</code></li>. <li><code>com.ibm.wsif.providers.transformer</code></li>. <li><code>com.ibm.wsif.providers.transformerrt</code></li>. <li><code>org.xmlsoap.schemas.wsdl.wsadie.messages</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Studio Application Developer Integration Edition APIs
+    are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1084,20 +1018,21 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Studio Application Developer
-    Integration Edition APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.webtools.runtime.AbstractStudioServlet</code></li>.
-    <li><code>com.ibm.webtools.runtime.BuildNumber</code></li>. <li><code>com.ibm.webtools.runtime.NoDataException</code></li>.
-    <li><code>com.ibm.webtools.runtime.StudioPervasiveServlet</code></li>. <li><code>com.ibm.webtools.runtime.TransactionFailureException</code></li>.
-    <li><code>com.ibm.webtools.runtime.WSUtilities</code></li>. <li><code>com.ibm.etools.ctc.physicalrep</code></li>.
-    <li><code>com.ibm.etools.ctc.plugin.binding.connector</code></li>. <li><code>com.ibm.etools.ctc.wsdl.extensions.physicalrep</code></li>.
-    <li><code>com.ibm.etools.logging</code></li>. <li><code>com.ibm.etools.xsltypeconverter</code></li>.
-    <li><code>com.ibm.jca.importservice</code></li>. <li><code>com.ibm.wsdl.extensions.physicalrep</code></li>.
-    <li><code>com.ibm.wsdl.extensions.transformer</code></li>. <li><code>com.ibm.wsif.format.jca</code></li>.
-    <li><code>com.ibm.wsif.format.literal</code></li>. <li><code>com.ibm.wsif.format.transformer</code></li>.
-    <li><code>com.ibm.wsif.jca</code></li>. <li><code>com.ibm.wsif.providers.ejb.proxy</code></li>.
-    <li><code>com.ibm.wsif.providers.transformer</code></li>. <li><code>com.ibm.wsif.providers.transformerrt</code></li>.
-    <li><code>org.xmlsoap.schemas.wsdl.wsadie.messages</code></li>. </ul>. <p>You
-    must modify the application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Studio Application
+    Developer Integration Edition APIs are not available on Liberty: </p> \n <ul>
+    \n <li><code>com.ibm.webtools.runtime.AbstractStudioServlet</code></li> \n <li><code>com.ibm.webtools.runtime.BuildNumber</code></li>
+    \n <li><code>com.ibm.webtools.runtime.NoDataException</code></li> \n <li><code>com.ibm.webtools.runtime.StudioPervasiveServlet</code></li>
+    \n <li><code>com.ibm.webtools.runtime.TransactionFailureException</code></li>
+    \n <li><code>com.ibm.webtools.runtime.WSUtilities</code></li> \n <li><code>com.ibm.etools.ctc.physicalrep</code></li>
+    \n <li><code>com.ibm.etools.ctc.plugin.binding.connector</code></li> \n <li><code>com.ibm.etools.ctc.wsdl.extensions.physicalrep</code></li>
+    \n <li><code>com.ibm.etools.logging</code></li> \n <li><code>com.ibm.etools.xsltypeconverter</code></li>
+    \n <li><code>com.ibm.jca.importservice</code></li> \n <li><code>com.ibm.wsdl.extensions.physicalrep</code></li>
+    \n <li><code>com.ibm.wsdl.extensions.transformer</code></li> \n <li><code>com.ibm.wsif.format.jca</code></li>
+    \n <li><code>com.ibm.wsif.format.literal</code></li> \n <li><code>com.ibm.wsif.format.transformer</code></li>
+    \n <li><code>com.ibm.wsif.jca</code></li> \n <li><code>com.ibm.wsif.providers.ejb.proxy</code></li>
+    \n <li><code>com.ibm.wsif.providers.transformer</code></li> \n <li><code>com.ibm.wsif.providers.transformerrt</code></li>
+    \n <li><code>org.xmlsoap.schemas.wsdl.wsadie.messages</code></li> \n </ul> \n
+    <p>You must modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsWSADIE
   when:
     or:
@@ -1110,9 +1045,7 @@
   - name: WebSphereUnavailableAPIsWSSecurityHelper_0_methodNames
     nameOfCaptureGroup: WebSphereUnavailableAPIsWSSecurityHelper_0_methodNames
     pattern: com.ibm.websphere.security.WSSecurityHelper.(?P<WebSphereUnavailableAPIsWSSecurityHelper_0_methodNames>(getFirstCaller|getFirstServer|getCallerList|getServerList|getPropagationAttributes|addPropagationAttribute|convertCookieStringToBytes|revokeSSOCookiesForPortlets))?(.*)
-  description: |-
-    Some WSSecurityHelper methods are unavailable
-    <div class="Text">. <p> The following WSSecurityHelper methods are not available on Liberty: </p>. <ul>. <li><code>getCallerList</code></li>. <li><code>getFirstCaller</code></li>. <li><code>getFirstServer</code></li>. <li><code>getServerList</code></li>. <li><code>addPropagationAttribute</code></li>. <li><code>getPropagationAttributes</code></li>. <li><code>convertCookieStringToBytes</code></li>. <li><code>revokeSSOCookies</code></li>. <li><code>revokeSSOCookiesForPortlets</code></li>. <li><code>getLTPACookieFromSSOToken</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: Some WSSecurityHelper methods are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1120,13 +1053,14 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WSSecurityHelper methods are not
-    available on Liberty: </p>. <ul>. <li><code>getCallerList</code></li>. <li><code>getFirstCaller</code></li>.
-    <li><code>getFirstServer</code></li>. <li><code>getServerList</code></li>. <li><code>addPropagationAttribute</code></li>.
-    <li><code>getPropagationAttributes</code></li>. <li><code>convertCookieStringToBytes</code></li>.
-    <li><code>revokeSSOCookies</code></li>. <li><code>revokeSSOCookiesForPortlets</code></li>.
-    <li><code>getLTPACookieFromSSOToken</code></li>. </ul>. <p>You must modify the
-    application so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WSSecurityHelper methods are
+    not available on Liberty: </p> \n <ul> \n <li><code>getCallerList</code></li>
+    \n <li><code>getFirstCaller</code></li> \n <li><code>getFirstServer</code></li>
+    \n <li><code>getServerList</code></li> \n <li><code>addPropagationAttribute</code></li>
+    \n <li><code>getPropagationAttributes</code></li> \n <li><code>convertCookieStringToBytes</code></li>
+    \n <li><code>revokeSSOCookies</code></li> \n <li><code>revokeSSOCookiesForPortlets</code></li>
+    \n <li><code>getLTPACookieFromSSOToken</code></li> \n </ul> \n <p>You must modify
+    the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WebSphereUnavailableAPIsWSSecurityHelper
   when:
     java.referenced:
@@ -1134,9 +1068,7 @@
       pattern: com.ibm.websphere.security.WSSecurityHelper.(getFirstCaller|getFirstServer|getCallerList|getServerList|getPropagationAttributes|addPropagationAttribute|convertCookieStringToBytes|revokeSSOCookiesForPortlets)*
 - category: mandatory
   customVariables: []
-  description: |-
-    The WebSphere Remote Request Dispatcher (RRD) SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Remote Request Dispatcher (RRD) SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.wsspi.rrd</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Remote Request Dispatcher (RRD) SPIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -1144,10 +1076,10 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Remote Request Dispatcher
-    (RRD) SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.wsspi.rrd</code></li>.
-    </ul>. <p>You must modify the application so that it can run on Liberty.</p>.
-    </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Remote Request Dispatcher
+    (RRD) SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.wsspi.rrd</code></li>
+    \n </ul> \n <p>You must modify the application so that it can run on Liberty.</p>
+    \n</div>"
   ruleID: WebSphereUnavailableSPIsRRD
   when:
     java.referenced:
@@ -1155,9 +1087,7 @@
       pattern: com.ibm.wsspi.rrd*
 - category: mandatory
   customVariables: []
-  description: |-
-    Do not use the WSSecurityHelper revokeSSOCookies method
-    <div class="Text"> <span class="SubHeader">Avoid using the deprecated WSSecurityHelper revokeSSOCookies method</span>. <p> This rule flags the following deprecated method from the <span class="Code">com.ibm.websphere.security.WSSecurityHelper</span> class: </p>. <ul>. <li><span class="Code">revokeSSOCookies(HttpServletRequest req, HttpServletResponse res)</span></li>. </ul>. <p>This method is deprecated in traditional WebSphere Application Server Version 8.5 and might be removed in a future release. It is not available on Liberty. </p>. <p> The functionality provided by <span class="Code">WSSecurityHelper.revokeSSOCookies(HttpServletRequest req, HttpServletResponse res)</span> is replaced by the Java Servlet-3.0 specification's <span class="Code">logout()</span> method. The Java Servlet-3.0 <span class="Code">logout()</span> method will perform all of the work that <span class="Code">WSSecurityHelper.revokeSSOCookies(HttpServletRequest req, HttpServletResponse res)</span> performs as well as doing additional state clean up, such as invalidating the session and clearing the security <span class="Code">Subject</span> from the thread. </p>. <p> Use the new method to be compatible on both WebSphere Application Server traditional and Liberty. Also note that with the <span class="Code">logout()</span> method in use, the application requires WebSphere Application Server V8.0 or later. </p>. <p> In the source scanner, the quick fix replaces calls to <span class="Code">revokeSSOCookies(HttpServletRequest req, HttpServletResponse res)</span> with calls to the <span class="Code">logout()</span> method. For example, the following code </p>. <table bgcolor="#F7F8F9" border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.HttpServletRequest; <br> <span class="indent2"></span>... <br> <span class="indent2"></span>WSSecurityHelper.revokeSSOCookies(req, res); </td>. </tr>. </tbody>. </table>. <p>is replaced by </p>. <table bgcolor="#F7F8F9" border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.HttpServletRequest; <br> <span class="indent2"></span>...<br> <span class="indent2"></span>req.logout(); </td>. </tr>. </tbody>. </table>. <p> For additional information, see </p>. <ul>. <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security'); return false;"> Java Servlet 3.0 support for security</a> Knowledge Center documentation. </li>. <li><a href="https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html'); return false;"> Class WSSecurityHelper</a> Java documentation. </li>. <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods'); return false;"> Servlet security methods</a> Knowledge Center documentation. </li>. </ul>. </div>
+  description: Do not use the WSSecurityHelper revokeSSOCookies method
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1165,40 +1095,41 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text"> <span class="SubHeader">Avoid using the deprecated
-    WSSecurityHelper revokeSSOCookies method</span>. <p> This rule flags the following
-    deprecated method from the <span class="Code">com.ibm.websphere.security.WSSecurityHelper</span>
-    class: </p>. <ul>. <li><span class="Code">revokeSSOCookies(HttpServletRequest
-    req, HttpServletResponse res)</span></li>. </ul>. <p>This method is deprecated
+  message: "<div class=\"Text\"> <span class=\"SubHeader\">Avoid using the deprecated
+    WSSecurityHelper revokeSSOCookies method</span> \n <p> This rule flags the following
+    deprecated method from the <span class=\"Code\">com.ibm.websphere.security.WSSecurityHelper</span>
+    class: </p> \n <ul> \n <li><span class=\"Code\">revokeSSOCookies(HttpServletRequest
+    req, HttpServletResponse res)</span></li> \n </ul> \n <p>This method is deprecated
     in traditional WebSphere Application Server Version 8.5 and might be removed in
-    a future release. It is not available on Liberty. </p>. <p> The functionality
-    provided by <span class="Code">WSSecurityHelper.revokeSSOCookies(HttpServletRequest
-    req, HttpServletResponse res)</span> is replaced by the Java Servlet-3.0 specification''s
-    <span class="Code">logout()</span> method. The Java Servlet-3.0 <span class="Code">logout()</span>
-    method will perform all of the work that <span class="Code">WSSecurityHelper.revokeSSOCookies(HttpServletRequest
+    a future release. It is not available on Liberty. </p> \n <p> The functionality
+    provided by <span class=\"Code\">WSSecurityHelper.revokeSSOCookies(HttpServletRequest
+    req, HttpServletResponse res)</span> is replaced by the Java Servlet-3.0 specification's
+    <span class=\"Code\">logout()</span> method. The Java Servlet-3.0 <span class=\"Code\">logout()</span>
+    method will perform all of the work that <span class=\"Code\">WSSecurityHelper.revokeSSOCookies(HttpServletRequest
     req, HttpServletResponse res)</span> performs as well as doing additional state
-    clean up, such as invalidating the session and clearing the security <span class="Code">Subject</span>
-    from the thread. </p>. <p> Use the new method to be compatible on both WebSphere
-    Application Server traditional and Liberty. Also note that with the <span class="Code">logout()</span>
+    clean up, such as invalidating the session and clearing the security <span class=\"Code\">Subject</span>
+    from the thread. </p> \n <p> Use the new method to be compatible on both WebSphere
+    Application Server traditional and Liberty. Also note that with the <span class=\"Code\">logout()</span>
     method in use, the application requires WebSphere Application Server V8.0 or later.
-    </p>. <p> In the source scanner, the quick fix replaces calls to <span class="Code">revokeSSOCookies(HttpServletRequest
-    req, HttpServletResponse res)</span> with calls to the <span class="Code">logout()</span>
-    method. For example, the following code </p>. <table bgcolor="#F7F8F9" border="1"
-    cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.HttpServletRequest;
-    <br> <span class="indent2"></span>... <br> <span class="indent2"></span>WSSecurityHelper.revokeSSOCookies(req,
-    res); </td>. </tr>. </tbody>. </table>. <p>is replaced by </p>. <table bgcolor="#F7F8F9"
-    border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.HttpServletRequest;
-    <br> <span class="indent2"></span>...<br> <span class="indent2"></span>req.logout();
-    </td>. </tr>. </tbody>. </table>. <p> For additional information, see </p>. <ul>.
-    <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security'');
-    return false;"> Java Servlet 3.0 support for security</a> Knowledge Center documentation.
-    </li>. <li><a href="https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html'');
-    return false;"> Class WSSecurityHelper</a> Java documentation. </li>. <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods'');
-    return false;"> Servlet security methods</a> Knowledge Center documentation. </li>.
-    </ul>. </div>'
+    </p> \n <p> In the source scanner, the quick fix replaces calls to <span class=\"Code\">revokeSSOCookies(HttpServletRequest
+    req, HttpServletResponse res)</span> with calls to the <span class=\"Code\">logout()</span>
+    method. For example, the following code </p> \n <table bgcolor=\"#F7F8F9\" border=\"1\"
+    cellpadding=\"2px\"> \n <tbody>\n <tr> \n <td> import javax.servlet.http.HttpServletRequest;
+    <br> <span class=\"indent2\"></span>... <br> <span class=\"indent2\"></span>WSSecurityHelper.revokeSSOCookies(req,
+    res); </td> \n </tr> \n </tbody>\n </table> \n <p>is replaced by </p> \n <table
+    bgcolor=\"#F7F8F9\" border=\"1\" cellpadding=\"2px\"> \n <tbody>\n <tr> \n <td>
+    import javax.servlet.http.HttpServletRequest; <br> <span class=\"indent2\"></span>...<br>
+    <span class=\"indent2\"></span>req.logout(); </td> \n </tr> \n </tbody>\n </table>
+    \n <p> For additional information, see </p> \n <ul> \n <li><a href=\"https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=providers-java-servlet-30-support-security');
+    return false;\"> Java Servlet 3.0 support for security</a> Knowledge Center documentation.
+    </li> \n <li><a href=\"https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSEQTP_9.0.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html');
+    return false;\"> Class WSSecurityHelper</a> Java documentation. </li> \n <li><a
+    href=\"https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=applications-servlet-security-methods');
+    return false;\"> Servlet security methods</a> Knowledge Center documentation.
+    </li> \n </ul> \n</div>"
   ruleID: WebSphereUnavailableSSOCookieMethod
   when:
     java.referenced:
@@ -1206,9 +1137,7 @@
       pattern: com.ibm.websphere.security.WSSecurityHelper.revokeSSOCookies*
 - category: mandatory
   customVariables: []
-  description: |-
-    Do not use the WSSecurityHelper getLTPACookieFromSSOToken method
-    <div class="Text">. <p> This rule flags the following method from the <span class="Code">com.ibm.websphere.security.WSSecurityHelper</span> class: </p>. <ul>. <li><span class="Code">getLTPACookieFromSSOToken()</span></li>. </ul>. <p>This method is deprecated in traditional WebSphere Application Server Version 8.5 and might be removed in a future release. It is not available on Liberty. </p>. <p> The functionality provided by <span class="Code">WSSecurityHelper.getLTPACookieFromSSOToken()</span> is replaced by the new method <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper.getSSOCookieFromSSOToken().</span> Note that this new method is in the class <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper,</span> not <span class="Code">com.ibm.websphere.security.WSSecurityHelper.</span> This method will extract the SSO token from the subject of current thread and builds an SSO cookie out of it for use on downstream web invocations. </p>. <p> Use the new method to be compatible on both WebSphere Application Server traditional and Liberty. Also note that with the <span class="Code">getSSOCookieFromSSOToken()</span> method in use, the application requires WebSphere Application Server V8.0 or later. </p>. <p> In the source scanner, the quick fix replaces calls to <span class="Code">WSSecurityHelper.getLTPACookieFromSSOToken()</span> with calls to the <span class="Code">WebSecurityHelper.getSSOCookieFromSSOToken()</span> method. An import statement for <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper</span> is added if needed. For example, the following code </p>. <table bgcolor="#F7F8F9" border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.Cookie;<br> import com.ibm.websphere.security.WSSecurityHelper; <br> <span class="indent2"></span>... <br> <span class="indent2"></span>Cookie ltpaCookie = WSSecurityHelper.getLTPACookieFromSSOToken(); </td>. </tr>. </tbody>. </table>. <p>is replaced by </p>. <table bgcolor="#F7F8F9" border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.Cookie;<br> import com.ibm.websphere.security.WSSecurityHelper;<br> import com.ibm.websphere.security.web.WebSecurityHelper; <br> <span class="indent2"></span>...<br> <span class="indent2"></span>Cookie ltpaCookie = WebSecurityHelper.getSSOCookieFromSSOToken(); </td>. </tr>. </tbody>. </table>. <p> For additional information, see </p>. <ul>. <li><a href="https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html'); return false;"> Class WebSecurityHelper</a> Java documentation. </li>. <li><a href="https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html'); return false;"> Class WSSecurityHelper</a> Java documentation. </li>. <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie" title="Opens a new window" onclick="javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie'); return false;"> Using a WebSphere Application Server API to achieve downstream web single sign-on with an LtpaToken2 cookie</a> Knowledge Center documentation. </li>. </ul>. </div>
+  description: Do not use the WSSecurityHelper getLTPACookieFromSSOToken method
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1216,42 +1145,43 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> This rule flags the following method from the
-    <span class="Code">com.ibm.websphere.security.WSSecurityHelper</span> class: </p>.
-    <ul>. <li><span class="Code">getLTPACookieFromSSOToken()</span></li>. </ul>. <p>This
-    method is deprecated in traditional WebSphere Application Server Version 8.5 and
-    might be removed in a future release. It is not available on Liberty. </p>. <p>
-    The functionality provided by <span class="Code">WSSecurityHelper.getLTPACookieFromSSOToken()</span>
-    is replaced by the new method <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper.getSSOCookieFromSSOToken().</span>
-    Note that this new method is in the class <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper,</span>
-    not <span class="Code">com.ibm.websphere.security.WSSecurityHelper.</span> This
+  message: "<div class=\"Text\"> \n <p> This rule flags the following method from
+    the <span class=\"Code\">com.ibm.websphere.security.WSSecurityHelper</span> class:
+    </p> \n <ul> \n <li><span class=\"Code\">getLTPACookieFromSSOToken()</span></li>
+    \n </ul> \n <p>This method is deprecated in traditional WebSphere Application
+    Server Version 8.5 and might be removed in a future release. It is not available
+    on Liberty. </p> \n <p> The functionality provided by <span class=\"Code\">WSSecurityHelper.getLTPACookieFromSSOToken()</span>
+    is replaced by the new method <span class=\"Code\">com.ibm.websphere.security.web.WebSecurityHelper.getSSOCookieFromSSOToken().</span>
+    Note that this new method is in the class <span class=\"Code\">com.ibm.websphere.security.web.WebSecurityHelper,</span>
+    not <span class=\"Code\">com.ibm.websphere.security.WSSecurityHelper.</span> This
     method will extract the SSO token from the subject of current thread and builds
-    an SSO cookie out of it for use on downstream web invocations. </p>. <p> Use the
-    new method to be compatible on both WebSphere Application Server traditional and
-    Liberty. Also note that with the <span class="Code">getSSOCookieFromSSOToken()</span>
+    an SSO cookie out of it for use on downstream web invocations. </p> \n <p> Use
+    the new method to be compatible on both WebSphere Application Server traditional
+    and Liberty. Also note that with the <span class=\"Code\">getSSOCookieFromSSOToken()</span>
     method in use, the application requires WebSphere Application Server V8.0 or later.
-    </p>. <p> In the source scanner, the quick fix replaces calls to <span class="Code">WSSecurityHelper.getLTPACookieFromSSOToken()</span>
-    with calls to the <span class="Code">WebSecurityHelper.getSSOCookieFromSSOToken()</span>
-    method. An import statement for <span class="Code">com.ibm.websphere.security.web.WebSecurityHelper</span>
-    is added if needed. For example, the following code </p>. <table bgcolor="#F7F8F9"
-    border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.Cookie;<br>
-    import com.ibm.websphere.security.WSSecurityHelper; <br> <span class="indent2"></span>...
-    <br> <span class="indent2"></span>Cookie ltpaCookie = WSSecurityHelper.getLTPACookieFromSSOToken();
-    </td>. </tr>. </tbody>. </table>. <p>is replaced by </p>. <table bgcolor="#F7F8F9"
-    border="1" cellpadding="2px">. <tbody>. <tr>. <td> import javax.servlet.http.Cookie;<br>
+    </p> \n <p> In the source scanner, the quick fix replaces calls to <span class=\"Code\">WSSecurityHelper.getLTPACookieFromSSOToken()</span>
+    with calls to the <span class=\"Code\">WebSecurityHelper.getSSOCookieFromSSOToken()</span>
+    method. An import statement for <span class=\"Code\">com.ibm.websphere.security.web.WebSecurityHelper</span>
+    is added if needed. For example, the following code </p> \n <table bgcolor=\"#F7F8F9\"
+    border=\"1\" cellpadding=\"2px\"> \n <tbody>\n <tr> \n <td> import javax.servlet.http.Cookie;<br>
+    import com.ibm.websphere.security.WSSecurityHelper; <br> <span class=\"indent2\"></span>...
+    <br> <span class=\"indent2\"></span>Cookie ltpaCookie = WSSecurityHelper.getLTPACookieFromSSOToken();
+    </td> \n </tr> \n </tbody>\n </table> \n <p>is replaced by </p> \n <table bgcolor=\"#F7F8F9\"
+    border=\"1\" cellpadding=\"2px\"> \n <tbody>\n <tr> \n <td> import javax.servlet.http.Cookie;<br>
     import com.ibm.websphere.security.WSSecurityHelper;<br> import com.ibm.websphere.security.web.WebSecurityHelper;
-    <br> <span class="indent2"></span>...<br> <span class="indent2"></span>Cookie
-    ltpaCookie = WebSecurityHelper.getSSOCookieFromSSOToken(); </td>. </tr>. </tbody>.
-    </table>. <p> For additional information, see </p>. <ul>. <li><a href="https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html'');
-    return false;"> Class WebSecurityHelper</a> Java documentation. </li>. <li><a
-    href="https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html'');
-    return false;"> Class WSSecurityHelper</a> Java documentation. </li>. <li><a href="https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie"
-    title="Opens a new window" onclick="javascript:helpWindow(''https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie'');
-    return false;"> Using a WebSphere Application Server API to achieve downstream
+    <br> <span class=\"indent2\"></span>...<br> <span class=\"indent2\"></span>Cookie
+    ltpaCookie = WebSecurityHelper.getSSOCookieFromSSOToken(); </td> \n </tr> \n </tbody>\n
+    </table> \n <p> For additional information, see </p> \n <ul> \n <li><a href=\"https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/support/knowledgecenter/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/web/WebSecurityHelper.html');
+    return false;\"> Class WebSecurityHelper</a> Java documentation. </li> \n <li><a
+    href=\"https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/SSAW57_8.5.5/com.ibm.websphere.javadoc.doc/web/apidocs/com/ibm/websphere/security/WSSecurityHelper.html');
+    return false;\"> Class WSSecurityHelper</a> Java documentation. </li> \n <li><a
+    href=\"https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('https://www.ibm.com/docs/en/was-nd/8.5.5?topic=ssa-using-websphere-application-server-api-achieve-downstream-web-single-sign-ltpatoken2-cookie');
+    return false;\"> Using a WebSphere Application Server API to achieve downstream
     web single sign-on with an LtpaToken2 cookie</a> Knowledge Center documentation.
-    </li>. </ul>. </div>'
+    </li> \n </ul> \n</div>"
   ruleID: WebSphereUnavailableSSOTokenMethod
   when:
     java.referenced:
@@ -1259,9 +1189,7 @@
       pattern: com.ibm.websphere.security.WSSecurityHelper.getLTPACookieFromSSOToken*
 - category: optional
   customVariables: []
-  description: |-
-    Some WebSphere z/OS Optimized Local Adapters APIs are unavailable
-    <div class="Text">. <p> Liberty supports a subset of the WebSphere Optimized Local Adapters (WOLA) APIs. This rule flags the use of APIs that are unsupported on Liberty. </p>. <p> The Java™ rule flags the following classes related to MBean functions that are unavailable on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ola.OLAConnectionHandle</code></li>. <li><code>com.ibm.websphere.ola.OLAHeader</code></li>. <li><code>com.ibm.websphere.ola.OLARGE</code></li>. <li><code>com.ibm.websphere.ola.OLARGEInformation</code></li>. <li><code>com.ibm.websphere.ola.OLARGEList</code></li>. <li><code>com.ibm.websphere.ola.OLASearchObject</code></li>. <li><code>com.ibm.websphere.ola.OLAStatusInformation</code></li>. </ul>. <p> The Java rule also flags <code>RemoteHome</code> annotations with <code>com.ibm.websphere.ola.ExecuteHome.class</code> as the remote interface. Liberty ignores the <code>@RemoteHome</code> interface. To host this EJB on Liberty, modify your application to also provide a business local EJB bean that implements com.ibm.websphere.ola.ExecuteLocalBusiness. </p>. <ul>. <li><code>@RemoteHome(com.ibm.websphere.ola.ExecuteHome.class)</code></li>. </ul>. <p> The XML rule flags <code>&lt;remote&gt;</code> and <code>&lt;home&gt;</code> elements that contain references to <code>com.ibm.websphere.ola</code> classes. To use WOLA with EJB beans on Liberty, you need to migrate your EJB beans to use EJB 3.0 <code>&lt;business-local&gt;</code> interfaces, and your EJB class must implement <code>com.ibm.websphere.ola.ExecuteLocalBusiness</code>. </p>. <p> For example, the tool flags the use of WOLA on the remote and home interfaces: </p>. <table class="code">. <tbody>. <tr>. <td> <span class="Code"> <span class="indent"></span>&lt;session id="wola_sample"&gt;<br> <span class="indent3"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br> <span class="indent3"></span><span style="font-weight:bolder;">&lt;home&gt;com.ibm.websphere.ola.ExecuteHome&lt;/home&gt;</span><br> <span class="indent3"></span><span style="font-weight:bolder;">&lt;remote&gt;com.ibm.websphere.ola.Execute&lt;/remote&gt;</span><br> <span class="indent3"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br> <span class="indent3"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br> <span class="indent3"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br> <span class="indent"></span>&lt;/session&gt;<br> </span> </td>. </tr>. </tbody>. </table>. <p> To use WOLA in this application on Liberty, migrate the EJB classes to use the local business interface and update the <span class="FilePath">ejb-jar.xml</span> file as follows: </p>. <table class="code">. <tbody>. <tr>. <td> <span class="Code"> <span class="indent"></span>&lt;session id="wola_sample"&gt;<br> <span class="indent3"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br> <span class="indent3"></span><span style="font-weight:bolder;">&lt;business-local&gt;com.ibm.websphere.ola.ExecuteLocalBusiness&lt;/business-local&gt;</span><br> <span class="indent3"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br> <span class="indent3"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br> <span class="indent3"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br> <span class="indent"></span>&lt;/session&gt;<br> </span> </td>. </tr>. </tbody>. </table>. <p> Also note that Java Naming and Directory Interface (JNDI) names of target EJB beans on Liberty use <code>java:</code> naming. Start the Liberty server and check the server log for messages that display the JNDI of the target EJB beans. </p>. <p> For detailed information about WOLA on Liberty, see the <a href="http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html" title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html'); return false;"> Developing applications that use optimized local adapters on Liberty</a> documentation. </p>. </div>
+  description: Some WebSphere z/OS Optimized Local Adapters APIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -1269,49 +1197,50 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> Liberty supports a subset of the WebSphere Optimized
-    Local Adapters (WOLA) APIs. This rule flags the use of APIs that are unsupported
-    on Liberty. </p>. <p> The Java™ rule flags the following classes related to MBean
-    functions that are unavailable on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.ola.OLAConnectionHandle</code></li>.
-    <li><code>com.ibm.websphere.ola.OLAHeader</code></li>. <li><code>com.ibm.websphere.ola.OLARGE</code></li>.
-    <li><code>com.ibm.websphere.ola.OLARGEInformation</code></li>. <li><code>com.ibm.websphere.ola.OLARGEList</code></li>.
-    <li><code>com.ibm.websphere.ola.OLASearchObject</code></li>. <li><code>com.ibm.websphere.ola.OLAStatusInformation</code></li>.
-    </ul>. <p> The Java rule also flags <code>RemoteHome</code> annotations with <code>com.ibm.websphere.ola.ExecuteHome.class</code>
-    as the remote interface. Liberty ignores the <code>@RemoteHome</code> interface.
-    To host this EJB on Liberty, modify your application to also provide a business
-    local EJB bean that implements com.ibm.websphere.ola.ExecuteLocalBusiness. </p>.
-    <ul>. <li><code>@RemoteHome(com.ibm.websphere.ola.ExecuteHome.class)</code></li>.
-    </ul>. <p> The XML rule flags <code>&lt;remote&gt;</code> and <code>&lt;home&gt;</code>
+  message: "<div class=\"Text\"> \n <p> Liberty supports a subset of the WebSphere
+    Optimized Local Adapters (WOLA) APIs. This rule flags the use of APIs that are
+    unsupported on Liberty. </p> \n <p> The Java™ rule flags the following classes
+    related to MBean functions that are unavailable on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.ola.OLAConnectionHandle</code></li>
+    \n <li><code>com.ibm.websphere.ola.OLAHeader</code></li> \n <li><code>com.ibm.websphere.ola.OLARGE</code></li>
+    \n <li><code>com.ibm.websphere.ola.OLARGEInformation</code></li> \n <li><code>com.ibm.websphere.ola.OLARGEList</code></li>
+    \n <li><code>com.ibm.websphere.ola.OLASearchObject</code></li> \n <li><code>com.ibm.websphere.ola.OLAStatusInformation</code></li>
+    \n </ul> \n <p> The Java rule also flags <code>RemoteHome</code> annotations with
+    <code>com.ibm.websphere.ola.ExecuteHome.class</code> as the remote interface.
+    Liberty ignores the <code>@RemoteHome</code> interface. To host this EJB on Liberty,
+    modify your application to also provide a business local EJB bean that implements
+    com.ibm.websphere.ola.ExecuteLocalBusiness. </p> \n <ul> \n <li><code>@RemoteHome(com.ibm.websphere.ola.ExecuteHome.class)</code></li>
+    \n </ul> \n <p> The XML rule flags <code>&lt;remote&gt;</code> and <code>&lt;home&gt;</code>
     elements that contain references to <code>com.ibm.websphere.ola</code> classes.
     To use WOLA with EJB beans on Liberty, you need to migrate your EJB beans to use
     EJB 3.0 <code>&lt;business-local&gt;</code> interfaces, and your EJB class must
-    implement <code>com.ibm.websphere.ola.ExecuteLocalBusiness</code>. </p>. <p> For
-    example, the tool flags the use of WOLA on the remote and home interfaces: </p>.
-    <table class="code">. <tbody>. <tr>. <td> <span class="Code"> <span class="indent"></span>&lt;session
-    id="wola_sample"&gt;<br> <span class="indent3"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br>
-    <span class="indent3"></span><span style="font-weight:bolder;">&lt;home&gt;com.ibm.websphere.ola.ExecuteHome&lt;/home&gt;</span><br>
-    <span class="indent3"></span><span style="font-weight:bolder;">&lt;remote&gt;com.ibm.websphere.ola.Execute&lt;/remote&gt;</span><br>
-    <span class="indent3"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br>
-    <span class="indent3"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br>
-    <span class="indent3"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br>
-    <span class="indent"></span>&lt;/session&gt;<br> </span> </td>. </tr>. </tbody>.
-    </table>. <p> To use WOLA in this application on Liberty, migrate the EJB classes
-    to use the local business interface and update the <span class="FilePath">ejb-jar.xml</span>
-    file as follows: </p>. <table class="code">. <tbody>. <tr>. <td> <span class="Code">
-    <span class="indent"></span>&lt;session id="wola_sample"&gt;<br> <span class="indent3"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br>
-    <span class="indent3"></span><span style="font-weight:bolder;">&lt;business-local&gt;com.ibm.websphere.ola.ExecuteLocalBusiness&lt;/business-local&gt;</span><br>
-    <span class="indent3"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br>
-    <span class="indent3"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br>
-    <span class="indent3"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br>
-    <span class="indent"></span>&lt;/session&gt;<br> </span> </td>. </tr>. </tbody>.
-    </table>. <p> Also note that Java Naming and Directory Interface (JNDI) names
+    implement <code>com.ibm.websphere.ola.ExecuteLocalBusiness</code>. </p> \n <p>
+    For example, the tool flags the use of WOLA on the remote and home interfaces:
+    </p> \n <table class=\"code\"> \n <tbody>\n <tr> \n <td> <span class=\"Code\">
+    <span class=\"indent\"></span>&lt;session id=\"wola_sample\"&gt;<br> <span class=\"indent3\"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br>
+    <span class=\"indent3\"></span><span style=\"font-weight:bolder;\">&lt;home&gt;com.ibm.websphere.ola.ExecuteHome&lt;/home&gt;</span><br>
+    <span class=\"indent3\"></span><span style=\"font-weight:bolder;\">&lt;remote&gt;com.ibm.websphere.ola.Execute&lt;/remote&gt;</span><br>
+    <span class=\"indent3\"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br>
+    <span class=\"indent3\"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br>
+    <span class=\"indent3\"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br>
+    <span class=\"indent\"></span>&lt;/session&gt;<br> </span> </td>\n </tr>\n </tbody>\n
+    </table> \n <p> To use WOLA in this application on Liberty, migrate the EJB classes
+    to use the local business interface and update the <span class=\"FilePath\">ejb-jar.xml</span>
+    file as follows: </p>\n <table class=\"code\"> \n <tbody>\n <tr> \n <td> <span
+    class=\"Code\"> <span class=\"indent\"></span>&lt;session id=\"wola_sample\"&gt;<br>
+    <span class=\"indent3\"></span>&lt;ejb-name&gt;WOLA&lt;/ejb-name&gt;<br> <span
+    class=\"indent3\"></span><span style=\"font-weight:bolder;\">&lt;business-local&gt;com.ibm.websphere.ola.ExecuteLocalBusiness&lt;/business-local&gt;</span><br>
+    <span class=\"indent3\"></span>&lt;ejb-class&gt;com.ibm.Hello&lt;/ejb-class&gt;<br>
+    <span class=\"indent3\"></span>&lt;session-type&gt;Stateless&lt;/session-type&gt;<br>
+    <span class=\"indent3\"></span>&lt;transaction-type&gt;Container&lt;/transaction-type&gt;<br>
+    <span class=\"indent\"></span>&lt;/session&gt;<br> </span> </td>\n </tr>\n </tbody>\n
+    </table> \n <p> Also note that Java Naming and Directory Interface (JNDI) names
     of target EJB beans on Liberty use <code>java:</code> naming. Start the Liberty
     server and check the server log for messages that display the JNDI of the target
-    EJB beans. </p>. <p> For detailed information about WOLA on Liberty, see the <a
-    href="http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html"
-    title="Opens a new window" onclick="javascript:helpWindow(''http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html'');
-    return false;"> Developing applications that use optimized local adapters on Liberty</a>
-    documentation. </p>. </div>'
+    EJB beans. </p> \n <p> For detailed information about WOLA on Liberty, see the
+    <a href=\"http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html');
+    return false;\"> Developing applications that use optimized local adapters on
+    Liberty</a> documentation. </p> \n</div>"
   ruleID: WOLAMissingClassesRule
   when:
     or:
@@ -1331,9 +1260,7 @@
   - name: WOLARule_0_packages
     nameOfCaptureGroup: WOLARule_0_packages
     pattern: (?P<WOLARule_0_packages>com.ibm.websphere.ola\.[^.]+)
-  description: |-
-    Review differences in the WebSphere z/OS Optimized Local Adapters API
-    <div class="Text">. <p> Liberty supports some com.ibm.websphere.ola APIs, but there are differences from the support provided on WebSphere Application Server traditional. Review your use of the WOLA APIs to see if the differences affect your application. </p>. <p> Differences include the WOLA support for global transactions, Enterprise JavaBeans (EJB) support, and Java Naming and Directory Interface (JNDI). For detailed information about WOLA on Liberty, see the <a href="http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html" title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html'); return false;"> Developing applications that use optimized local adapters on Liberty</a> documentation. </p>. <p> WOLA support for IBM Information Management Systems (IMS) is introduced in Liberty 16.0.0.3. </p>. </div>
+  description: Review differences in the WebSphere z/OS Optimized Local Adapters API
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1341,16 +1268,16 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> Liberty supports some com.ibm.websphere.ola APIs,
-    but there are differences from the support provided on WebSphere Application Server
-    traditional. Review your use of the WOLA APIs to see if the differences affect
-    your application. </p>. <p> Differences include the WOLA support for global transactions,
-    Enterprise JavaBeans (EJB) support, and Java Naming and Directory Interface (JNDI).
-    For detailed information about WOLA on Liberty, see the <a href="http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html"
-    title="Opens a new window" onclick="javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html');
-    return false;"> Developing applications that use optimized local adapters on Liberty</a>
-    documentation. </p>. <p> WOLA support for IBM Information Management Systems (IMS)
-    is introduced in Liberty 16.0.0.3. </p>. </div>
+  message: "<div class=\"Text\"> \n <p> Liberty supports some com.ibm.websphere.ola
+    APIs, but there are differences from the support provided on WebSphere Application
+    Server traditional. Review your use of the WOLA APIs to see if the differences
+    affect your application. </p> \n <p> Differences include the WOLA support for
+    global transactions, Enterprise JavaBeans (EJB) support, and Java Naming and Directory
+    Interface (JNDI). For detailed information about WOLA on Liberty, see the <a href=\"http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html\"
+    title=\"Opens a new window\" onclick=\"javascript:helpWindow('http://www.ibm.com/support/knowledgecenter/SS7K4U_liberty/com.ibm.websphere.wlp.zseries.doc/ae/container_wlp_ola_developing.html');
+    return false;\"> Developing applications that use optimized local adapters on
+    Liberty</a> documentation. </p> \n <p> WOLA support for IBM Information Management
+    Systems (IMS) is introduced in Liberty 16.0.0.3. </p> \n</div>"
   ruleID: WOLARule
   when:
     java.referenced:
@@ -1361,9 +1288,7 @@
   - name: WorkAreaRule_0_packages
     nameOfCaptureGroup: WorkAreaRule_0_packages
     pattern: (?P<WorkAreaRule_0_packages>(com.ibm.websphere.workarea\.[^.]+|com.ibm.wsspi.workarea\.[^.]+))
-  description: |-
-    The WebSphere Work Area APIs and SPIs are unavailable
-    <div class="Text">. <p> The following WebSphere Work Area APIs and SPIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.workarea</code></li>. <li><code>com.ibm.wsspi.workarea</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere Work Area APIs and SPIs are unavailable
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1371,19 +1296,17 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<div class="Text">. <p> The following WebSphere Work Area APIs and SPIs
-    are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.workarea</code></li>.
-    <li><code>com.ibm.wsspi.workarea</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>'
+  message: "<div class=\"Text\"> \n <p> The following WebSphere Work Area APIs and
+    SPIs are not available on Liberty: </p> \n <ul> \n <li><code>com.ibm.websphere.workarea</code></li>
+    \n <li><code>com.ibm.wsspi.workarea</code></li> \n </ul> \n <p>You must modify
+    the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WorkAreaRule
   when:
     java.referenced:
       pattern: (com.ibm.websphere.workarea*|com.ibm.wsspi.workarea*)
 - category: mandatory
   customVariables: []
-  description: |-
-    Web Services Notification (WS-Notification) is unavailable
-    <span class="SubHeader">The WebSphere Web Services Notification (WS-Notification) APIs are unavailable</span>. <div class="Text">. <p> The following WebSphere Web Services Notification (WS-Notification) APIs are not available on Liberty: </p>. <ul>. <li><code>com.ibm.websphere.sib.wsn</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: Web Services Notification (WS-Notification) is unavailable
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -1391,11 +1314,11 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: '<span class="SubHeader">The WebSphere Web Services Notification (WS-Notification)
-    APIs are unavailable</span>. <div class="Text">. <p> The following WebSphere Web
-    Services Notification (WS-Notification) APIs are not available on Liberty: </p>.
-    <ul>. <li><code>com.ibm.websphere.sib.wsn</code></li>. </ul>. <p>You must modify
-    the application so that it can run on Liberty.</p>. </div>'
+  message: "<span class=\"SubHeader\">The WebSphere Web Services Notification (WS-Notification)
+    APIs are unavailable</span> \n<div class=\"Text\"> \n <p> The following WebSphere
+    Web Services Notification (WS-Notification) APIs are not available on Liberty:
+    </p> \n <ul> \n <li><code>com.ibm.websphere.sib.wsn</code></li> \n </ul> \n <p>You
+    must modify the application so that it can run on Liberty.</p> \n</div>"
   ruleID: WSNotificationRuleJava
   when:
     java.referenced:
@@ -1403,9 +1326,7 @@
       pattern: com.ibm.websphere.sib.wsn*
 - category: mandatory
   customVariables: []
-  description: |-
-    The use of the WebSphere XPath, XQuery, and XSLT API requires configuration
-    <div class="Text">. <p> To use the WebSphere XPath, XQuery, and XSLT API, applications must be configured to use the XML thin client JAR file provided by the WebSphere Application Server Feature Pack for XML. <!--  How do they get this feature pack? How do they configure their applications to use it? --> </p>. </div>
+  description: The use of the WebSphere XPath, XQuery, and XSLT API requires configuration
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -1413,10 +1334,11 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p> To use the WebSphere XPath, XQuery, and XSLT API,
-    applications must be configured to use the XML thin client JAR file provided by
-    the WebSphere Application Server Feature Pack for XML. <!--  How do they get this
-    feature pack? How do they configure their applications to use it? --> </p>. </div>
+  message: "<div class=\"Text\"> \n <p> To use the WebSphere XPath, XQuery, and XSLT
+    API, applications must be configured to use the XML thin client JAR file provided
+    by the WebSphere Application Server Feature Pack for XML. <!-- How do they get
+    this feature pack? How do they configure their applications to use it? --> </p>
+    \n</div>"
   ruleID: XMLFeaturePackRule
   when:
     java.referenced:
@@ -1430,9 +1352,7 @@
   - name: WebSphereWebServicesRule_0_files
     nameOfCaptureGroup: WebSphereWebServicesRule_0_files
     pattern: (?P<WebSphereWebServicesRule_0_packages>(com.ibm.websphere.webservices\.[^.]+|com.ibm.websphere.websvcs.rm\.[^.]+|com.ibm.websphere.wsaddressing\.[^.]+|com.ibm.websphere.wsrf\.[^.]+|com.ibm.websphere.wssecurity\.[^.]+|com.ibm.websphere.cache.webservices\.[^.]+|com.ibm.ws.webservices\.[^.]+|com.ibm.ws.websvcs\.[^.]+|com.ibm.ws.wssecurity\.[^.]+|com.ibm.wsspi.soapcontainer\.[^.]+|com.ibm.wsspi.webservices\.[^.]+|com.ibm.wsspi.wssecurity\.[^.]+|com.ibm.wsspi.wsaddressing\.[^.]+|com.ibm.wsspi.wsrm\.[^.]+))
-  description: |-
-    The WebSphere web services APIs and SPIs are unavailable
-    <div class="Text">. <p>. The following WebSphere web services APIs and SPIs are not available on Liberty:. </p>. <ul>. <li><code>com.ibm.websphere.webservices</code></li>. <li><code>com.ibm.websphere.websvcs.rm</code></li>. <li><code>com.ibm.websphere.wssecurity</code></li>. <li><code>com.ibm.websphere.cache.webservices</code></li>. <li><code>com.ibm.ws.webservices</code></li>. <li><code>com.ibm.ws.websvcs</code></li>. <li><code>com.ibm.ws.wssecurity</code></li>. <li><code>com.ibm.websphere.wsaddressing</code></li>. <li><code>com.ibm.websphere.wsrf</code></li>. <li><code>com.ibm.wsspi.soapcontainer</code></li>. <li><code>com.ibm.wsspi.webservices</code></li>. <li><code>com.ibm.wsspi.wssecurity</code></li>. <li><code>com.ibm.wsspi.wsaddressing</code></li>. <li><code>com.ibm.wsspi.wsrm</code></li>. </ul>. <p>You must modify the application so that it can run on Liberty.</p>. </div>
+  description: The WebSphere web services APIs and SPIs are unavailable
   effort: 3
   labels:
   - konveyor.io/source=websphere
@@ -1440,16 +1360,29 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p>. The following WebSphere web services APIs and
-    SPIs are not available on Liberty:. </p>. <ul>. <li><code>com.ibm.websphere.webservices</code></li>.
-    <li><code>com.ibm.websphere.websvcs.rm</code></li>. <li><code>com.ibm.websphere.wssecurity</code></li>.
-    <li><code>com.ibm.websphere.cache.webservices</code></li>. <li><code>com.ibm.ws.webservices</code></li>.
-    <li><code>com.ibm.ws.websvcs</code></li>. <li><code>com.ibm.ws.wssecurity</code></li>.
-    <li><code>com.ibm.websphere.wsaddressing</code></li>. <li><code>com.ibm.websphere.wsrf</code></li>.
-    <li><code>com.ibm.wsspi.soapcontainer</code></li>. <li><code>com.ibm.wsspi.webservices</code></li>.
-    <li><code>com.ibm.wsspi.wssecurity</code></li>. <li><code>com.ibm.wsspi.wsaddressing</code></li>.
-    <li><code>com.ibm.wsspi.wsrm</code></li>. </ul>. <p>You must modify the application
-    so that it can run on Liberty.</p>. </div>
+  message: |-
+    <div class="Text">
+     <p>
+     The following WebSphere web services APIs and SPIs are not available on Liberty:
+     </p>
+     <ul>
+     <li><code>com.ibm.websphere.webservices</code></li>
+     <li><code>com.ibm.websphere.websvcs.rm</code></li>
+     <li><code>com.ibm.websphere.wssecurity</code></li>
+     <li><code>com.ibm.websphere.cache.webservices</code></li>
+     <li><code>com.ibm.ws.webservices</code></li>
+     <li><code>com.ibm.ws.websvcs</code></li>
+     <li><code>com.ibm.ws.wssecurity</code></li>
+     <li><code>com.ibm.websphere.wsaddressing</code></li>
+     <li><code>com.ibm.websphere.wsrf</code></li>
+     <li><code>com.ibm.wsspi.soapcontainer</code></li>
+     <li><code>com.ibm.wsspi.webservices</code></li>
+     <li><code>com.ibm.wsspi.wssecurity</code></li>
+     <li><code>com.ibm.wsspi.wsaddressing</code></li>
+     <li><code>com.ibm.wsspi.wsrm</code></li>
+     </ul>
+     <p>You must modify the application so that it can run on Liberty.</p>
+     </div>
   ruleID: WebSphereWebServicesRule
   when:
     java.referenced:
@@ -1462,9 +1395,7 @@
   - name: WebSphereWebServicesGeneratedClassesRule_0_files
     nameOfCaptureGroup: WebSphereWebServicesGeneratedClassesRule_0_files
     pattern: (?P<WebSphereWebServicesGeneratedClassesRule_0_packages>(com.ibm.websphere.webservices\.[^.]+|com.ibm.websphere.websvcs.rm\.[^.]+|com.ibm.websphere.wsaddressing\.[^.]+|com.ibm.websphere.wsrf\.[^.]+|com.ibm.websphere.wssecurity\.[^.]+|com.ibm.websphere.cache.webservices\.[^.]+|com.ibm.ws.webservices\.[^.]+|com.ibm.ws.websvcs\.[^.]+|com.ibm.ws.wssecurity\.[^.]+|com.ibm.wsspi.soapcontainer\.[^.]+|com.ibm.wsspi.webservices\.[^.]+|com.ibm.wsspi.wssecurity\.[^.]+|com.ibm.wsspi.wsaddressing\.[^.]+|com.ibm.wsspi.wsrm\.[^.]+))
-  description: |-
-    Application contains WSDL2Java generated classes
-    <div class="Text">. <p>. The WSDL2Java emitter generates Java classes from JAX-RPC WSDL files. These generated classes are used with JAX-RPC web. services that is not supported on Liberty. These classes can be removed when converting from JAX-RPC to JAX-WS.. </p>. <p>. This rule flags the following WSDL2Java emitter generated classes:. </p>. <ul>. <li><code>*_Deser.class</code></li>. <li><code>*_Helper.class</code></li>. <li><code>*_Ser.class</code></li>. <li><code>*Stub.class</code></li>. <li><code>*Locator.class</code></li>. <li><code>*Information.class</code></li>. </ul>. <p>. For example, if your WSDL file contains an element named Book the WSDL2Java emitter may generate any of the following classes. to be flagged by this rule:. </p>. <ul>. <li><code>Book_Deser.class</code></li>. <li><code>Book_Helper.class</code></li>. <li><code>Book_Ser.class</code></li>. <li><code>BookStub.class</code></li>. <li><code>BookBindingStub.class</code></li>. <li><code>BookLocator.class</code></li>. <li><code>BookServiceLocator.class</code></li>. <li><code>Book_ServiceLocator.class</code></li>. <li><code>BookInformation.class</code></li>. <li><code>BookServiceInformation.class</code></li>. <li><code>Book_ServiceInformation.class</code></li>. </ul>. </div>
+  description: Application contains WSDL2Java generated classes
   effort: 0
   labels:
   - konveyor.io/source=websphere
@@ -1472,21 +1403,41 @@
   links:
   - title: Open Liberty migration rules in Windup
     url: https://www.ibm.com/docs/wamt?topic=rules-open-liberty-migration-in-windup
-  message: <div class="Text">. <p>. The WSDL2Java emitter generates Java classes from
-    JAX-RPC WSDL files. These generated classes are used with JAX-RPC web. services
-    that is not supported on Liberty. These classes can be removed when converting
-    from JAX-RPC to JAX-WS.. </p>. <p>. This rule flags the following WSDL2Java emitter
-    generated classes:. </p>. <ul>. <li><code>*_Deser.class</code></li>. <li><code>*_Helper.class</code></li>.
-    <li><code>*_Ser.class</code></li>. <li><code>*Stub.class</code></li>. <li><code>*Locator.class</code></li>.
-    <li><code>*Information.class</code></li>. </ul>. <p>. For example, if your WSDL
-    file contains an element named Book the WSDL2Java emitter may generate any of
-    the following classes. to be flagged by this rule:. </p>. <ul>. <li><code>Book_Deser.class</code></li>.
-    <li><code>Book_Helper.class</code></li>. <li><code>Book_Ser.class</code></li>.
-    <li><code>BookStub.class</code></li>. <li><code>BookBindingStub.class</code></li>.
-    <li><code>BookLocator.class</code></li>. <li><code>BookServiceLocator.class</code></li>.
-    <li><code>Book_ServiceLocator.class</code></li>. <li><code>BookInformation.class</code></li>.
-    <li><code>BookServiceInformation.class</code></li>. <li><code>Book_ServiceInformation.class</code></li>.
-    </ul>. </div>
+  message: |-
+    <div class="Text">
+     <p>
+     The WSDL2Java emitter generates Java classes from JAX-RPC WSDL files. These generated classes are used with JAX-RPC web
+     services that is not supported on Liberty. These classes can be removed when converting from JAX-RPC to JAX-WS.
+     </p>
+     <p>
+     This rule flags the following WSDL2Java emitter generated classes:
+     </p>
+     <ul>
+     <li><code>*_Deser.class</code></li>
+     <li><code>*_Helper.class</code></li>
+     <li><code>*_Ser.class</code></li>
+     <li><code>*Stub.class</code></li>
+     <li><code>*Locator.class</code></li>
+     <li><code>*Information.class</code></li>
+     </ul>
+     <p>
+     For example, if your WSDL file contains an element named Book the WSDL2Java emitter may generate any of the following classes
+     to be flagged by this rule:
+     </p>
+     <ul>
+     <li><code>Book_Deser.class</code></li>
+     <li><code>Book_Helper.class</code></li>
+     <li><code>Book_Ser.class</code></li>
+     <li><code>BookStub.class</code></li>
+     <li><code>BookBindingStub.class</code></li>
+     <li><code>BookLocator.class</code></li>
+     <li><code>BookServiceLocator.class</code></li>
+     <li><code>Book_ServiceLocator.class</code></li>
+     <li><code>BookInformation.class</code></li>
+     <li><code>BookServiceInformation.class</code></li>
+     <li><code>Book_ServiceInformation.class</code></li>
+     </ul>
+     </div>
   ruleID: WebSphereWebServicesGeneratedClassesRule
   when:
     java.referenced:
diff --git a/default/generated/openliberty/ruleset.yaml b/default/generated/openliberty/ruleset.yaml
index 995ece21..ac9ca1bb 100644
--- a/default/generated/openliberty/ruleset.yaml
+++ b/default/generated/openliberty/ruleset.yaml
@@ -1,3 +1,3 @@
 name: openliberty/websphere
-description: This ruleset identifies usage of WebSphere APIs and technologies which
-  are not provided by Open Liberty.
+description: This ruleset identifies usage of Java APIs and technologies which are
+  not provided by Open Liberty.
diff --git a/default/generated/os/165-os-specific.windup.yaml b/default/generated/os/165-os-specific.windup.yaml
index 5c190534..c2a675df 100644
--- a/default/generated/os/165-os-specific.windup.yaml
+++ b/default/generated/os/165-os-specific.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Windows file system path
-    This file system path is Microsoft Windows platform dependent. It needs to be replaced with a Linux-style path.
+  description: Windows file system path
   effort: 1
   labels:
   - konveyor.io/target=linux
@@ -18,9 +16,7 @@
       pattern: '[A-z]:([\\][^\n\t]+)+|(\\\\([^\\\,\n\t]+)\\\S+)+'
 - category: mandatory
   customVariables: []
-  description: |-
-    Dynamic-Link Library (DLL)
-    This Dynamic-Link Library is Microsoft Windows platform dependent. It needs to be replaced with a Linux-style shared library.
+  description: Dynamic-Link Library (DLL)
   effort: 5
   labels:
   - konveyor.io/target=linux
diff --git a/default/generated/quarkus/166-springboot-actuator-to-quarkus.windup.yaml b/default/generated/quarkus/166-springboot-actuator-to-quarkus.windup.yaml
index ef24ae7f..7b4456b6 100644
--- a/default/generated/quarkus/166-springboot-actuator-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/166-springboot-actuator-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health extension
-    Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health extension.. It has to be replaced by `io.quarkus:quarkus-smallrye-health` artifact.
+  description: Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health
+    extension
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -10,8 +9,8 @@
   links:
   - title: Quarkus - Smallrye Health
     url: https://quarkus.io/guides/smallrye-health
-  message: Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health
-    extension.. It has to be replaced by `io.quarkus:quarkus-smallrye-health` artifact.
+  message: "\n Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health
+    extension. \n It has to be replaced by `io.quarkus:quarkus-smallrye-health` artifact.\n "
   ruleID: springboot-actuator-to-quarkus-0100
   when:
     or:
@@ -29,9 +28,7 @@
         name: org.springframework.boot.spring-boot-actuator
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring Health endpoint mapping
-    Replace `management.endpoints.web.exposure.include=health` with `quarkus.smallrye-health.root-path=/actuator/health`
+  description: Replace Spring Health endpoint mapping
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -39,7 +36,7 @@
   links:
   - title: Quarkus Guide - Smallrye Health
     url: https://quarkus.io/guides/smallrye-health
-  message: Replace `management.endpoints.web.exposure.include=health` with `quarkus.smallrye-health.root-path=/actuator/health`
+  message: "\n Replace `management.endpoints.web.exposure.include=health` with `quarkus.smallrye-health.root-path=/actuator/health`\n "
   ruleID: springboot-actuator-to-quarkus-0200
   when:
     builtin.filecontent:
diff --git a/default/generated/quarkus/167-springboot-annotations-to-quarkus.windup.yaml b/default/generated/quarkus/167-springboot-annotations-to-quarkus.windup.yaml
index 99be39ad..3ee52c3b 100644
--- a/default/generated/quarkus/167-springboot-annotations-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/167-springboot-annotations-to-quarkus.windup.yaml
@@ -1,22 +1,20 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Remove the SpringBoot @SpringBootApplication annotation
-    Remove the SpringBoot @SpringBootApplication annotation.. A Spring Boot application contains a "main" class with the @SpringBootApplication annotation. A Quarkus application does not have such a class. Two different alternatives can be followed - either. to remove the "main" class associated with the annotation, or add the `org.springframework.boot:spring-boot-autoconfigure` dependency as an `optional` Maven dependency. An optional dependency. is available when an application compiles but is not packaged with the application at runtime. Doing this would allow the application to compile without modification, but you. would also need to maintain a Spring version along with the Quarkus application.
+  description: Remove the SpringBoot @SpringBootApplication annotation
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: Remove the SpringBoot @SpringBootApplication annotation.. A Spring Boot
-    application contains a "main" class with the @SpringBootApplication annotation.
+  message: "\n Remove the SpringBoot @SpringBootApplication annotation.\n\n A Spring
+    Boot application contains a \"main\" class with the @SpringBootApplication annotation.
     A Quarkus application does not have such a class. Two different alternatives can
-    be followed - either. to remove the "main" class associated with the annotation,
+    be followed - either\n to remove the \"main\" class associated with the annotation,
     or add the `org.springframework.boot:spring-boot-autoconfigure` dependency as
-    an `optional` Maven dependency. An optional dependency. is available when an application
-    compiles but is not packaged with the application at runtime. Doing this would
-    allow the application to compile without modification, but you. would also need
-    to maintain a Spring version along with the Quarkus application.
+    an `optional` Maven dependency. An optional dependency \n is available when an
+    application compiles but is not packaged with the application at runtime. Doing
+    this would allow the application to compile without modification, but you\n would
+    also need to maintain a Spring version along with the Quarkus application.\n "
   ruleID: springboot-annotations-to-quarkus-00000
   when:
     java.referenced:
diff --git a/default/generated/quarkus/168-springboot-cache-to-quarkus.windup.yaml b/default/generated/quarkus/168-springboot-cache-to-quarkus.windup.yaml
index 8266fe3b..2cf8b13b 100644
--- a/default/generated/quarkus/168-springboot-cache-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/168-springboot-cache-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot cache artifact with Quarkus 'spring-cache' extension
-    Replace the SpringBoot Cache module artifact with Quarkus `spring-cache` extension. Add Quarkus dependency `io.quarkus:quarkus-spring-cache`
+  description: Replace the SpringBoot cache artifact with Quarkus 'spring-cache' extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,8 +8,8 @@
   links:
   - title: Quarkus Extension for Spring Cache API Guide
     url: https://quarkus.io/guides/spring-cache
-  message: Replace the SpringBoot Cache module artifact with Quarkus `spring-cache`
-    extension. Add Quarkus dependency `io.quarkus:quarkus-spring-cache`
+  message: "\n Replace the SpringBoot Cache module artifact with Quarkus `spring-cache`
+    extension\n\n Add Quarkus dependency `io.quarkus:quarkus-spring-cache`\n "
   ruleID: springboot-cache-to-quarkus-00000
   when:
     or:
diff --git a/default/generated/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml b/default/generated/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml
index 66aea427..a4df3055 100644
--- a/default/generated/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Spring Cloud Config Client artifact with Quarkus 'quarkus-spring-cloud-config-client' extension
-    Replace the Spring Cloud Config Client artifact with Quarkus `quarkus-spring-cloud-config-client` extension. Add Quarkus dependency `io.quarkus:quarkus-spring-cloud-config-client`.. A change may also be required to the code and configuration.
+  description: Replace the Spring Cloud Config Client artifact with Quarkus 'quarkus-spring-cloud-config-client'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -12,9 +11,9 @@
     url: https://quarkus.io/guides/spring-cloud-config-client
   - title: Spring Cloud Config
     url: https://cloud.spring.io/spring-cloud-config/reference/html/
-  message: Replace the Spring Cloud Config Client artifact with Quarkus `quarkus-spring-cloud-config-client`
-    extension. Add Quarkus dependency `io.quarkus:quarkus-spring-cloud-config-client`..
-    A change may also be required to the code and configuration.
+  message: "\n Replace the Spring Cloud Config Client artifact with Quarkus `quarkus-spring-cloud-config-client`
+    extension\n\n Add Quarkus dependency `io.quarkus:quarkus-spring-cloud-config-client`.\n
+    \n A change may also be required to the code and configuration.\n "
   ruleID: springboot-cloud-config-client-to-quarkus-00000
   when:
     or:
diff --git a/default/generated/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml b/default/generated/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml
index d0a18ead..7ca1d72e 100644
--- a/default/generated/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot Data JPA artifact with Quarkus 'spring-data-jpa' extension
-    Replace the SpringBoot JPA artifact with Quarkus `spring-data-jpa` extension. Spring Data JPA is in spring-data-jpa artifact brought transitively by any `org.springframework.data:spring-data-*` dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-data-jpa`
+  description: Replace the SpringBoot Data JPA artifact with Quarkus 'spring-data-jpa'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +9,10 @@
   links:
   - title: Quarkus JPA Guide
     url: https://quarkus.io/guides/spring-data-jpa
-  message: Replace the SpringBoot JPA artifact with Quarkus `spring-data-jpa` extension.
-    Spring Data JPA is in spring-data-jpa artifact brought transitively by any `org.springframework.data:spring-data-*`
-    dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-data-jpa`
+  message: "\n Replace the SpringBoot JPA artifact with Quarkus `spring-data-jpa`
+    extension\n\n Spring Data JPA is in spring-data-jpa artifact brought transitively
+    by any `org.springframework.data:spring-data-*` dependency \n Add Quarkus dependency
+    `io.quarkus:quarkus-spring-data-jpa`\n "
   ruleID: springboot-jpa-to-quarkus-00000
   when:
     or:
diff --git a/default/generated/quarkus/171-springboot-devtools-to-quarkus.windup.yaml b/default/generated/quarkus/171-springboot-devtools-to-quarkus.windup.yaml
index ef563e22..20eaac1a 100644
--- a/default/generated/quarkus/171-springboot-devtools-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/171-springboot-devtools-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Remove spring-boot-devtools dependency
-    Remove the spring-boot-devtools dependency.. Quarkus has its own set of development tools integrated by default.
+  description: Remove spring-boot-devtools dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,8 +8,8 @@
   links:
   - title: Quarkus development tools
     url: https://quarkus.io/guides/tooling
-  message: Remove the spring-boot-devtools dependency.. Quarkus has its own set of
-    development tools integrated by default.
+  message: "\n Remove the spring-boot-devtools dependency.\n Quarkus has its own set
+    of development tools integrated by default.\n "
   ruleID: springboot-devtools-to-quarkus-0000
   when:
     builtin.xml:
diff --git a/default/generated/quarkus/172-springboot-di-to-quarkus.windup.yaml b/default/generated/quarkus/172-springboot-di-to-quarkus.windup.yaml
index 13722aab..3db1900f 100644
--- a/default/generated/quarkus/172-springboot-di-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/172-springboot-di-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: potential
   customVariables: []
-  description: |-
-    Replace the SpringBoot Dependency Injection artifact with Quarkus 'spring-di' extension
-    Replace the SpringBoot Dependency Injection artifact with Quarkus `spring-di` extension. Spring DI is in spring-beans artifact brought transitively by any `org.springframework.boot:spring-boot-*` dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-di`
+  description: Replace the SpringBoot Dependency Injection artifact with Quarkus 'spring-di'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +9,9 @@
   links:
   - title: Quarkus DI Guide
     url: https://quarkus.io/guides/spring-di
-  message: Replace the SpringBoot Dependency Injection artifact with Quarkus `spring-di`
-    extension. Spring DI is in spring-beans artifact brought transitively by any `org.springframework.boot:spring-boot-*`
-    dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-di`
+  message: "\n Replace the SpringBoot Dependency Injection artifact with Quarkus `spring-di`
+    extension\n\n Spring DI is in spring-beans artifact brought transitively by any
+    `org.springframework.boot:spring-boot-*` dependency\n Add Quarkus dependency `io.quarkus:quarkus-spring-di`\n "
   ruleID: springboot-di-to-quarkus-00000
   when:
     java.dependency:
@@ -20,8 +19,8 @@
       name: org.springframework.spring-beans
 - category: mandatory
   customVariables: []
-  description: "For Spring DI the XML-based bean configuration metadata is not supported
-    by Quarkus \nQuarkus only supports the java-based configuration of Spring beans."
+  description: 'For Spring DI the XML-based bean configuration metadata is not supported
+    by Quarkus '
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -45,9 +44,7 @@
         xpath: //*/c:annotation-config
 - category: mandatory
   customVariables: []
-  description: |-
-    Spring DI infrastructure classes not supported by Quarkus
-    Spring infrastructure classes (like `org.springframework.beans.factory.config.BeanPostProcessor` , `org.springframework.context.ApplicationContext` for example) will not be executed.
+  description: Spring DI infrastructure classes not supported by Quarkus
   effort: 3
   labels:
   - konveyor.io/source=springboot
diff --git a/default/generated/quarkus/173-springboot-generic-catchall.windup.yaml b/default/generated/quarkus/173-springboot-generic-catchall.windup.yaml
index 5b7f2076..39d7c710 100644
--- a/default/generated/quarkus/173-springboot-generic-catchall.windup.yaml
+++ b/default/generated/quarkus/173-springboot-generic-catchall.windup.yaml
@@ -1,7 +1,6 @@
 - category: potential
   customVariables: []
-  description: |
-    Spring component {artifact} requires investigation
+  description: Spring component {artifact} requires investigation
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -9,15 +8,15 @@
   - springboot
   - catchall
   links: []
-  message: If the application declares explicitly or uses any of the feature provided
-    by the Spring `{{group}}:{{artifact}}` component,. then check if there is a Quarkus
-    Extensions with Spring API compatibility for the Spring `{{artifact}}` component..
-    If yes, then replace the `{{group}}:{{artifact}}` dependency with the Quarkus
-    extension.. If no, consider rewrite the code that relies on this dependency leveraging
-    the Quarkus Guides linked below.. Otherwise, if the application hasn't got this
-    explicit Spring `{{group}}:{{artifact}}` component dependency, it has been added
-    transitively by another Spring component.. Once the dependant Spring component
-    will be removed, this issue will be fixed as well.
+  message: "\n If the application declares explicitly or uses any of the feature provided
+    by the Spring `{{group}}:{{artifact}}` component,\n then check if there is a Quarkus
+    Extensions with Spring API compatibility for the Spring `{{artifact}}` component.
+    \n If yes, then replace the `{{group}}:{{artifact}}` dependency with the Quarkus
+    extension. \n If no, consider rewrite the code that relies on this dependency
+    leveraging the Quarkus Guides linked below. \n \n Otherwise, if the application
+    hasn't got this explicit Spring `{{group}}:{{artifact}}` component dependency,
+    it has been added transitively by another Spring component. \n Once the dependant
+    Spring component will be removed, this issue will be fixed as well.\n "
   ruleID: springboot-generic-catchall-00100
   when:
     java.dependency:
diff --git a/default/generated/quarkus/174-springboot-integration-to-quarkus.windup.yaml b/default/generated/quarkus/174-springboot-integration-to-quarkus.windup.yaml
index dcd5441e..04b92c11 100644
--- a/default/generated/quarkus/174-springboot-integration-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/174-springboot-integration-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    SpringBoot Integration flows are not supported.
-    SpringBoot Integration flows are not supported. A migration to Apache Camel route is mandatory.
+  description: SpringBoot Integration flows are not supported.
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -10,8 +8,8 @@
   links:
   - title: Quarkus Apache Camel
     url: https://quarkus.io/guides/camel
-  message: SpringBoot Integration flows are not supported. A migration to Apache Camel
-    route is mandatory.
+  message: "\n SpringBoot Integration flows are not supported. A migration to Apache
+    Camel route is mandatory.\n "
   ruleID: springboot-integration-to-quarkus-00010
   when:
     builtin.xml:
@@ -20,9 +18,7 @@
       xpath: //*/int:channel
 - category: mandatory
   customVariables: []
-  description: |-
-    SpringBoot IntegrationFlow class usage is not supported.
-    SpringBoot IntegrationFlow class usage is not supported. A migration to Apache Camel route using From is mandatory.
+  description: SpringBoot IntegrationFlow class usage is not supported.
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -30,8 +26,8 @@
   links:
   - title: Quarkus Apache Camel
     url: https://quarkus.io/guides/camel
-  message: SpringBoot IntegrationFlow class usage is not supported. A migration to
-    Apache Camel route using From is mandatory.
+  message: "\n SpringBoot IntegrationFlow class usage is not supported. A migration
+    to Apache Camel route using From is mandatory.\n "
   ruleID: springboot-integration-to-quarkus-00020
   when:
     java.referenced:
diff --git a/default/generated/quarkus/175-springboot-jmx-to-quarkus.windup.yaml b/default/generated/quarkus/175-springboot-jmx-to-quarkus.windup.yaml
index e1a8f4e0..967d78b7 100644
--- a/default/generated/quarkus/175-springboot-jmx-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/175-springboot-jmx-to-quarkus.windup.yaml
@@ -1,16 +1,14 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Spring JMX is not supported by Quarkus with GraalVM on a Native Image
-    Spring JMX XML configuration detected:. Spring JMX is not supported by Quarkus with the GraalVM Native compilation.. Spring JMX can be used with the Quarkus Hotspot compilation however.
+  description: Spring JMX is not supported by Quarkus with GraalVM on a Native Image
   effort: 13
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: Spring JMX XML configuration detected:. Spring JMX is not supported by
-    Quarkus with the GraalVM Native compilation.. Spring JMX can be used with the
-    Quarkus Hotspot compilation however.
+  message: "\n Spring JMX XML configuration detected:\n\n Spring JMX is not supported
+    by Quarkus with the GraalVM Native compilation.\n Spring JMX can be used with
+    the Quarkus Hotspot compilation however.\n "
   ruleID: springboot-jmx-to-quarkus-00000
   when:
     builtin.xml:
@@ -19,17 +17,15 @@
       xpath: //*/c:bean/@class[matches(self::node(), 'org.springframework.jmx.export.MBeanExporter')]
 - category: mandatory
   customVariables: []
-  description: |-
-    Spring JMX is not supported by Quarkus with GraalVM on a Native Image
-    Spring JMX annotation configuration detected:. Spring JMX is not supported by Quarkus with the GraalVM Native compilation.. Spring JMX can be used with the Quarkus Hotspot compilation however.
+  description: Spring JMX is not supported by Quarkus with GraalVM on a Native Image
   effort: 13
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: Spring JMX annotation configuration detected:. Spring JMX is not supported
-    by Quarkus with the GraalVM Native compilation.. Spring JMX can be used with the
-    Quarkus Hotspot compilation however.
+  message: "\n Spring JMX annotation configuration detected:\n\n Spring JMX is not
+    supported by Quarkus with the GraalVM Native compilation.\n Spring JMX can be
+    used with the Quarkus Hotspot compilation however.\n "
   ruleID: springboot-jmx-to-quarkus-00001
   when:
     java.referenced:
diff --git a/default/generated/quarkus/176-springboot-metrics-to-quarkus.windup.yaml b/default/generated/quarkus/176-springboot-metrics-to-quarkus.windup.yaml
index e809e6a0..4e7a1f91 100644
--- a/default/generated/quarkus/176-springboot-metrics-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/176-springboot-metrics-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Micrometer dependency with Quarkus Microprofile 'metrics' extension
-    Replace the Micrometer dependency with Quarkus Microprofile 'metrics' extension.. Usually this is a transitive dependency brought by `org.springframework.boot:spring-boot-starter-actuator` and has to be replaced by `io.quarkus:quarkus-smallrye-metrics` artifact
+  description: Replace the Micrometer dependency with Quarkus Microprofile 'metrics'
+    extension
   effort: 5
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +9,9 @@
   links:
   - title: Quarkus metrics
     url: https://quarkus.io/guides/microprofile-metrics
-  message: Replace the Micrometer dependency with Quarkus Microprofile 'metrics' extension..
-    Usually this is a transitive dependency brought by `org.springframework.boot:spring-boot-starter-actuator`
-    and has to be replaced by `io.quarkus:quarkus-smallrye-metrics` artifact
+  message: "\n Replace the Micrometer dependency with Quarkus Microprofile 'metrics'
+    extension. \n Usually this is a transitive dependency brought by `org.springframework.boot:spring-boot-starter-actuator`
+    and has to be replaced by `io.quarkus:quarkus-smallrye-metrics` artifact\n "
   ruleID: springboot-metrics-to-quarkus-0100
   when:
     java.dependency:
@@ -20,15 +19,13 @@
       name: io.micrometer.micrometer-core
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Micrometer code with Microprofile Metrics code
-    Replace the Micrometer code with Microprofile Metrics code
+  description: Replace the Micrometer code with Microprofile Metrics code
   effort: 5
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: Replace the Micrometer code with Microprofile Metrics code
+  message: "\n Replace the Micrometer code with Microprofile Metrics code\n "
   ruleID: springboot-metrics-to-quarkus-0200
   when:
     java.dependency:
@@ -36,9 +33,7 @@
       name: io.micrometer.micrometer-core
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring Prometheus Metrics endpoint mapping
-    Replace `management.endpoints.web.exposure.include=prometheus` with `quarkus.micrometer.export.prometheus.path=/actuator/prometheus`
+  description: Replace Spring Prometheus Metrics endpoint mapping
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -46,7 +41,8 @@
   links:
   - title: Quarkus Guide - Micrometer Metrics
     url: https://quarkus.io/guides/micrometer
-  message: Replace `management.endpoints.web.exposure.include=prometheus` with `quarkus.micrometer.export.prometheus.path=/actuator/prometheus`
+  message: "\n Replace `management.endpoints.web.exposure.include=prometheus` with
+    `quarkus.micrometer.export.prometheus.path=/actuator/prometheus`\n "
   ruleID: springboot-metrics-to-quarkus-0300
   when:
     builtin.filecontent:
diff --git a/default/generated/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml b/default/generated/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml
index 25f9b00b..42b0ac45 100644
--- a/default/generated/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Spring Parent POM with Quarkus BOM
-    Replace the Spring Parent POM with Quarkus BOM in `<dependencyManagement>` section of the application's `pom.xml` file.. Leverage the link below to fulfill this change.
+  description: Replace the Spring Parent POM with Quarkus BOM
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +8,9 @@
   links:
   - title: Quarkus - Building applications with Maven Guide
     url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: Replace the Spring Parent POM with Quarkus BOM in `<dependencyManagement>`
-    section of the application's `pom.xml` file.. Leverage the link below to fulfill
-    this change.
+  message: "\n Replace the Spring Parent POM with Quarkus BOM in `<dependencyManagement>`
+    section of the application's `pom.xml` file. \n Leverage the link below to fulfill
+    this change.\n "
   ruleID: springboot-parent-pom-to-quarkus-00000
   when:
     or:
diff --git a/default/generated/quarkus/178-springboot-plugins-to-quarkus.windup.yaml b/default/generated/quarkus/178-springboot-plugins-to-quarkus.windup.yaml
index 59a47397..5ab8ccd1 100644
--- a/default/generated/quarkus/178-springboot-plugins-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/178-springboot-plugins-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the spring-boot-maven-plugin dependency
-    Replace the `spring-boot-maven-plugin` dependency.. The `spring-boot-maven-plugin` dependency needs to be replaced with `quarkus-maven-plugin`, so that the application is built with Quarkus, both for running on the JVM and in native mode.
+  description: Replace the spring-boot-maven-plugin dependency
   effort: 2
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +8,9 @@
   links:
   - title: Building Quarkus with maven
     url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: Replace the `spring-boot-maven-plugin` dependency.. The `spring-boot-maven-plugin`
+  message: "\n Replace the `spring-boot-maven-plugin` dependency.\n The `spring-boot-maven-plugin`
     dependency needs to be replaced with `quarkus-maven-plugin`, so that the application
-    is built with Quarkus, both for running on the JVM and in native mode.
+    is built with Quarkus, both for running on the JVM and in native mode.\n "
   ruleID: springboot-plugins-to-quarkus-0000
   when:
     builtin.xml:
diff --git a/default/generated/quarkus/179-springboot-properties-to-quarkus.windup.yaml b/default/generated/quarkus/179-springboot-properties-to-quarkus.windup.yaml
index 3acb0d72..f96ec72f 100644
--- a/default/generated/quarkus/179-springboot-properties-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/179-springboot-properties-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot artifact with Quarkus 'spring-boot-properties' extension
-    Replace the SpringBoot artifact with Quarkus `spring-boot-properties` extension. Spring Configuration Properties is in spring-boot artifact brought transitively by any `org.springframework.boot:spring-boot-*` dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-boot-properties`
+  description: Replace the SpringBoot artifact with Quarkus 'spring-boot-properties'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,10 +9,10 @@
   links:
   - title: Quarkus Spring Configuration Properties Guide
     url: https://quarkus.io/guides/spring-boot-properties
-  message: Replace the SpringBoot artifact with Quarkus `spring-boot-properties` extension.
-    Spring Configuration Properties is in spring-boot artifact brought transitively
-    by any `org.springframework.boot:spring-boot-*` dependency. Add Quarkus dependency
-    `io.quarkus:quarkus-spring-boot-properties`
+  message: "\n Replace the SpringBoot artifact with Quarkus `spring-boot-properties`
+    extension\n\n Spring Configuration Properties is in spring-boot artifact brought
+    transitively by any `org.springframework.boot:spring-boot-*` dependency\n Add
+    Quarkus dependency `io.quarkus:quarkus-spring-boot-properties`\n "
   ruleID: springboot-properties-to-quarkus-00000
   when:
     java.dependency:
@@ -21,8 +20,8 @@
       name: org.springframework.boot.spring-boot
 - category: mandatory
   customVariables: []
-  description: |
-    Spring property profiles in separate files must be refactored into Quarkus properties file
+  description: Spring property profiles in separate files must be refactored into
+    Quarkus properties file
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -32,18 +31,16 @@
     url: https://quarkus.io/guides/config#configuration-profiles
   - title: Quarkus Configuration Reference Guide
     url: https://quarkus.io/guides/config-reference#configuration_profiles
-  message: Spring property profile in separate file 'application-{{profile}}.{{extension}}'
-    must have. their individual properties refactored to use Quarkus profile naming
-    conventions within a single properties file,. ie in the format  %{{profile}}.config.key=value
+  message: "\n Spring property profile in separate file 'application-{{profile}}.{{extension}}'
+    must have\n their individual properties refactored to use Quarkus profile naming
+    conventions within a single properties file,\n\n ie in the format %{{profile}}.config.key=value\n "
   ruleID: springboot-properties-to-quarkus-00001
   when:
     builtin.file:
       pattern: application-\.+\.(properties|yml|yaml)
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring datasource property key/value pairs with Quarkus properties
-    Spring datasource property key/value pairs have been detected in the application property file.. View advice in the Quarkus datasource guide to convert these to Quarkus datasource properties.
+  description: Replace Spring datasource property key/value pairs with Quarkus properties
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -51,9 +48,9 @@
   links:
   - title: Quarkus Datasources Guide
     url: https://quarkus.io/guides/datasource
-  message: Spring datasource property key/value pairs have been detected in the application
-    property file.. View advice in the Quarkus datasource guide to convert these to
-    Quarkus datasource properties.
+  message: "\n Spring datasource property key/value pairs have been detected in the
+    application property file.\n\n View advice in the Quarkus datasource guide to
+    convert these to Quarkus datasource properties.\n "
   ruleID: springboot-properties-to-quarkus-00002
   when:
     builtin.filecontent:
@@ -61,9 +58,7 @@
       pattern: spring.datasource
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring log level property with Quarkus property
-    Spring log level property configuration have been detected in the application property file.. View advice in the Quarkus datasource guide to convert these to Quarkus log level properties.
+  description: Replace Spring log level property with Quarkus property
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -71,9 +66,9 @@
   links:
   - title: Quarkus Configuring Logging Guide
     url: https://quarkus.io/guides/logging#runtime-configuration
-  message: Spring log level property configuration have been detected in the application
-    property file.. View advice in the Quarkus datasource guide to convert these to
-    Quarkus log level properties.
+  message: "\n Spring log level property configuration have been detected in the application
+    property file.\n\n View advice in the Quarkus datasource guide to convert these
+    to Quarkus log level properties.\n "
   ruleID: springboot-properties-to-quarkus-00003
   when:
     builtin.filecontent:
@@ -81,9 +76,7 @@
       pattern: logging.level.org.springframework
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring JPA Hiberate property with Quarkus property
-    Replace `spring.jpa.hibernate.ddl-auto=create-drop` with `quarkus.hibernate-orm.database.generation=drop-and-create`
+  description: Replace Spring JPA Hiberate property with Quarkus property
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -91,7 +84,7 @@
   links:
   - title: Quarkus Hibernate ORM and JPA Guide
     url: https://quarkus.io/guides/hibernate-orm
-  message: Replace `spring.jpa.hibernate.ddl-auto=create-drop` with `quarkus.hibernate-orm.database.generation=drop-and-create`
+  message: "\n Replace `spring.jpa.hibernate.ddl-auto=create-drop` with `quarkus.hibernate-orm.database.generation=drop-and-create`\n "
   ruleID: springboot-properties-to-quarkus-00004
   when:
     builtin.filecontent:
@@ -99,9 +92,7 @@
       pattern: spring.jpa.hibernate.ddl-auto=create-drop
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring Swagger endpoint mapping
-    Replace `springdoc.swagger-ui.path` with `quarkus.swagger-ui.path`. By adding `quarkus.swagger-ui.always-include=true` Quarkus will always expose the Swagger UI endpoint.. It is only exposed in Dev mode by default.
+  description: Replace Spring Swagger endpoint mapping
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -109,9 +100,9 @@
   links:
   - title: Quarkus Guide - using OpenAPI and Swagger
     url: https://quarkus.io/guides/openapi-swaggerui
-  message: Replace `springdoc.swagger-ui.path` with `quarkus.swagger-ui.path`. By
-    adding `quarkus.swagger-ui.always-include=true` Quarkus will always expose the
-    Swagger UI endpoint.. It is only exposed in Dev mode by default.
+  message: "\n Replace `springdoc.swagger-ui.path` with `quarkus.swagger-ui.path`\n
+    \n By adding `quarkus.swagger-ui.always-include=true` Quarkus will always expose
+    the Swagger UI endpoint. \n It is only exposed in Dev mode by default.\n "
   ruleID: springboot-properties-to-quarkus-00005
   when:
     builtin.filecontent:
@@ -119,9 +110,7 @@
       pattern: springdoc.swagger-ui.path
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace Spring OpenAPI endpoint mapping
-    Replace `springdoc.api-docs.path` with `quarkus.smallrye-openapi.path`
+  description: Replace Spring OpenAPI endpoint mapping
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -129,7 +118,8 @@
   links:
   - title: Quarkus Guide - using OpenAPI and Swagger
     url: https://quarkus.io/guides/openapi-swaggerui
-  message: Replace `springdoc.api-docs.path` with `quarkus.smallrye-openapi.path`
+  message: "\n Replace `springdoc.api-docs.path` with `quarkus.smallrye-openapi.path`\n
+    \n "
   ruleID: springboot-properties-to-quarkus-00006
   when:
     builtin.filecontent:
diff --git a/default/generated/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml b/default/generated/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml
index eb386970..cb079141 100644
--- a/default/generated/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot context artifact with Quarkus 'spring-scheduled' extension
-    Replace the Spring Context artifact with Quarkus `spring-scheduled` extension. Spring Scheduled is in spring-context artifact brought transitively by any `org.springframework.boot:spring-boot-*` dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-scheduled`
+  description: Replace the SpringBoot context artifact with Quarkus 'spring-scheduled'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,9 +9,10 @@
   links:
   - title: Quarkus Spring Scheduled Guide
     url: https://quarkus.io/guides/spring-scheduled
-  message: Replace the Spring Context artifact with Quarkus `spring-scheduled` extension.
-    Spring Scheduled is in spring-context artifact brought transitively by any `org.springframework.boot:spring-boot-*`
-    dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-scheduled`
+  message: "\n Replace the Spring Context artifact with Quarkus `spring-scheduled`
+    extension\n\n Spring Scheduled is in spring-context artifact brought transitively
+    by any `org.springframework.boot:spring-boot-*` dependency\n Add Quarkus dependency
+    `io.quarkus:quarkus-spring-scheduled`\n "
   ruleID: springboot-scheduled-to-quarkus-00000
   when:
     java.referenced:
diff --git a/default/generated/quarkus/181-springboot-security-to-quarkus.windup.yaml b/default/generated/quarkus/181-springboot-security-to-quarkus.windup.yaml
index fa89c4e7..847a8f38 100644
--- a/default/generated/quarkus/181-springboot-security-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/181-springboot-security-to-quarkus.windup.yaml
@@ -1,8 +1,7 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot Security artifact with Quarkus 'spring-security' extension
-    Replace the SpringBoot Security artifact with Quarkus `spring-security` extension. Spring Security is in spring-security-core artifact brought transitively by `org.springframework.boot:spring-boot-starter-security` dependency.. Add Quarkus dependency `io.quarkus:quarkus-spring-security`
+  description: Replace the SpringBoot Security artifact with Quarkus 'spring-security'
+    extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -10,10 +9,10 @@
   links:
   - title: Quarkus Extension for Spring Security API Guide
     url: https://quarkus.io/guides/spring-security
-  message: Replace the SpringBoot Security artifact with Quarkus `spring-security`
-    extension. Spring Security is in spring-security-core artifact brought transitively
-    by `org.springframework.boot:spring-boot-starter-security` dependency.. Add Quarkus
-    dependency `io.quarkus:quarkus-spring-security`
+  message: "\n Replace the SpringBoot Security artifact with Quarkus `spring-security`
+    extension\n\n Spring Security is in spring-security-core artifact brought transitively
+    by `org.springframework.boot:spring-boot-starter-security` dependency. \n Add
+    Quarkus dependency `io.quarkus:quarkus-spring-security`\n "
   ruleID: springboot-security-to-quarkus-00000
   when:
     or:
diff --git a/default/generated/quarkus/182-springboot-shell-to-quarkus.windup.yaml b/default/generated/quarkus/182-springboot-shell-to-quarkus.windup.yaml
index caee1686..3a572c68 100644
--- a/default/generated/quarkus/182-springboot-shell-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/182-springboot-shell-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the SpringBoot Shell artifact with Quarkus 'picocli' extension
-    Replace the SpringBoot Shell artifacts with Quarkus `picocli` extension. Add Quarkus dependency `io.quarkus:quarkus-picocli`. PicoCli provides command-line mode like Spring Shell but does not reuse the Spring interfaces. therefore re-coding is also required to use the appropriate PicoCli interfaces.
+  description: Replace the SpringBoot Shell artifact with Quarkus 'picocli' extension
   effort: 3
   labels:
   - konveyor.io/source=springboot
@@ -12,10 +10,10 @@
     url: https://quarkus.io/guides/picocli
   - title: Spring Shell Guide
     url: https://spring.io/projects/spring-shell/
-  message: Replace the SpringBoot Shell artifacts with Quarkus `picocli` extension.
-    Add Quarkus dependency `io.quarkus:quarkus-picocli`. PicoCli provides command-line
-    mode like Spring Shell but does not reuse the Spring interfaces. therefore re-coding
-    is also required to use the appropriate PicoCli interfaces.
+  message: "\n Replace the SpringBoot Shell artifacts with Quarkus `picocli` extension\n\n
+    Add Quarkus dependency `io.quarkus:quarkus-picocli`\n\n PicoCli provides command-line
+    mode like Spring Shell but does not reuse the Spring interfaces\n therefore re-coding
+    is also required to use the appropriate PicoCli interfaces.\n "
   ruleID: springboot-shell-to-quarkus-00000
   when:
     java.dependency:
diff --git a/default/generated/quarkus/183-springboot-web-to-quarkus.windup.yaml b/default/generated/quarkus/183-springboot-web-to-quarkus.windup.yaml
index 53c916e5..b9385413 100644
--- a/default/generated/quarkus/183-springboot-web-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/183-springboot-web-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Replace the Spring Web artifact with Quarkus 'spring-web' extension
-    Replace the Spring Web artifact with Quarkus `spring-web` extension. Spring Web is a spring-web artifact brought transitively by any `org.springframework:spring-web*` dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-web`. Starting with Quarkus version 2.5, the underlying JAX-RS engine must be chosen. For performance reasons,. the `quarkus-resteasy-reactive-jackson` dependency should be used.
+  description: Replace the Spring Web artifact with Quarkus 'spring-web' extension
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -12,11 +10,11 @@
     url: https://quarkus.io/guides/spring-web
   - title: Quarkus Migration Guide 2.5
     url: https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.5#spring-web
-  message: Replace the Spring Web artifact with Quarkus `spring-web` extension. Spring
-    Web is a spring-web artifact brought transitively by any `org.springframework:spring-web*`
-    dependency. Add Quarkus dependency `io.quarkus:quarkus-spring-web`. Starting with
-    Quarkus version 2.5, the underlying JAX-RS engine must be chosen. For performance
-    reasons,. the `quarkus-resteasy-reactive-jackson` dependency should be used.
+  message: "\n Replace the Spring Web artifact with Quarkus `spring-web` extension\n\n
+    Spring Web is a spring-web artifact brought transitively by any `org.springframework:spring-web*`
+    dependency \n Add Quarkus dependency `io.quarkus:quarkus-spring-web` \n \n Starting
+    with Quarkus version 2.5, the underlying JAX-RS engine must be chosen. For performance
+    reasons,\n the `quarkus-resteasy-reactive-jackson` dependency should be used.\n "
   ruleID: springboot-web-to-quarkus-00000
   when:
     or:
@@ -31,9 +29,7 @@
         name: org.springframework.spring-web
 - category: mandatory
   customVariables: []
-  description: |-
-    Add the Quarkus 'quarkus-resteasy-reactive-jackson' dependency
-    Add the Quarkus `quarkus-resteasy-reactive-jackson` dependency.. Starting with Quarkus version 2.5, the underlying JAX-RS engine must be chosen. For performance reasons,. the `quarkus-resteasy-reactive-jackson` dependency should be used."
+  description: Add the Quarkus 'quarkus-resteasy-reactive-jackson' dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -41,9 +37,10 @@
   links:
   - title: Quarkus Migration Guide 2.5
     url: https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.5#spring-web
-  message: Add the Quarkus `quarkus-resteasy-reactive-jackson` dependency.. Starting
-    with Quarkus version 2.5, the underlying JAX-RS engine must be chosen. For performance
-    reasons,. the `quarkus-resteasy-reactive-jackson` dependency should be used."
+  message: "\n Add the Quarkus `quarkus-resteasy-reactive-jackson` dependency.\n\n
+    Starting with Quarkus version 2.5, the underlying JAX-RS engine must be chosen.
+    For performance reasons,\n the `quarkus-resteasy-reactive-jackson` dependency
+    should be used.\"\n "
   ruleID: springboot-web-to-quarkus-00010
   when:
     or:
diff --git a/default/generated/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml b/default/generated/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml
index 5c3d3a72..0592c0f4 100644
--- a/default/generated/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml
+++ b/default/generated/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Spring MVC is not supported by Quarkus
-    Spring MVC is not supported by Quarkus. Use the following link to figure out the supported Spring Web functionalities.
+  description: Spring MVC is not supported by Quarkus
   effort: 13
   labels:
   - konveyor.io/source=springboot
@@ -10,8 +8,8 @@
   links:
   - title: Quarkus - Supported Spring Web functionalities
     url: https://quarkus.io/guides/spring-web#supported-spring-web-functionalities
-  message: Spring MVC is not supported by Quarkus. Use the following link to figure
-    out the supported Spring Web functionalities.
+  message: "\n Spring MVC is not supported by Quarkus\n\n Use the following link to
+    figure out the supported Spring Web functionalities.\n "
   ruleID: springboot-webmvc-to-quarkus-00000
   when:
     java.referenced:
@@ -19,9 +17,7 @@
       pattern: org.springframework.web.servlet.mvc.Controller
 - category: mandatory
   customVariables: []
-  description: |-
-    Spring WebFlux is not supported by Quarkus
-    Spring WebFlux is not supported by Quarkus. If the application needs a reactive stack, please refer to the following links to get more information.
+  description: Spring WebFlux is not supported by Quarkus
   effort: 13
   labels:
   - konveyor.io/source=springboot
@@ -31,8 +27,8 @@
     url: https://quarkus.io/guides/vertx
   - title: Quarkus - Using Reactive Routes
     url: https://quarkus.io/guides/reactive-routes
-  message: Spring WebFlux is not supported by Quarkus. If the application needs a
-    reactive stack, please refer to the following links to get more information.
+  message: "\n Spring WebFlux is not supported by Quarkus\n\n If the application needs
+    a reactive stack, please refer to the following links to get more information.\n "
   ruleID: springboot-webmvc-to-quarkus-01000
   when:
     or:
diff --git a/default/generated/quarkus/ruleset.yaml b/default/generated/quarkus/ruleset.yaml
index e7cd9e61..39fab903 100644
--- a/default/generated/quarkus/ruleset.yaml
+++ b/default/generated/quarkus/ruleset.yaml
@@ -1,3 +1,2 @@
 name: quarkus/springboot
-description: This ruleset gives hints to migrate from Spring Scheduled to Quarkus
-  spring-scheduled extension
+description: This ruleset gives hints to migrate from SpringBoot Integration to Quarkus
diff --git a/default/generated/rhr/185-springboot-associated-artifacts.rhamt.yaml b/default/generated/rhr/185-springboot-associated-artifacts.rhamt.yaml
index 76efa7b2..76940915 100644
--- a/default/generated/rhr/185-springboot-associated-artifacts.rhamt.yaml
+++ b/default/generated/rhr/185-springboot-associated-artifacts.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of AMQP SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of AMQP SpringBoot starter
+  description: Unsupported version of AMQP SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -21,9 +19,7 @@
       upperbound: 2.2.1
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of CXF JAXRS SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of CXF JAXRS SpringBoot starter
+  description: Unsupported version of CXF JAXRS SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -42,9 +38,7 @@
       name: org.apache.cxf.cxf-spring-boot-starter-jaxrs
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of Resteasy SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of Resteasy SpringBoot starter
+  description: Unsupported version of Resteasy SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -63,9 +57,7 @@
       upperbound: 3.4.0
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of Infinispan SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of Infinispan SpringBoot starter
+  description: Unsupported version of Infinispan SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -84,9 +76,7 @@
       upperbound: 2.2.2
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of Keycloak SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of Keycloak SpringBoot starter
+  description: Unsupported version of Keycloak SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -105,9 +95,7 @@
       upperbound: 9.0.2
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of Narayana SpringBoot starter
-    Check the links below for the Red Hat Runtimes supported version of Narayana SpringBoot starter
+  description: Unsupported version of Narayana SpringBoot starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -126,9 +114,7 @@
       upperbound: 2.2.0
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of OpenTracing Spring Jaeger SpringBoot web starter
-    Check the links below for the Red Hat Runtimes supported version of OpenTracing Spring Jaeger SpringBoot web starter
+  description: Unsupported version of OpenTracing Spring Jaeger SpringBoot web starter
   effort: 1
   labels:
   - konveyor.io/source=springboot
@@ -147,17 +133,15 @@
       upperbound: 3.1.0
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported AMQP dependency
-    Migrate `org.amqphub.spring:amqp-10-jms-spring-boot-starter` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported AMQP dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.amqphub.spring:amqp-10-jms-spring-boot-starter` dependency
+  message: "Migrate `org.amqphub.spring:amqp-10-jms-spring-boot-starter` dependency
     to a version compatible with the supported versions of the RHOAR components provided
-    in the link.
+    in the link.\n "
   ruleID: springboot-associated-00008
   when:
     as: dependencies-block
@@ -171,17 +155,15 @@
         'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported CXF JAX-RS dependency
-    Migrate `org.apache.cxf:cxf-spring-boot-starter-jaxrs` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported CXF JAX-RS dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.apache.cxf:cxf-spring-boot-starter-jaxrs` dependency to a
+  message: "Migrate `org.apache.cxf:cxf-spring-boot-starter-jaxrs` dependency to a
     version compatible with the supported versions of the RHOAR components provided
-    in the link.
+    in the link.\n "
   ruleID: springboot-associated-00009
   when:
     as: dependencies-block
@@ -194,17 +176,15 @@
         and ../m:artifactId='cxf-spring-boot-starter-jaxrs' and not(contains(., 'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported RestEasy dependency
-    Migrate `org.jboss.resteasy:resteasy-spring-boot-starter` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported RestEasy dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.jboss.resteasy:resteasy-spring-boot-starter` dependency to
+  message: "Migrate `org.jboss.resteasy:resteasy-spring-boot-starter` dependency to
     a version compatible with the supported versions of the RHOAR components provided
-    in the link.
+    in the link.\n "
   ruleID: springboot-associated-00010
   when:
     as: dependencies-block
@@ -217,17 +197,15 @@
         and ../m:artifactId='resteasy-spring-boot-starter' and not(contains(., 'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported Infinispan embedded dependency
-    Migrate `org.infinispan:infinispan-spring-boot-starter-embedded` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported Infinispan embedded dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.infinispan:infinispan-spring-boot-starter-embedded` dependency
+  message: "Migrate `org.infinispan:infinispan-spring-boot-starter-embedded` dependency
     to a version compatible with the supported versions of the RHOAR components provided
-    in the link.
+    in the link.\n "
   ruleID: springboot-associated-00011
   when:
     as: dependencies-block
@@ -241,17 +219,15 @@
         'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported Infinispan remote dependency
-    Migrate `org.infinispan:infinispan-spring-boot-starter-remote` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported Infinispan remote dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.infinispan:infinispan-spring-boot-starter-remote` dependency
+  message: "Migrate `org.infinispan:infinispan-spring-boot-starter-remote` dependency
     to a version compatible with the supported versions of the RHOAR components provided
-    in the link.
+    in the link.\n "
   ruleID: springboot-associated-00012
   when:
     as: dependencies-block
@@ -265,17 +241,15 @@
         'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported Keycloak dependency
-    Migrate `org.keycloak:keycloak-spring-boot-starter` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported Keycloak dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `org.keycloak:keycloak-spring-boot-starter` dependency to a version
+  message: "Migrate `org.keycloak:keycloak-spring-boot-starter` dependency to a version
     compatible with the supported versions of the RHOAR components provided in the
-    link.
+    link.\n "
   ruleID: springboot-associated-00013
   when:
     as: dependencies-block
@@ -288,17 +262,15 @@
         and ../m:artifactId='keycloak-spring-boot-starter' and not(contains(., 'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported Narayana dependency
-    Migrate `me.snowdrop:narayana-spring-boot-starter` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported Narayana dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `me.snowdrop:narayana-spring-boot-starter` dependency to a version
+  message: "Migrate `me.snowdrop:narayana-spring-boot-starter` dependency to a version
     compatible with the supported versions of the RHOAR components provided in the
-    link.
+    link.\n "
   ruleID: springboot-associated-00014
   when:
     as: dependencies-block
@@ -311,17 +283,15 @@
         and ../m:artifactId='narayana-spring-boot-starter' and not(contains(., 'redhat'))]
 - category: optional
   customVariables: []
-  description: |-
-    Migrate to a supported Spring Jaeger dependency
-    Migrate `io.opentracing.contrib:opentracing-spring-jaeger-web-starter` dependency to a version compatible with the supported versions of the RHOAR components provided in the link.
+  description: Migrate to a supported Spring Jaeger dependency
   effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=rhr
   links: []
-  message: Migrate `io.opentracing.contrib:opentracing-spring-jaeger-web-starter`
+  message: "Migrate `io.opentracing.contrib:opentracing-spring-jaeger-web-starter`
     dependency to a version compatible with the supported versions of the RHOAR components
-    provided in the link.
+    provided in the link.\n "
   ruleID: springboot-associated-00015
   when:
     as: dependencies-block
diff --git a/default/generated/rhr/186-springboot.rhamt.yaml b/default/generated/rhr/186-springboot.rhamt.yaml
index e6c6ebe2..87cc0d6b 100644
--- a/default/generated/rhr/186-springboot.rhamt.yaml
+++ b/default/generated/rhr/186-springboot.rhamt.yaml
@@ -1,8 +1,6 @@
 - category: mandatory
   customVariables: []
-  description: |-
-    Unsupported version of Spring Boot
-    Spring Boot has to be updated to Spring Boot 2.2.6 before being able to be migrated to a version supported by Red Hat Runtimes
+  description: Unsupported version of Spring Boot
   effort: 3
   labels:
   - konveyor.io/source=springboot
@@ -19,9 +17,7 @@
       upperbound: 2.2.5.RELEASE
 - category: potential
   customVariables: []
-  description: |-
-    Unsupported version of Spring Boot
-    Spring Boot has to be updated to a version supported by Red Hat Runtimes
+  description: Unsupported version of Spring Boot
   effort: 1
   labels:
   - konveyor.io/source=springboot
diff --git a/default/generated/technology-usage/02-web-technology-usage.windup.yaml b/default/generated/technology-usage/02-web-technology-usage.windup.yaml
index 42a2a1a8..8a57106d 100644
--- a/default/generated/technology-usage/02-web-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/02-web-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -12,6 +13,7 @@
       filePattern: .*\.(jsp|xhtml|jspx)
       pattern: (java\.sun\.com/jsf/)|(xmlns\.jcp\.org/jsf)
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -29,6 +31,7 @@
         filePattern: .*\.(jsp|jspx|tag|tagx)
         pattern: <%@\s*taglib\s+[^>]*\s*uri\s*=\s*['"]([^'"]+)['"].*?%>
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -42,6 +45,7 @@
       location: ANNOTATION
       pattern: javax.websocket.server.ServerEndpoint
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -58,6 +62,7 @@
     - builtin.file:
         pattern: .*applet.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -70,6 +75,7 @@
     builtin.file:
       pattern: .*\.jnlp
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -85,6 +91,7 @@
     - builtin.file:
         pattern: .*webstart.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -97,6 +104,7 @@
     builtin.file:
       pattern: .*swing.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -109,6 +117,7 @@
     builtin.file:
       pattern: .*miglayout.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -121,6 +130,7 @@
     builtin.file:
       pattern: .*jgoodies.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -133,6 +143,7 @@
     builtin.file:
       pattern: .*formlayoutmakerx.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -145,6 +156,7 @@
     builtin.file:
       pattern: .*magicgrouplayout.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -157,6 +169,7 @@
     builtin.file:
       pattern: .*swt.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -169,6 +182,7 @@
     builtin.file:
       pattern: .*javafx.*\.jar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/04-test-frameworks-technology-usage.windup.yaml b/default/generated/technology-usage/04-test-frameworks-technology-usage.windup.yaml
index b2856b37..d81d78cf 100644
--- a/default/generated/technology-usage/04-test-frameworks-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/04-test-frameworks-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - EasyMock
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - PowerMock
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Mockito
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - TestNG
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - Hamcrest
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Spock
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - XMLUnit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Akka Testkit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - REST Assured
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - DbUnit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Mule Functional Test Framework
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - Guava Testing
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - RandomizedTesting Runner
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - HttpUnit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - JCunit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - JPA Matchers
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - MultithreadedTC
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -215,6 +233,7 @@
     builtin.hasTags:
     - Specsy
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -227,6 +246,7 @@
     builtin.hasTags:
     - JFunk
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -239,6 +259,7 @@
     builtin.hasTags:
     - Restito
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -251,6 +272,7 @@
     builtin.hasTags:
     - Test Interface
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -263,6 +285,7 @@
     builtin.hasTags:
     - Play Test
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -275,6 +298,7 @@
     builtin.hasTags:
     - Arquillian
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -287,6 +311,7 @@
     builtin.hasTags:
     - Cactus
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -299,6 +324,7 @@
     builtin.hasTags:
     - Concordion
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -311,6 +337,7 @@
     builtin.hasTags:
     - Cucumber
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -323,6 +350,7 @@
     builtin.hasTags:
     - EtlUnit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -335,6 +363,7 @@
     builtin.hasTags:
     - HavaRunner
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -347,6 +376,7 @@
     builtin.hasTags:
     - JBehave
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -359,6 +389,7 @@
     builtin.hasTags:
     - JMock
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -371,6 +402,7 @@
     builtin.hasTags:
     - JMockit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -383,6 +415,7 @@
     builtin.hasTags:
     - Jukito
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -395,6 +428,7 @@
     builtin.hasTags:
     - Needle
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -407,6 +441,7 @@
     builtin.hasTags:
     - OpenPojo
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -419,6 +454,7 @@
     builtin.hasTags:
     - Unitils
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -431,6 +467,7 @@
     builtin.hasTags:
     - Spring Test
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/07-security-technology-usage.windup.yaml b/default/generated/technology-usage/07-security-technology-usage.windup.yaml
index 430f8c2b..fe163026 100644
--- a/default/generated/technology-usage/07-security-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/07-security-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -27,6 +28,7 @@
         namespaces: {}
         xpath: //*[local-name() = 'login-config']/*[local-name() = 'realm']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -39,6 +41,7 @@
     builtin.hasTags:
     - Spring Security
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -51,6 +54,7 @@
     builtin.hasTags:
     - Apache Shiro
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -63,6 +67,7 @@
     builtin.hasTags:
     - Hdiv
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -75,6 +80,7 @@
     builtin.hasTags:
     - OACC
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -87,6 +93,7 @@
     builtin.hasTags:
     - PicketLink
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -99,6 +106,7 @@
     builtin.hasTags:
     - PicketBox
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -111,6 +119,7 @@
     builtin.hasTags:
     - Keyczar
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -123,6 +132,7 @@
     builtin.hasTags:
     - XACML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -135,6 +145,7 @@
     builtin.hasTags:
     - SAML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -147,6 +158,7 @@
     builtin.hasTags:
     - Bouncy Castle
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -159,6 +171,7 @@
     builtin.hasTags:
     - Jasypt
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -171,6 +184,7 @@
     builtin.hasTags:
     - Apache Santuario
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -183,6 +197,7 @@
     builtin.hasTags:
     - SSL
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -195,6 +210,7 @@
     builtin.hasTags:
     - Vlad
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -207,6 +223,7 @@
     builtin.hasTags:
     - Apache Commons Validator
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -219,6 +236,7 @@
     builtin.hasTags:
     - OWASP ESAPI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -231,6 +249,7 @@
     builtin.hasTags:
     - WSS4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -243,6 +262,7 @@
     builtin.hasTags:
     - OpenSAML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -255,6 +275,7 @@
     builtin.hasTags:
     - OTR4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -267,6 +288,7 @@
     builtin.hasTags:
     - OWASP CSRF Guard
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -279,6 +301,7 @@
     builtin.hasTags:
     - OAUTH
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -291,6 +314,7 @@
     builtin.hasTags:
     - Acegi Security
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -303,6 +327,7 @@
     builtin.hasTags:
     - JSecurity
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -315,6 +340,7 @@
     builtin.hasTags:
     - AcrIS Security
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/09-observability-technology-usage.windup.yaml b/default/generated/technology-usage/09-observability-technology-usage.windup.yaml
index 8cd23457..0bc978c7 100644
--- a/default/generated/technology-usage/09-observability-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/09-observability-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Spring Boot Actuator
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml b/default/generated/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml
index ee84941f..ec6fad7c 100644
--- a/default/generated/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml
+++ b/default/generated/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - EJB XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Hibernate Cfg
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Hibernate Mapping
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - JBoss EJB XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - JBoss Web XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - JDBC
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - JPA XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Orion EJB XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - Orion Web XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Properties
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Seam
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - WebLogic Web XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - WebSphere EJB
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - WebSphere EJB Ext
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - WebSphere Web XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - WebSphere WS Binding
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/12-mvc-technology-usage.windup.yaml b/default/generated/technology-usage/12-mvc-technology-usage.windup.yaml
index 4264c9dd..46d04313 100644
--- a/default/generated/technology-usage/12-mvc-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/12-mvc-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Apache Wicket
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Apache Struts
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Spring MVC
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - GWT
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - MyFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - RichFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - JSF
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Apache Tapestry
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - Stripes
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Spark
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Vaadin
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - Grails
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - Play
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - Oracle ADF
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - PrimeFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - JSTL
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - OpenFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -215,6 +233,7 @@
     builtin.hasTags:
     - JFreeChart
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -227,6 +246,7 @@
     builtin.hasTags:
     - BootsFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -239,6 +259,7 @@
     builtin.hasTags:
     - ICEfaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -251,6 +272,7 @@
     builtin.hasTags:
     - BabbageFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -263,6 +285,7 @@
     builtin.hasTags:
     - Portlet
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -275,6 +298,7 @@
     builtin.hasTags:
     - AngularFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -287,6 +311,7 @@
     builtin.hasTags:
     - LiferayFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -299,6 +324,7 @@
     builtin.hasTags:
     - Liferay
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -311,6 +337,7 @@
     builtin.hasTags:
     - ButterFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -323,6 +350,7 @@
     builtin.hasTags:
     - HighFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -335,6 +363,7 @@
     builtin.hasTags:
     - TieFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -347,6 +376,7 @@
     builtin.hasTags:
     - OmniFaces
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -359,6 +389,7 @@
     builtin.hasTags:
     - UberFire
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -371,6 +402,7 @@
     builtin.hasTags:
     - Velocity
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -383,6 +415,7 @@
     builtin.hasTags:
     - Thymeleaf
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -395,6 +428,7 @@
     builtin.hasTags:
     - FreeMarker
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -407,6 +441,7 @@
     builtin.hasTags:
     - ANTLR StringTemplate
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -419,6 +454,7 @@
     builtin.hasTags:
     - Handlebars
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -431,6 +467,7 @@
     builtin.hasTags:
     - JMustache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -443,6 +480,7 @@
     builtin.hasTags:
     - Jamon
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -455,6 +493,7 @@
     builtin.hasTags:
     - Twirl
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -467,6 +506,7 @@
     builtin.hasTags:
     - Scalate
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -479,6 +519,7 @@
     builtin.hasTags:
     - Rythm Template Engine
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -491,6 +532,7 @@
     builtin.hasTags:
     - Trimou
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -503,6 +545,7 @@
     builtin.hasTags:
     - Jetbrick Template
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -515,6 +558,7 @@
     builtin.hasTags:
     - Chunk Templates
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -527,6 +571,7 @@
     builtin.hasTags:
     - JSilver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -539,6 +584,7 @@
     builtin.hasTags:
     - Water Template Engine
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -551,6 +597,7 @@
     builtin.hasTags:
     - Ickenham
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -563,6 +610,7 @@
     builtin.hasTags:
     - Mixer
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -575,6 +623,7 @@
     builtin.hasTags:
     - Webmacro
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -587,6 +636,7 @@
     builtin.hasTags:
     - DVSL
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -599,6 +649,7 @@
     builtin.hasTags:
     - Snippetory Template Engine
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/14-markup-technology-usage.windup.yaml b/default/generated/technology-usage/14-markup-technology-usage.windup.yaml
index 215f2220..ffdf314e 100644
--- a/default/generated/technology-usage/14-markup-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/14-markup-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/16-logging-technology-usage.windup.yaml b/default/generated/technology-usage/16-logging-technology-usage.windup.yaml
index 1d076e02..0faa3327 100644
--- a/default/generated/technology-usage/16-logging-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/16-logging-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Apache Log4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Apache Commons Logging
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - SLF4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - tinylog
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - Logback
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Logging to file system
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - Logging to Socket Handler
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - JBoss logging
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - Monolog
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Jcabi Log
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - NLOG4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - Log4s
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - Kotlin Logging
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - Airlift Log Manager
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - MinLog
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - Logging Utils
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - OCPsoft Logging Utils
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -215,6 +233,7 @@
     builtin.hasTags:
     - Scribe
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -227,6 +246,7 @@
     builtin.hasTags:
     - GFC Logging
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -239,6 +259,7 @@
     builtin.hasTags:
     - Blitz4j
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -251,6 +272,7 @@
     builtin.hasTags:
     - Avalon Logkit
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -263,6 +285,7 @@
     builtin.hasTags:
     - KLogger
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -275,6 +298,7 @@
     builtin.hasTags:
     - Lumberjack
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -287,6 +311,7 @@
     builtin.hasTags:
     - Log.io
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -299,6 +324,7 @@
     builtin.hasTags:
     - OPS4J Pax Logging Service
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -311,6 +337,7 @@
     builtin.hasTags:
     - OW2 Log Util
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -323,6 +350,7 @@
     builtin.hasTags:
     - Twitter Util Logging
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -335,6 +363,7 @@
     builtin.hasTags:
     - Composite Logging JCL
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/18-jta-technology-usage.windup.yaml b/default/generated/technology-usage/18-jta-technology-usage.windup.yaml
index de614323..9f3eeafe 100644
--- a/default/generated/technology-usage/18-jta-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/18-jta-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -10,6 +11,7 @@
   when:
     or: []
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -22,6 +24,7 @@
     builtin.hasTags:
     - Mycontainer JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -34,6 +37,7 @@
     builtin.hasTags:
     - Geronimo JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -46,6 +50,7 @@
     builtin.hasTags:
     - OW2 JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -58,6 +63,7 @@
     builtin.hasTags:
     - Evo JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -70,6 +76,7 @@
     builtin.hasTags:
     - AKKA JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -82,6 +89,7 @@
     builtin.hasTags:
     - KumuluzEE JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -94,6 +102,7 @@
     builtin.hasTags:
     - Ignite JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -106,6 +115,7 @@
     builtin.hasTags:
     - Nuxeo JTA/JCA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -118,6 +128,7 @@
     builtin.hasTags:
     - Everit JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -130,6 +141,7 @@
     builtin.hasTags:
     - Demoiselle JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -142,6 +154,7 @@
     builtin.hasTags:
     - Apache Meecrowave JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -154,6 +167,7 @@
     builtin.hasTags:
     - Apache Sirona JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -166,6 +180,7 @@
     builtin.hasTags:
     - Lift JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -178,6 +193,7 @@
     builtin.hasTags:
     - WF Core JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -190,6 +206,7 @@
     builtin.hasTags:
     - Java Transaction API
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -202,6 +219,7 @@
     builtin.hasTags:
     - JBoss Transactions
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -214,6 +232,7 @@
     builtin.hasTags:
     - GlassFish JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -226,6 +245,7 @@
     builtin.hasTags:
     - Atomikos JTA
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -238,6 +258,7 @@
     builtin.hasTags:
     - Narayana Arjuna
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/188-3rd-party.windup.yaml b/default/generated/technology-usage/188-3rd-party.windup.yaml
index af59c784..8ba550ad 100644
--- a/default/generated/technology-usage/188-3rd-party.windup.yaml
+++ b/default/generated/technology-usage/188-3rd-party.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Liferay
     The application embeds the Liferay framework.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*liferay.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Oracle Forms
     The application embeds the Oracle Forms framework.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: .*frm.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Boot
     The application embeds the Spring Boot framework.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: spring-boot.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Elasticsearch
     The application embeds the Elasticsearch framework.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: .*elasticsearch.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Logstash
     The application embeds the Logstash framework.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: .*logstash.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Jetty
     The application embeds the Jetty framework.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: .*jetty.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Tomcat
     The application embeds the Tomcat framework.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: .*tomcat.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Kibana
     The application embeds the Kibana framework.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: .*kibana.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Karaf
     The application embeds the Apache Karaf framework.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: .*karaf.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Neo4j
     The application embeds the Neo4j framework.
   labels:
@@ -139,7 +139,7 @@
     builtin.file:
       pattern: .*neo4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spark
     The application embeds the Spark framework.
   labels:
@@ -153,7 +153,7 @@
     builtin.file:
       pattern: .*spark-.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Hadoop
     The application embeds the Apache Hadoop framework.
   labels:
@@ -167,7 +167,7 @@
     builtin.file:
       pattern: .*hadoop.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Geronimo
     The application embeds the Apache Geronimo framework.
   labels:
@@ -181,7 +181,7 @@
     builtin.file:
       pattern: .*geronimo.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Aries
     The application embeds the Apache Aries framework.
   labels:
@@ -195,7 +195,7 @@
     builtin.file:
       pattern: .*aries.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Cloudera
     The application embeds the Cloudera framework.
   labels:
@@ -209,7 +209,7 @@
     builtin.file:
       pattern: .*cloudera.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - MapR
     The application embeds the MapR framework.
   labels:
@@ -223,7 +223,7 @@
     builtin.file:
       pattern: .*mapr.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - TensorFlow
     The application embeds the TensorFlow framework.
   labels:
@@ -237,7 +237,7 @@
     builtin.file:
       pattern: .*tensorflow.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Weka
     The application embeds the Weka framework.
   labels:
@@ -251,7 +251,7 @@
     builtin.file:
       pattern: .*weka.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Mahout
     The application embeds the Apache Mahout framework.
   labels:
diff --git a/default/generated/technology-usage/190-clustering.windup.yaml b/default/generated/technology-usage/190-clustering.windup.yaml
index 8b87cae0..221b7038 100644
--- a/default/generated/technology-usage/190-clustering.windup.yaml
+++ b/default/generated/technology-usage/190-clustering.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
         w: http://java.sun.com/xml/ns/javaee
       xpath: /w:web-app/w:distributable
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/192-configuration-management.windup.yaml b/default/generated/technology-usage/192-configuration-management.windup.yaml
index 58c04f71..91b20d63 100644
--- a/default/generated/technology-usage/192-configuration-management.windup.yaml
+++ b/default/generated/technology-usage/192-configuration-management.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Spring Cloud Config
     The application embeds Spring Cloud Config.
   labels:
@@ -18,7 +18,7 @@
         lowerbound: 0.0.0
         name: org.springframework.cloud.spring-cloud-config-client
 - customVariables: []
-  description: |
+  description: |-
     Application properties file detected
     Application properties file detected
   labels:
@@ -32,7 +32,7 @@
     builtin.file:
       pattern: application.*\.(properties|yml|yaml)
 - customVariables: []
-  description: |
+  description: |-
     Spring datasource properties detected
     Spring datasource properties detected
   labels:
@@ -47,7 +47,7 @@
       filePattern: application.*\.(properties|yml|yaml)
       pattern: spring.datasource
 - customVariables: []
-  description: |
+  description: |-
     Spring logging properties detected
     Spring logging properties detected
   labels:
@@ -62,7 +62,7 @@
       filePattern: application.*\.(properties|yml|yaml)
       pattern: logging.level.org.springframework
 - customVariables: []
-  description: |
+  description: |-
     Spring configuration properties annotation detected
     Spring configuration properties annotation detected
   labels:
diff --git a/default/generated/technology-usage/194-connect.windup.yaml b/default/generated/technology-usage/194-connect.windup.yaml
index 95c0acd0..220c9243 100644
--- a/default/generated/technology-usage/194-connect.windup.yaml
+++ b/default/generated/technology-usage/194-connect.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded Resource Adapter
     The application embeds a resource adapter.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*\.rar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - ActiveMQ
     The application embeds an ActiveMQ client library.
   labels:
@@ -31,7 +31,7 @@
     builtin.file:
       pattern: .*activemq.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OpenWS
     The application embeds an OpenWS library.
   labels:
@@ -45,7 +45,7 @@
     builtin.file:
       pattern: .*openws.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - WSDL
     The application embeds a WSDL library.
   labels:
@@ -59,7 +59,7 @@
     builtin.file:
       pattern: .*wsdl.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - RabbitMQ Client
     The application embeds a RabbitMQ client library.
   labels:
@@ -86,7 +86,7 @@
     - builtin.file:
         pattern: .*conduit.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Spring Messaging Client
     The application embeds a Spring Messaging client library.
   labels:
@@ -107,7 +107,7 @@
     - builtin.file:
         pattern: .*spring-jms.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Camel Messaging Client
     The application embeds a Camel Messaging client library.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: .*camel-jms.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Amazon SQS Client
     The application embeds a Amazon SQS client library.
   labels:
@@ -143,7 +143,7 @@
     builtin.file:
       pattern: .*aws-java-sdk-sqs.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - HornetQ Client
     The application embeds a HornetQ client library.
   labels:
@@ -161,7 +161,7 @@
     builtin.file:
       pattern: .*hornetq.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - AMQP Client
     The application embeds an AMQP client library.
   labels:
@@ -179,7 +179,7 @@
     builtin.file:
       pattern: .*amqp.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - RocketMQ Client
     The application embeds a RocketMQ client library.
   labels:
@@ -197,7 +197,7 @@
     builtin.file:
       pattern: .*rocketmq-client.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - 0MQ Client
     The application embeds a 0MQ client library.
   labels:
@@ -218,7 +218,7 @@
     - builtin.file:
         pattern: .*jeromq.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JBossMQ Client
     The application embeds a JBossMQ client library.
   labels:
@@ -236,7 +236,7 @@
     builtin.file:
       pattern: .*jbossmq-client.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Zbus Client
     The application embeds a Zbus client library.
   labels:
@@ -254,7 +254,7 @@
     builtin.file:
       pattern: .*zbus-client.*
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Qpid Client
     The application embeds a Qpid client library.
   labels:
diff --git a/default/generated/technology-usage/196-database.windup.yaml b/default/generated/technology-usage/196-database.windup.yaml
index 6d2dc28b..eb2ec998 100644
--- a/default/generated/technology-usage/196-database.windup.yaml
+++ b/default/generated/technology-usage/196-database.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded HSQLDB Driver
     The application embeds an HSQLDB driver.
   labels:
@@ -17,7 +17,7 @@
     builtin.file:
       pattern: .*hsqldb.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded MySQL Driver
     The application embeds an MySQL driver.
   labels:
@@ -35,7 +35,7 @@
     builtin.file:
       pattern: .*mysql-connector.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Derby Driver
     The application embeds an Derby driver.
   labels:
@@ -53,7 +53,7 @@
     builtin.file:
       pattern: .*derby.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded PostgreSQL Driver
     The application embeds an PostgreSQL driver.
   labels:
@@ -71,7 +71,7 @@
     builtin.file:
       pattern: .*postgresql.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded H2 Driver
     The application embeds an H2 driver.
   labels:
@@ -89,7 +89,7 @@
     builtin.file:
       pattern: .*h2.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Microsoft SQL Driver
     The application embeds an Microsoft SQL driver.
   labels:
@@ -110,7 +110,7 @@
     - builtin.file:
         pattern: mssql-jdbc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded SQLite Driver
     The application embeds an SQLite driver.
   labels:
@@ -128,7 +128,7 @@
     builtin.file:
       pattern: .*sqlite-jdbc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Oracle DB Driver
     The application embeds an Oracle DB driver.
   labels:
@@ -149,7 +149,7 @@
     - builtin.file:
         pattern: .*ojdbc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Cassandra Client
     The application embeds a Cassandra client.
   labels:
@@ -182,7 +182,7 @@
     - builtin.file:
         pattern: .*scale7-pelops.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Axion Driver
     The application embeds an Axion driver.
   labels:
@@ -200,7 +200,7 @@
     builtin.file:
       pattern: .*axion.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded MckoiSQLDB Driver
     The application embeds an MckoiSQLDB driver.
   labels:
@@ -218,7 +218,7 @@
     builtin.file:
       pattern: .*mckoisqldb.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded MongoDB Client
     The application embeds a MongoDB client.
   labels:
@@ -247,7 +247,7 @@
     - builtin.file:
         pattern: .*rogue.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Data
     The application embeds the Spring Data framework.
   labels:
@@ -261,7 +261,7 @@
     builtin.file:
       pattern: spring-data.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Morphia
     The application embeds Morphia.
   labels:
@@ -279,7 +279,7 @@
     builtin.file:
       pattern: .*morphia.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded LevelDB Client
     The application embeds a LevelDB client.
   labels:
@@ -297,7 +297,7 @@
     builtin.file:
       pattern: .*leveldb.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Apache HBase Client
     The application embeds an Apache HBase client.
   labels:
@@ -315,7 +315,7 @@
     builtin.file:
       pattern: .*hbase.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Apache Accumulo Client
     The application embeds an Apache Accumulo client.
   labels:
@@ -333,7 +333,7 @@
     builtin.file:
       pattern: .*accumulo.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded Spring Data JPA
     The application embeds Spring Data JPA
   labels:
diff --git a/default/generated/technology-usage/199-ejb.windup.yaml b/default/generated/technology-usage/199-ejb.windup.yaml
index d110625b..738ee80d 100644
--- a/default/generated/technology-usage/199-ejb.windup.yaml
+++ b/default/generated/technology-usage/199-ejb.windup.yaml
@@ -2,7 +2,7 @@
   - name: classes
     nameOfCaptureGroup: classes
     pattern: javax.ejb.(?P<classes>(Schedule|ScheduleExpression|Schedules|TimedObject|Timeout|Timer|TimerConfig|TimerHandle|TimerService))
-  description: |
+  description: |-
     EJB Timer
     The application uses EJB timers.
   labels:
diff --git a/default/generated/technology-usage/20-javase-technology-usage.windup.yaml b/default/generated/technology-usage/20-javase-technology-usage.windup.yaml
index c2b9741b..6447b2b9 100644
--- a/default/generated/technology-usage/20-javase-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/20-javase-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/201-embedded-framework.windup.yaml b/default/generated/technology-usage/201-embedded-framework.windup.yaml
index c62159c8..7cdba0fc 100644
--- a/default/generated/technology-usage/201-embedded-framework.windup.yaml
+++ b/default/generated/technology-usage/201-embedded-framework.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Axis
     The application embeds the Apache Axis framework.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: axis.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Axis2
     The application embeds the Apache Axis2 framework.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: axis2.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache CXF
     The application embeds the Apache CXF framework.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: .*cxf.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - XFire
     The application embeds the XFire framework.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: .*xfire.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Jersey
     The application embeds the Jersey framework.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: .*jersey.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Unirest
     The application embeds the Unirest framework.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: .*unirest.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Hibernate
     The application embeds the Hibernate framework.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: hibernate.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Hibernate OGM
     The application embeds the Hibernate OGM framework.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: hibernate-ogm.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - EclipseLink
     The application embeds the EclipseLink framework.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: .*eclipselink.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Batch
     The application embeds the Spring Batch framework.
   labels:
@@ -139,7 +139,7 @@
     builtin.file:
       pattern: spring-batch.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - AspectJ
     The application embeds the AspectJ framework.
   labels:
@@ -153,7 +153,7 @@
     builtin.file:
       pattern: .*aspectj.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JBPM
     The application embeds the JBPM framework.
   labels:
@@ -167,7 +167,7 @@
     builtin.file:
       pattern: .*jbpm.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - iLog
     The application embeds the iLog framework.
   labels:
@@ -181,7 +181,7 @@
     builtin.file:
       pattern: .*jrules.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Camunda
     The application embeds the Camunda framework.
   labels:
@@ -195,7 +195,7 @@
     builtin.file:
       pattern: .*camunda.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Pega
     The application embeds the Pega framework.
   labels:
@@ -209,7 +209,7 @@
     builtin.file:
       pattern: .*pega.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Blaze
     The application embeds the Blaze framework.
   labels:
@@ -223,7 +223,7 @@
     builtin.file:
       pattern: blaze.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - MRules
     The application embeds the MRules framework.
   labels:
@@ -237,7 +237,7 @@
     builtin.file:
       pattern: .*MRules.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Easy Rules
     The application embeds the Easy Rules framework.
   labels:
@@ -251,7 +251,7 @@
     builtin.file:
       pattern: .*easy-rules.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - AOP Alliance
     The application embeds the AOP Alliance library.
   labels:
@@ -265,7 +265,7 @@
     builtin.file:
       pattern: .*aopalliance.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - SNMP4J
     The application embeds SNMP4J.
   labels:
@@ -279,7 +279,7 @@
     builtin.file:
       pattern: .*snmp4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - HTTP Client
     The application embeds a HTTP client.
   labels:
@@ -293,7 +293,7 @@
     builtin.file:
       pattern: .*http-client.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Javax Inject
     The application embeds a Javax Inject library.
   labels:
@@ -310,7 +310,7 @@
     - builtin.file:
         pattern: .*atinject.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Google Guice
     The application embeds a Google Guice library.
   labels:
@@ -324,7 +324,7 @@
     builtin.file:
       pattern: .*guice.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - CDI
     The application embeds a CDI library.
   labels:
@@ -338,7 +338,7 @@
     builtin.file:
       pattern: .*cdi.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Plexus Container
     The application embeds a Plexus Container library.
   labels:
@@ -352,7 +352,7 @@
     builtin.file:
       pattern: .*plexus-container.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Weld
     The application embeds a Weld library.
   labels:
@@ -366,7 +366,7 @@
     builtin.file:
       pattern: .*weld.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Dagger
     The application embeds a Dagger library.
   labels:
@@ -380,7 +380,7 @@
     builtin.file:
       pattern: dagger.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - GIN
     The application embeds a GIN (GWT INjection) library.
   labels:
@@ -394,7 +394,7 @@
     builtin.file:
       pattern: gin.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - PicoContainer
     The application embeds a PicoContainer library.
   labels:
@@ -408,7 +408,7 @@
     builtin.file:
       pattern: .*picocontainer.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Scaldi
     The application embeds a Scaldi library.
   labels:
@@ -422,7 +422,7 @@
     builtin.file:
       pattern: .*scaldi.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Macros
     The application embeds a Macros library.
   labels:
@@ -436,7 +436,7 @@
     builtin.file:
       pattern: macros.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Injekt for Kotlin
     The application embeds a Injekt for Kotlin library.
   labels:
@@ -450,7 +450,7 @@
     builtin.file:
       pattern: injekt-core.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Kodein
     The application embeds a Kodein library.
   labels:
@@ -464,7 +464,7 @@
     builtin.file:
       pattern: kodein.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Peaberry
     The application embeds a Peaberry library.
   labels:
@@ -478,7 +478,7 @@
     builtin.file:
       pattern: peaberry.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Sticky Configured
     The application embeds a Sticky Configured library.
   labels:
@@ -492,7 +492,7 @@
     builtin.file:
       pattern: sticky-configured.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Ka DI
     The application embeds a Ka DI library.
   labels:
@@ -506,7 +506,7 @@
     builtin.file:
       pattern: ka-di.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Polyforms DI
     The application embeds a Polyforms DI library.
   labels:
@@ -520,7 +520,7 @@
     builtin.file:
       pattern: polyforms-di.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JayWire
     The application embeds a JayWire library.
   labels:
@@ -534,7 +534,7 @@
     builtin.file:
       pattern: jaywire.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Silk DI
     The application embeds a Silk DI library.
   labels:
@@ -548,7 +548,7 @@
     builtin.file:
       pattern: silk-di.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Grapht DI
     The application embeds a Grapht DI library.
   labels:
@@ -562,7 +562,7 @@
     builtin.file:
       pattern: grapht.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Syringe
     The application embeds a Syringe library.
   labels:
@@ -576,7 +576,7 @@
     builtin.file:
       pattern: syringe.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Cfg Engine
     The application embeds a Cfg Engine library.
   labels:
@@ -590,7 +590,7 @@
     builtin.file:
       pattern: cfg-engine.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - BeanInject
     The application embeds a BeanInject library.
   labels:
@@ -604,7 +604,7 @@
     builtin.file:
       pattern: beaninject.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Tornado Inject
     The application embeds a Tornado Inject library.
   labels:
@@ -618,7 +618,7 @@
     builtin.file:
       pattern: inject.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Airframe
     The application embeds a Airframe library.
   labels:
@@ -632,7 +632,7 @@
     builtin.file:
       pattern: airframe.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Winter
     The application embeds a Winter library.
   labels:
@@ -646,7 +646,7 @@
     builtin.file:
       pattern: winter.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - KouInject
     The application embeds a KouInject library.
   labels:
@@ -660,7 +660,7 @@
     builtin.file:
       pattern: kouinject.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Iroh
     The application embeds an Iroh library.
   labels:
@@ -674,7 +674,7 @@
     builtin.file:
       pattern: iroh.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Micro DI
     The application embeds a Micro DI library.
   labels:
@@ -688,7 +688,7 @@
     builtin.file:
       pattern: micro-di.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - SubCut
     The application embeds a SubCut library.
   labels:
@@ -702,7 +702,7 @@
     builtin.file:
       pattern: subcut.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring DI
     The application embeds a Spring DI library.
   labels:
@@ -717,7 +717,7 @@
       lowerbound: 0.0.0
       name: org.springframework.spring-beans
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Micrometer
     The application embeds a Micrometer library.
   labels:
@@ -732,7 +732,7 @@
       lowerbound: 0.0.0
       name: io.micrometer.micrometer-core
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Web
     The application embeds the Spring Web framework.
   labels:
@@ -754,7 +754,7 @@
         lowerbound: 0.0.0
         name: org.springframework.spring-web
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Shell
     The application embeds a Spring Shell library.
   labels:
@@ -769,7 +769,7 @@
       lowerbound: 0.0.0
       name: org.springframework.shell.spring-shell-core
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Boot Flo
     The application embeds Spring Boot Flo.
   labels:
@@ -784,7 +784,7 @@
       filePattern: .*\.(html|ts)
       pattern: (<|')flo-editor
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Scheduled
     The application embeds Spring Scheduled.
   labels:
@@ -799,7 +799,7 @@
       location: ANNOTATION
       pattern: org.springframework.scheduling.annotation.Scheduled
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Cloud Function
     The application embeds Spring Cloud Function.
   labels:
@@ -818,7 +818,7 @@
         lowerbound: 0.0.0
         name: org.springframework.cloud.spring-cloud-function-context
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Quartz
     The application embeds the Quartz framework.
   labels:
@@ -832,7 +832,7 @@
     builtin.file:
       pattern: .*quartz.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Zipkin
     The application embeds the Zipkin framework.
   labels:
@@ -846,7 +846,7 @@
     builtin.file:
       pattern: .*zipkin.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Feign
     The application embeds the Feign framework.
   labels:
@@ -860,7 +860,7 @@
     builtin.file:
       pattern: feign-.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Redis
     The application embeds the Redis client.
   labels:
@@ -874,7 +874,7 @@
     builtin.file:
       pattern: .*redis.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Eureka
     The application embeds the Eureka client.
   labels:
diff --git a/default/generated/technology-usage/204-integration.windup.yaml b/default/generated/technology-usage/204-integration.windup.yaml
index 64867229..e3d15c20 100644
--- a/default/generated/technology-usage/204-integration.windup.yaml
+++ b/default/generated/technology-usage/204-integration.windup.yaml
@@ -1,6 +1,6 @@
 - customVariables: []
   description: "Embedded library - Apache Camel\n\n                      The application
-    embedds an Apache Camel library.\n                  \n"
+    embedds an Apache Camel library.\n                  "
   labels:
   - konveyor.io/include=always
   links: []
@@ -13,7 +13,7 @@
       pattern: .*camel.*\.jar$
 - customVariables: []
   description: "Embedded library - Teiid\n\n                      The application
-    embedds a Teiid library.\n                  \n"
+    embedds a Teiid library.\n                  "
   labels:
   - konveyor.io/include=always
   links: []
@@ -25,7 +25,7 @@
     builtin.file:
       pattern: .*teiid.*\.jar$
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Integration
     The application embeds the Spring Integration framework.
   labels:
@@ -39,7 +39,7 @@
     builtin.file:
       pattern: spring-integration.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Ikasan
     The application embeds an Ikasan library.
   labels:
@@ -53,7 +53,7 @@
     builtin.file:
       pattern: .*ikasan.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Swagger
     The application embeds a Swagger library.
   labels:
@@ -67,7 +67,7 @@
     builtin.file:
       pattern: .*swagger.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apiman
     The application embeds an Apiman library.
   labels:
@@ -81,7 +81,7 @@
     builtin.file:
       pattern: .*apiman.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - 3scale
     The application embeds a 3scale library.
   labels:
@@ -95,7 +95,7 @@
     builtin.file:
       pattern: .*3scale.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Istio
     The application embeds an Istio library.
   labels:
@@ -109,7 +109,7 @@
     builtin.file:
       pattern: .*istio.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - ServiceMix
     The application embeds a ServiceMix library.
   labels:
@@ -123,7 +123,7 @@
     builtin.file:
       pattern: .*servicemix.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Mule
     The application embeds a Mule library.
   labels:
@@ -137,7 +137,7 @@
     builtin.file:
       pattern: .*mule.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Petals EIP
     The application embeds a Petals EIP library.
   labels:
@@ -151,7 +151,7 @@
     builtin.file:
       pattern: .*petals.*eip.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - SwitchYard
     The application embeds a SwitchYard library.
   labels:
@@ -165,7 +165,7 @@
     builtin.file:
       pattern: .*switchyard.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Apache Synapse
     The application embeds an Apache Synapse library.
   labels:
@@ -179,7 +179,7 @@
     builtin.file:
       pattern: .*synapse.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - WSO2
     The application embeds a WSO2 library.
   labels:
@@ -193,7 +193,7 @@
     builtin.file:
       pattern: .*wso2.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Talend ESB
     The application embeds a Talend ESB library.
   labels:
@@ -207,7 +207,7 @@
     builtin.file:
       pattern: .*talend.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Integration
     The application embeds the Spring Integration framework.
   labels:
@@ -223,7 +223,7 @@
         int: http://www.springframework.org/schema/integration
       xpath: //*/int:channel
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Integration
     The application embeds the Spring Integration framework.
   labels:
diff --git a/default/generated/technology-usage/207-javase.windup.yaml b/default/generated/technology-usage/207-javase.windup.yaml
index 11a64762..f94b9b32 100644
--- a/default/generated/technology-usage/207-javase.windup.yaml
+++ b/default/generated/technology-usage/207-javase.windup.yaml
@@ -2,7 +2,7 @@
   - name: classes
     nameOfCaptureGroup: classes
     pattern: java.lang.(?P<classes>(Thread|ThreadDeath|ThreadGroup|ThreadLocal))
-  description: |
+  description: |-
     Threads
     The application uses Thread APIs.
   labels:
@@ -19,7 +19,7 @@
   - name: classes
     nameOfCaptureGroup: classes
     pattern: java.util.concurrent.(?P<classes>(ExecutorService|Executors|Executor|ScheduledExecutorService))
-  description: |
+  description: |-
     Threads
     The application uses Concurrent Executors APIs.
   labels:
diff --git a/default/generated/technology-usage/209-jta.windup.yaml b/default/generated/technology-usage/209-jta.windup.yaml
index 39c946e2..7713b0c6 100644
--- a/default/generated/technology-usage/209-jta.windup.yaml
+++ b/default/generated/technology-usage/209-jta.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Mycontainer JTA
     The application embeds a Mycontainer JTA library.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: mycontainer-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Geronimo JTA
     The application embeds a Geronimo JTA library.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: geronimo-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OW2 JTA
     The application embeds an OW2 JTA library.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: ow2-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Evo JTA
     The application embeds an Evo JTA library.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: evo-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - AKKA JTA
     The application embeds an AKKA JTA library.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: akka-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - KumuluzEE JTA
     The application embeds a KumuluzEE JTA library.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: kumuluzee-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Ignite JTA
     The application embeds an Ignite JTA library.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: ignite-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Nuxeo JTA/JCA
     The application embeds a Nuxeo JTA/JCA library.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: nuxeo-runtime-jtajca.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Everit JTA
     The application embeds an Everit JTA library.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: org\.everit\.transaction\.propagator\.jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Demoiselle JTA
     The application embeds a Demoiselle JTA library.
   labels:
@@ -139,7 +139,7 @@
     builtin.file:
       pattern: demoiselle-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Meecrowave JTA
     The application embeds an Apache Meecrowave JTA library.
   labels:
@@ -153,7 +153,7 @@
     builtin.file:
       pattern: meecrowave-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Sirona JTA
     The application embeds an Apache Sirona JTA library.
   labels:
@@ -167,7 +167,7 @@
     builtin.file:
       pattern: sirona-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Lift JTA
     The application embeds a Lift JTA library.
   labels:
@@ -181,7 +181,7 @@
     builtin.file:
       pattern: lift-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - WF Core JTA
     The application embeds a WF Core JTA library.
   labels:
@@ -195,7 +195,7 @@
     builtin.file:
       pattern: wf-core-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Java Transaction API (JTA)
     The application embeds a Java Transaction API library.
   labels:
@@ -212,7 +212,7 @@
     - builtin.file:
         pattern: javax-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JBoss Transactions
     The application embeds a JBoss Transactions library.
   labels:
@@ -241,7 +241,7 @@
     - builtin.file:
         pattern: transactions.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - GlassFish JTA
     The application embeds a GlassFish JTA library.
   labels:
@@ -260,7 +260,7 @@
     - builtin.file:
         pattern: jta-l10n.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Atomikos JTA
     The application embeds an Atomikos JTA library.
   labels:
@@ -279,7 +279,7 @@
     - builtin.file:
         pattern: evo-jta-atomikos.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Narayana Arjuna
     The application embeds a Narayana Arjuna library.
   labels:
@@ -298,7 +298,7 @@
     - builtin.file:
         pattern: tomcat-jta.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Spring Transactions
     The application embeds a Spring Transactions library.
   labels:
diff --git a/default/generated/technology-usage/21-javaee-technology-usage.windup.yaml b/default/generated/technology-usage/21-javaee-technology-usage.windup.yaml
index a6634a2d..55c269fe 100644
--- a/default/generated/technology-usage/21-javaee-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/21-javaee-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -13,6 +14,7 @@
         "": http://xmlns.jcp.org/xml/ns/javaee
       xpath: //*[local-name() = 'batch-artifacts']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -32,6 +34,7 @@
           "": http://xmlns.jcp.org/xml/ns/javaee
         xpath: //*[local-name() = 'job']
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -44,6 +47,7 @@
     builtin.hasTags:
     - Java EE Batch API
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -56,6 +60,7 @@
     builtin.hasTags:
     - Java EE Batch
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +76,7 @@
         location: PACKAGE
         pattern: javax.inject*
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -86,6 +92,7 @@
         location: PACKAGE
         pattern: jakarta.inject*
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -98,6 +105,7 @@
     builtin.hasTags:
     - CDI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -109,6 +117,7 @@
       location: PACKAGE
       pattern: javax.json*
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -121,7 +130,7 @@
     builtin.hasTags:
     - Java EE JSON-P
 - customVariables: []
-  description: |
+  description: |-
     Java Authorization Contract for Containers
     The application uses JACC.
   labels:
@@ -136,7 +145,7 @@
       location: IMPORT
       pattern: javax.security.jacc*
 - customVariables: []
-  description: |
+  description: |-
     Java EE Management
     The application uses Java EE Management.
   labels:
@@ -151,7 +160,7 @@
       location: IMPORT
       pattern: javax.management.j2ee*
 - customVariables: []
-  description: |
+  description: |-
     Java EE Application Deployment
     The application uses Java EE Application Deployment.
   labels:
@@ -165,7 +174,7 @@
     builtin.file:
       pattern: .*\.ear
 - customVariables: []
-  description: |
+  description: |-
     Web Services Metadata
     The application uses Web Services Metadata
   labels:
@@ -183,7 +192,7 @@
   - name: annotation
     nameOfCaptureGroup: annotation
     pattern: javax.annotation.(?P<annotation>PreDestroy|PostConstruct|Resource|Resources)
-  description: |
+  description: |-
     Common Annotations
     The application uses Common Annotations
   labels:
@@ -201,7 +210,7 @@
   - name: package
     nameOfCaptureGroup: package
     pattern: (?P<package>java|javax.)?xml.bind..*
-  description: |
+  description: |-
     JAXB
     The application uses JAXB
   labels:
@@ -216,7 +225,7 @@
       location: IMPORT
       pattern: java|javax.xml.bind*
 - customVariables: []
-  description: |
+  description: |-
     JAXR
     The application uses JAXR
   labels:
@@ -231,7 +240,7 @@
       location: IMPORT
       pattern: javax.xml.registry*
 - customVariables: []
-  description: |
+  description: |-
     Bean Validation
     The application uses Bean Validation
   labels:
@@ -246,7 +255,7 @@
       location: IMPORT
       pattern: javax.validation.constraints*
 - customVariables: []
-  description: |
+  description: |-
     Java Servlet
     The application uses Java Servlets
   labels:
@@ -261,7 +270,7 @@
       location: IMPORT
       pattern: javax.servlet*
 - customVariables: []
-  description: |
+  description: |-
     JSON Binding
     The application uses JSON binding
   labels:
@@ -276,6 +285,7 @@
       location: IMPORT
       pattern: javax.json.bind*
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -288,6 +298,7 @@
     builtin.hasTags:
     - JACC
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -300,6 +311,7 @@
     builtin.hasTags:
     - MEJB
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -312,6 +324,7 @@
     builtin.hasTags:
     - EAR
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -324,6 +337,7 @@
     builtin.hasTags:
     - WS Metadata
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -336,6 +350,7 @@
     builtin.hasTags:
     - Common Annotations
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -348,6 +363,7 @@
     builtin.hasTags:
     - JAXB
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -360,6 +376,7 @@
     builtin.hasTags:
     - JAXR
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -372,6 +389,7 @@
     builtin.hasTags:
     - Bean Validation
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -384,6 +402,7 @@
     builtin.hasTags:
     - JSON-B
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -396,6 +415,7 @@
     builtin.hasTags:
     - Servlet
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -409,6 +429,7 @@
         p: http://xmlns.jcp.org/xml/ns/persistence/orm
       xpath: //p:entity-mappings/@version[matches(self::node(), '(1.0|2.0|2.1|2.2)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -422,6 +443,7 @@
         p: https://jakarta.ee/xml/ns/persistence/orm
       xpath: //p:entity-mappings/@version[matches(self::node(), '(3.0|3.1)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -435,6 +457,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:beans/@version[matches(self::node(), '(1.0|1.1|2.0)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -448,6 +471,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:beans/@version[matches(self::node(), '(3.0|4.0)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -461,6 +485,7 @@
         p: http://java.sun.com/xml/ns/javaee
       xpath: //p:application/@version[matches(self::node(), '(5|6)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -474,6 +499,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:application/@version[matches(self::node(), '(7|8)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -487,6 +513,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:application/@version[matches(self::node(), '(9|10)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -500,6 +527,7 @@
         p: http://java.sun.com/xml/ns/javaee
       xpath: //p:application-client/@version[matches(self::node(), '(5|6)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -513,6 +541,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:application-client/@version[matches(self::node(), '(7|8)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -526,6 +555,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:application-client/@version[matches(self::node(), '(9|10)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -539,6 +569,7 @@
         p: http://java.sun.com/xml/ns/javaee
       xpath: //p:connector/@version[matches(self::node(), '(1.6)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -552,6 +583,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:connector/@version[matches(self::node(), '(1.7)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -565,6 +597,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:connector/@version[matches(self::node(), '(2.0|2.1)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -578,6 +611,7 @@
         p: http://java.sun.com/xml/ns/javaee
       xpath: //p:faces-config/@version[matches(self::node(), '(1.2|2.0)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -591,6 +625,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:faces-config/@version[matches(self::node(), '(2.2|2.3)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -604,6 +639,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:faces-config/@version[matches(self::node(), '(3.0|4.0)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -617,6 +653,7 @@
         p: http://java.sun.com/xml/ns/javaee
       xpath: //p:webservices/@version[matches(self::node(), '(1.2|1.3)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -630,6 +667,7 @@
         p: http://xmlns.jcp.org/xml/ns/javaee
       xpath: //p:webservices/@version[matches(self::node(), '(1.4)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -643,6 +681,7 @@
         p: https://jakarta.ee/xml/ns/jakartaee
       xpath: //p:webservices/@version[matches(self::node(), '(2.0)')]
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -655,6 +694,7 @@
     builtin.hasTags:
     - JPA Mapping XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -667,6 +707,7 @@
     builtin.hasTags:
     - CDI XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -679,6 +720,7 @@
     builtin.hasTags:
     - Java EE XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -691,6 +733,7 @@
     builtin.hasTags:
     - Jakarta EE XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -703,6 +746,7 @@
     builtin.hasTags:
     - Java EE Client XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -715,6 +759,7 @@
     builtin.hasTags:
     - Jakarta EE Client XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -727,6 +772,7 @@
     builtin.hasTags:
     - Connector XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -739,6 +785,7 @@
     builtin.hasTags:
     - JSF XML
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/211-logging-usage.windup.yaml b/default/generated/technology-usage/211-logging-usage.windup.yaml
index 7a500825..c752d737 100644
--- a/default/generated/technology-usage/211-logging-usage.windup.yaml
+++ b/default/generated/technology-usage/211-logging-usage.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Log4J
     The application embeds an Apache Log4J library.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*log4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Commons Logging
     The application embeds an Apache Commons Logging library.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: .*commons-logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - SLF4J
     The application embeds a Simple Logging Facade for Java (SLJ4J) library.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: .*slf4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - tinylog
     The application embeds a tinylog library.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: .*tinylog.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Logback
     The application embeds a Logback library.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: .*logback.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JBoss logging
     The application embeds a JBoss logging library.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: .*jboss-logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Monolog
     The application embeds a Monolog library.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: .*monolog.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Jcabi Log
     The application embeds a Jcabi Log library.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: .*jcabi-log.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - NLOG4J
     The application embeds a NLOG4J library.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: .*nlog4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Log4s
     The application embeds a Log4s library.
   labels:
@@ -139,7 +139,7 @@
     builtin.file:
       pattern: log4s.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Kotlin Logging
     The application embeds a Kotlin Logging library.
   labels:
@@ -153,7 +153,7 @@
     builtin.file:
       pattern: .*kotlin-logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Airlift Log Manager
     The application embeds an Airlift Log Manager library.
   labels:
@@ -167,7 +167,7 @@
     builtin.file:
       pattern: log-manager.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - MinLog
     The application embeds a MinLog library.
   labels:
@@ -181,7 +181,7 @@
     builtin.file:
       pattern: .*minilog.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Logging Utils
     The application embeds a Common Java Logging Utils library.
   labels:
@@ -195,7 +195,7 @@
     builtin.file:
       pattern: logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OCPsoft Logging Utils
     The application embeds an OCPsoft Logging Utils library.
   labels:
@@ -209,7 +209,7 @@
     builtin.file:
       pattern: logging-api.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Scribe
     The application embeds a Scribe library.
   labels:
@@ -223,7 +223,7 @@
     builtin.file:
       pattern: .*scribe.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - GFC Logging
     The application embeds a Git Foundation Classes (GFC) Logging library.
   labels:
@@ -237,7 +237,7 @@
     builtin.file:
       pattern: .*gfc-logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Blitz4j
     The application embeds a Blitz4j library.
   labels:
@@ -251,7 +251,7 @@
     builtin.file:
       pattern: .*blitz4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Avalon Logkit
     The application embeds an Avalon Logkit library.
   labels:
@@ -265,7 +265,7 @@
     builtin.file:
       pattern: .*avalon-logkit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - KLogger
     The application embeds a KLogger library.
   labels:
@@ -279,7 +279,7 @@
     builtin.file:
       pattern: .*klogger.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Lumberjack
     The application embeds a Lumberjack library.
   labels:
@@ -293,7 +293,7 @@
     builtin.file:
       pattern: .*lumberjack.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Log.io
     The application embeds a Log.io library.
   labels:
@@ -307,7 +307,7 @@
     builtin.file:
       pattern: .*logio.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OPS4J Pax Logging Service
     The application embeds an OPS4J Pax Logging Service library.
   labels:
@@ -321,7 +321,7 @@
     builtin.file:
       pattern: .*pax-logging-service.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OW2 Log Util
     The application embeds an OW2 Log Util library.
   labels:
@@ -335,7 +335,7 @@
     builtin.file:
       pattern: util-log.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Twitter Util Logging
     The application embeds a Twitter Util Logging library.
   labels:
@@ -349,7 +349,7 @@
     builtin.file:
       pattern: util-logging.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Composite Logging JCL
     The application embeds a Composite Logging JCL library.
   labels:
@@ -363,7 +363,7 @@
     builtin.file:
       pattern: composite-logging-api.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Flume
     The application embeds an Apache Flume library.
   labels:
diff --git a/default/generated/technology-usage/215-mvc.windup.yaml b/default/generated/technology-usage/215-mvc.windup.yaml
index eabb0c7f..dc06fbb3 100644
--- a/default/generated/technology-usage/215-mvc.windup.yaml
+++ b/default/generated/technology-usage/215-mvc.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Wicket
     The application embeds an Apache Wicket library.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*wicket.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Struts
     The application embeds an Apache Struts library.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: .*struts.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring MVC
     The application embeds a Spring MVC library.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: .*spring-webmvc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring MVC
     The application embeds a Spring MVC library.
   labels:
@@ -56,7 +56,7 @@
       location: ANNOTATION
       pattern: org.springframework.web.servlet.mvc.Controller
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring MVC
     The application embeds a Spring MVC library.
   labels:
@@ -81,7 +81,7 @@
         lowerbound: 0.0.0
         name: org.springframework.spring-webflux
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - GWT
     The application embeds a GWT library.
   labels:
@@ -95,7 +95,7 @@
     builtin.file:
       pattern: .*gwt.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - MyFaces
     The application embeds a MyFaces library.
   labels:
@@ -109,7 +109,7 @@
     builtin.file:
       pattern: .*myfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - RichFaces
     The application embeds a RichFaces library.
   labels:
@@ -123,7 +123,7 @@
     builtin.file:
       pattern: .*richfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JSF
     The application embeds a JSF library.
   labels:
@@ -137,7 +137,7 @@
     builtin.file:
       pattern: .*jsf.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Tapestry
     The application embeds an Apache Tapestry library.
   labels:
@@ -151,7 +151,7 @@
     builtin.file:
       pattern: .*tapestry.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Stripes
     The application embeds a Stripes library.
   labels:
@@ -165,7 +165,7 @@
     builtin.file:
       pattern: .*stripes.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Spark
     The application embeds a Spark library.
   labels:
@@ -179,7 +179,7 @@
     builtin.file:
       pattern: .*spark.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Vaadin
     The application embeds a Vaadin library.
   labels:
@@ -193,7 +193,7 @@
     builtin.file:
       pattern: .*vaadin.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Grails
     The application embeds a Grails library.
   labels:
@@ -207,7 +207,7 @@
     builtin.file:
       pattern: .*grails.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Play
     The application embeds a Play library.
   labels:
@@ -221,7 +221,7 @@
     builtin.file:
       pattern: .*play.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Oracle ADF
     The application embeds an Oracle ADF library.
   labels:
@@ -238,7 +238,7 @@
     - builtin.file:
         pattern: adfc-config\.xml
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - PrimeFaces
     The application embeds a PrimeFaces library.
   labels:
@@ -252,7 +252,7 @@
     builtin.file:
       pattern: .*primefaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JSTL
     The application embeds a JSTL library.
   labels:
@@ -266,7 +266,7 @@
     builtin.file:
       pattern: .*jslt.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OpenFaces
     The application embeds an OpenFaces library.
   labels:
@@ -280,7 +280,7 @@
     builtin.file:
       pattern: .*openfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JFreeChart
     The application embeds a JFreeChart library.
   labels:
@@ -294,7 +294,7 @@
     builtin.file:
       pattern: .*jfreechart.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - BootsFaces
     The application embeds a BootsFaces library.
   labels:
@@ -308,7 +308,7 @@
     builtin.file:
       pattern: .*bootsfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - ICEfaces
     The application embeds an ICEfaces library.
   labels:
@@ -322,7 +322,7 @@
     builtin.file:
       pattern: .*icefaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - BabbageFaces
     The application embeds a BabbageFaces library.
   labels:
@@ -336,7 +336,7 @@
     builtin.file:
       pattern: .*babbageFaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Portlet
     The application embeds a Portlet library.
   labels:
@@ -350,7 +350,7 @@
     builtin.file:
       pattern: .*portlet.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - AngularFaces
     The application embeds an AngularFaces library.
   labels:
@@ -364,7 +364,7 @@
     builtin.file:
       pattern: .*angularFaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - LiferayFaces
     The application embeds a LiferayFaces library.
   labels:
@@ -378,7 +378,7 @@
     builtin.file:
       pattern: .*liferay-faces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Liferay
     The application embeds a Liferay library.
   labels:
@@ -392,7 +392,7 @@
     builtin.file:
       pattern: .*liferay.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - ButterFaces
     The application embeds a Larmic ButterFaces library.
   labels:
@@ -406,7 +406,7 @@
     builtin.file:
       pattern: .*butterfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - HighFaces
     The application embeds a HighFaces library.
   labels:
@@ -420,7 +420,7 @@
     builtin.file:
       pattern: .*highfaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - TieFaces
     The application embeds a TieFaces library.
   labels:
@@ -434,7 +434,7 @@
     builtin.file:
       pattern: .*tiefaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OmniFaces
     The application embeds an OmniFaces library.
   labels:
@@ -448,7 +448,7 @@
     builtin.file:
       pattern: .*omnifaces.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - UberFire
     The application embeds an UberFire library.
   labels:
@@ -462,7 +462,7 @@
     builtin.file:
       pattern: .*uberfire.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Velocity
     The application embeds an Apache Velocity library.
   labels:
@@ -476,7 +476,7 @@
     builtin.file:
       pattern: .*velocity.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Thymeleaf
     The application embeds a Thymeleaf library.
   labels:
@@ -490,7 +490,7 @@
     builtin.file:
       pattern: .*thymeleaf.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache FreeMarker
     The application embeds an Apache FreeMarker library.
   labels:
@@ -504,7 +504,7 @@
     builtin.file:
       pattern: .*freemarker.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - ANTLR StringTemplate
     The application embeds an ANTLR StringTemplate library.
   labels:
@@ -518,7 +518,7 @@
     builtin.file:
       pattern: .*stringtemplate.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Handlebars
     The application embeds a Handlebars library.
   labels:
@@ -532,7 +532,7 @@
     builtin.file:
       pattern: .*handlebars.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JMustache
     The application embeds a JMustache library.
   labels:
@@ -546,7 +546,7 @@
     builtin.file:
       pattern: .*jmustache.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Jamon
     The application embeds a Jamon library.
   labels:
@@ -560,7 +560,7 @@
     builtin.file:
       pattern: jamon-.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Twirl
     The application embeds a Twirl library.
   labels:
@@ -574,7 +574,7 @@
     builtin.file:
       pattern: .*twirl.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Scalate
     The application embeds a Scalate library.
   labels:
@@ -588,7 +588,7 @@
     builtin.file:
       pattern: .*scalate.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Rythm Template Engine
     The application embeds a Rythm Template Engine library.
   labels:
@@ -602,7 +602,7 @@
     builtin.file:
       pattern: .*rythm-engine.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Trimou
     The application embeds a Trimou library.
   labels:
@@ -616,7 +616,7 @@
     builtin.file:
       pattern: .*trimou-core.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Jetbrick Template
     The application embeds a Jetbrick Template library.
   labels:
@@ -630,7 +630,7 @@
     builtin.file:
       pattern: .*velocity.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Chunk Templates
     The application embeds a Chunk Templates library.
   labels:
@@ -644,7 +644,7 @@
     builtin.file:
       pattern: .*chunk-templates.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JSilver
     The application embeds a JSilver library.
   labels:
@@ -658,7 +658,7 @@
     builtin.file:
       pattern: .*jsilver.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Water Template Engine
     The application embeds a Water Template Engine library.
   labels:
@@ -672,7 +672,7 @@
     builtin.file:
       pattern: .*watertemplate-engine.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Ickenham
     The application embeds an Ickenham library.
   labels:
@@ -686,7 +686,7 @@
     builtin.file:
       pattern: .*ickenham.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Mixer
     The application embeds a Mixer library.
   labels:
@@ -700,7 +700,7 @@
     builtin.file:
       pattern: .*mixer.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Webmacro
     The application embeds a Webmacro library.
   labels:
@@ -714,7 +714,7 @@
     builtin.file:
       pattern: .*webmacro.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - DVSL
     The application embeds a DVSL library.
   labels:
@@ -728,7 +728,7 @@
     builtin.file:
       pattern: .*dvsl.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Snippetory Template Engine
     The application embeds a Snippetory Template Engine library.
   labels:
@@ -742,7 +742,7 @@
     builtin.file:
       pattern: .*snippetory.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Anakia
     The application embeds an Anakia library.
   labels:
diff --git a/default/generated/technology-usage/218-observability.windup.yaml b/default/generated/technology-usage/218-observability.windup.yaml
index 6b8bcb7a..d7190626 100644
--- a/default/generated/technology-usage/218-observability.windup.yaml
+++ b/default/generated/technology-usage/218-observability.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Spring Boot Actuator
     The application embeds Spring Boot Actuator.
   labels:
@@ -24,7 +24,7 @@
         lowerbound: 0.0.0
         name: org.springframework.boot.spring-boot-actuator
 - customVariables: []
-  description: |
+  description: |-
     Spring JMX configuration detected
     The application uses Spring JMX.
   labels:
diff --git a/default/generated/technology-usage/220-security.windup.yaml b/default/generated/technology-usage/220-security.windup.yaml
index 83f815ba..af1f0982 100644
--- a/default/generated/technology-usage/220-security.windup.yaml
+++ b/default/generated/technology-usage/220-security.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Security
     The application embeds a Spring Security library.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*spring-security.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Shiro
     The application embeds an Apache Shiro library.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: .*shiro.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Hdiv
     The application embeds an Hdiv library.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: .*hdiv.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OACC
     The application embeds an OACC library.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: .*acciente-oacc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - PicketLink
     The application embeds a PicketLink library.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: .*picketlink.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - PicketBox
     The application embeds a PicketBox library.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: .*picketbox.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Keyczar
     The application embeds a Keyczar library.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: .*keyczar.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - XACML
     The application embeds an XACML library.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: .*xacml.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - SAML
     The application embeds a SAML library.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: .*saml.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Bouncy Castle
     The application embeds a Bouncy Castle library.
   labels:
@@ -150,7 +150,7 @@
     - builtin.file:
         pattern: .*bctls.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Jasypt
     The application embeds a Jasypt library.
   labels:
@@ -164,7 +164,7 @@
     builtin.file:
       pattern: .*jasypt.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Santuario
     The application embeds a Apache Santuario library.
   labels:
@@ -178,7 +178,7 @@
     builtin.file:
       pattern: .*xmlsec.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - SSL
     The application embeds an SSL library.
   labels:
@@ -192,7 +192,7 @@
     builtin.file:
       pattern: .*ssl.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Vlad
     The application embeds a Vlad library.
   labels:
@@ -206,7 +206,7 @@
     builtin.file:
       pattern: vlad.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Apache Commons Validator
     The application embeds an Apache Commons Validator library.
   labels:
@@ -220,7 +220,7 @@
     builtin.file:
       pattern: commons-validator.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OWASP ESAPI
     The application embeds an OWASP ESAPI library.
   labels:
@@ -234,7 +234,7 @@
     builtin.file:
       pattern: .*esapi.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - WSS4J
     The application embeds a WSS4J library.
   labels:
@@ -248,7 +248,7 @@
     builtin.file:
       pattern: .*wss4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OpenSAML
     The application embeds an OpenSAML library.
   labels:
@@ -262,7 +262,7 @@
     builtin.file:
       pattern: .*opensaml.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OTR4J
     The application embeds an OTR4J library.
   labels:
@@ -276,7 +276,7 @@
     builtin.file:
       pattern: .*otr4j.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OWASP CSRF Guard
     The application embeds an OWASP CSRF Guard library.
   labels:
@@ -290,7 +290,7 @@
     builtin.file:
       pattern: .*csrfguard.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - OAUTH
     The application embeds an OAUTH library.
   labels:
@@ -304,7 +304,7 @@
     builtin.file:
       pattern: .*oauth.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Acegi Security
     The application embeds an Acegi Security library.
   labels:
@@ -318,7 +318,7 @@
     builtin.file:
       pattern: .*acegi-security.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - JSecurity
     The application embeds a JSecurity library.
   labels:
@@ -332,7 +332,7 @@
     builtin.file:
       pattern: .*jsecurity.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - AcrIS Security
     The application embeds an AcrIS Security library.
   labels:
@@ -346,7 +346,7 @@
     builtin.file:
       pattern: .*acris-security.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - Trunk JGuard
     The application embeds a Trunk JGuard library.
   labels:
@@ -360,7 +360,7 @@
     builtin.file:
       pattern: .*jguard.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Security
     The application embeds a Spring Security library.
   labels:
diff --git a/default/generated/technology-usage/221-spring-catchall.windup.yaml b/default/generated/technology-usage/221-spring-catchall.windup.yaml
index 99705ad7..ea9f9713 100644
--- a/default/generated/technology-usage/221-spring-catchall.windup.yaml
+++ b/default/generated/technology-usage/221-spring-catchall.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring
     The application embeds the Spring framework.
   labels:
diff --git a/default/generated/technology-usage/223-test-frameworks-usage.windup.yaml b/default/generated/technology-usage/223-test-frameworks-usage.windup.yaml
index 9ea5ad91..b668794c 100644
--- a/default/generated/technology-usage/223-test-frameworks-usage.windup.yaml
+++ b/default/generated/technology-usage/223-test-frameworks-usage.windup.yaml
@@ -1,5 +1,5 @@
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - EasyMock
     The application embeds the EasyMock library.
   labels:
@@ -13,7 +13,7 @@
     builtin.file:
       pattern: .*easymock.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - PowerMock
     The application embeds the PowerMock library.
   labels:
@@ -27,7 +27,7 @@
     builtin.file:
       pattern: .*powermock.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Mockito
     The application embeds the Mockito library.
   labels:
@@ -41,7 +41,7 @@
     builtin.file:
       pattern: .*mockito.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - TestNG
     The application embeds the TestNG library.
   labels:
@@ -55,7 +55,7 @@
     builtin.file:
       pattern: .*testng.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Hamcrest
     The application embeds the Hamcrest library.
   labels:
@@ -69,7 +69,7 @@
     builtin.file:
       pattern: .*hamcrest.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spring Test
     The application embeds a Spring Test framework.
   labels:
@@ -83,7 +83,7 @@
     builtin.file:
       pattern: spring.*test.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Spock
     The application embeds the Spock framework.
   labels:
@@ -97,7 +97,7 @@
     builtin.file:
       pattern: spock.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - XMLUnit
     The application embeds the XMLUnit framework.
   labels:
@@ -111,7 +111,7 @@
     builtin.file:
       pattern: xmlunit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Akka Testkit
     The application embeds the Akka Testkit library.
   labels:
@@ -125,7 +125,7 @@
     builtin.file:
       pattern: akka-testkit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - REST Assured
     The application embeds the REST Assured library.
   labels:
@@ -139,7 +139,7 @@
     builtin.file:
       pattern: rest-assured.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded library - DbUnit
     The application embeds the DbUnit library.
   labels:
@@ -153,7 +153,7 @@
     builtin.file:
       pattern: dbunit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Mule Functional Test Framework (TCK)
     The application embeds the Mule Functional Test Framework (TCK).
   labels:
@@ -167,7 +167,7 @@
     builtin.file:
       pattern: mule-test.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Guava Testing Library
     The application embeds the Guava Testing Library.
   labels:
@@ -181,7 +181,7 @@
     builtin.file:
       pattern: guava-testlib.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - RandomizedTesting Randomized Runner
     The application embeds the RandomizedTesting Randomized Runner library.
   labels:
@@ -195,7 +195,7 @@
     builtin.file:
       pattern: randomizedtesting-runner.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - HttpUnit
     The application embeds the HttpUnit library.
   labels:
@@ -209,7 +209,7 @@
     builtin.file:
       pattern: httpunit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JCUnit
     The application embeds the JCunit library.
   labels:
@@ -223,7 +223,7 @@
     builtin.file:
       pattern: jcunit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JPA Matchers
     The application embeds the JPA Matchers library.
   labels:
@@ -237,7 +237,7 @@
     builtin.file:
       pattern: jpa-matchers.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - MultithreadedTC
     The application embeds the MultithreadedTC library.
   labels:
@@ -251,7 +251,7 @@
     builtin.file:
       pattern: multithreadedtc.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Specsy
     The application embeds the Specsy framework.
   labels:
@@ -265,7 +265,7 @@
     builtin.file:
       pattern: specsy.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JFunk
     The application embeds the JFunk framework.
   labels:
@@ -279,7 +279,7 @@
     builtin.file:
       pattern: jfunk.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Restito
     The application embeds the Restito framework.
   labels:
@@ -293,7 +293,7 @@
     builtin.file:
       pattern: restito.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Test Interface
     The application embeds the Test Interface library.
   labels:
@@ -307,7 +307,7 @@
     builtin.file:
       pattern: test-interface.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Play Test
     The application embeds the Play Test framework.
   labels:
@@ -321,7 +321,7 @@
     builtin.file:
       pattern: play-test.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Arquillian
     The application embeds the Arquillian framework.
   labels:
@@ -335,7 +335,7 @@
     builtin.file:
       pattern: .*arquillian.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Cactus
     The application embeds the Cactus framework.
   labels:
@@ -349,7 +349,7 @@
     builtin.file:
       pattern: .*cactus.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Concordion
     The application embeds the Concordion framework.
   labels:
@@ -363,7 +363,7 @@
     builtin.file:
       pattern: .*concordion.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Cucumber
     The application embeds the Cucumber framework.
   labels:
@@ -377,7 +377,7 @@
     builtin.file:
       pattern: .*cucumber.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - EtlUnit
     The application embeds the EtlUnit framework.
   labels:
@@ -391,7 +391,7 @@
     builtin.file:
       pattern: .*etlunit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - HavaRunner
     The application embeds the HavaRunner framework.
   labels:
@@ -405,7 +405,7 @@
     builtin.file:
       pattern: .*havarunner.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JBehave
     The application embeds the JBehave framework.
   labels:
@@ -419,7 +419,7 @@
     builtin.file:
       pattern: .*jbehave.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JMock
     The application embeds the JMock framework.
   labels:
@@ -433,7 +433,7 @@
     builtin.file:
       pattern: .*jmock-.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JMockit
     The application embeds the JMockit framework.
   labels:
@@ -447,7 +447,7 @@
     builtin.file:
       pattern: .*jmockit.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Jukito
     The application embeds the Jukito framework.
   labels:
@@ -461,7 +461,7 @@
     builtin.file:
       pattern: .*jukito.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Needle
     The application embeds the Needle framework.
   labels:
@@ -475,7 +475,7 @@
     builtin.file:
       pattern: .*needle.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - OpenPojo
     The application embeds the OpenPojo framework.
   labels:
@@ -489,7 +489,7 @@
     builtin.file:
       pattern: .*openpojo.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - Unitils
     The application embeds the Unitils library.
   labels:
@@ -503,7 +503,7 @@
     builtin.file:
       pattern: .*unitils.*\.jar
 - customVariables: []
-  description: |
+  description: |-
     Embedded framework - JUnit
     The application embeds the JUnit framework.
   labels:
diff --git a/default/generated/technology-usage/23-integration-technology-usage.windup.yaml b/default/generated/technology-usage/23-integration-technology-usage.windup.yaml
index f000ff9b..3f188753 100644
--- a/default/generated/technology-usage/23-integration-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/23-integration-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Apache Camel
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Teiid
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Spring Integration
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - Ikasan
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - Swagger
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Apiman
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - 3scale
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Istio
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - ServiceMix
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Mule
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Petals EIP
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - SwitchYard
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - Apache Synapse
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - WSO2
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/26-embedded-framework-technology-usage.windup.yaml b/default/generated/technology-usage/26-embedded-framework-technology-usage.windup.yaml
index 76733374..09c13bd2 100644
--- a/default/generated/technology-usage/26-embedded-framework-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/26-embedded-framework-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Apache Axis
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Apache Axis2
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Apache CXF
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - XFire
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - Jersey
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Unirest
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - Hibernate
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Hibernate OGM
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - EclipseLink
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Spring Batch
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Spring
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - AspectJ
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - JBPM
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - iLog
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - Ehcache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - Infinispan
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - Drools
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -215,6 +233,7 @@
     builtin.hasTags:
     - Camunda
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -227,6 +246,7 @@
     builtin.hasTags:
     - Pega
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -239,6 +259,7 @@
     builtin.hasTags:
     - Blaze
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -251,6 +272,7 @@
     builtin.hasTags:
     - MRules
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -263,6 +285,7 @@
     builtin.hasTags:
     - Easy Rules
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -275,6 +298,7 @@
     builtin.hasTags:
     - Coherence
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -287,6 +311,7 @@
     builtin.hasTags:
     - Apache Commons JCS
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -299,6 +324,7 @@
     builtin.hasTags:
     - Dynacache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -311,6 +337,7 @@
     builtin.hasTags:
     - Cache API
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -323,6 +350,7 @@
     builtin.hasTags:
     - Hazelcast
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -335,6 +363,7 @@
     builtin.hasTags:
     - Apache Ignite
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -347,6 +376,7 @@
     builtin.hasTags:
     - JBoss Cache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -359,6 +389,7 @@
     builtin.hasTags:
     - JCache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -371,6 +402,7 @@
     builtin.hasTags:
     - Memcached client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -383,6 +415,7 @@
     builtin.hasTags:
     - Oscache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -395,6 +428,7 @@
     builtin.hasTags:
     - ShiftOne
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -407,6 +441,7 @@
     builtin.hasTags:
     - SwarmCache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -419,6 +454,7 @@
     builtin.hasTags:
     - AOP Alliance
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -431,6 +467,7 @@
     builtin.hasTags:
     - SNMP4J
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -443,6 +480,7 @@
     builtin.hasTags:
     - HTTP Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -455,6 +493,7 @@
     builtin.hasTags:
     - Javax Inject
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -467,6 +506,7 @@
     builtin.hasTags:
     - Google Guice
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -479,6 +519,7 @@
     builtin.hasTags:
     - Plexus Container
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -491,6 +532,7 @@
     builtin.hasTags:
     - Weld
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -503,6 +545,7 @@
     builtin.hasTags:
     - Dagger
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -515,6 +558,7 @@
     builtin.hasTags:
     - GIN
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -527,6 +571,7 @@
     builtin.hasTags:
     - PicoContainer
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -539,6 +584,7 @@
     builtin.hasTags:
     - Scaldi
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -551,6 +597,7 @@
     builtin.hasTags:
     - Macros
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -563,6 +610,7 @@
     builtin.hasTags:
     - Injekt for Kotlin
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -575,6 +623,7 @@
     builtin.hasTags:
     - Kodein
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -587,6 +636,7 @@
     builtin.hasTags:
     - Peaberry
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -599,6 +649,7 @@
     builtin.hasTags:
     - Sticky Configured
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -611,6 +662,7 @@
     builtin.hasTags:
     - Ka DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -623,6 +675,7 @@
     builtin.hasTags:
     - Polyforms DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -635,6 +688,7 @@
     builtin.hasTags:
     - JayWire
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -647,6 +701,7 @@
     builtin.hasTags:
     - Silk DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -659,6 +714,7 @@
     builtin.hasTags:
     - Grapht DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -671,6 +727,7 @@
     builtin.hasTags:
     - Syringe
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -683,6 +740,7 @@
     builtin.hasTags:
     - Cfg Engine
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -695,6 +753,7 @@
     builtin.hasTags:
     - BeanInject
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -707,6 +766,7 @@
     builtin.hasTags:
     - Tornado Inject
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -719,6 +779,7 @@
     builtin.hasTags:
     - Airframe
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -731,6 +792,7 @@
     builtin.hasTags:
     - Winter
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -743,6 +805,7 @@
     builtin.hasTags:
     - KouInject
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -755,6 +818,7 @@
     builtin.hasTags:
     - Iroh
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -767,6 +831,7 @@
     builtin.hasTags:
     - Micro DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -779,6 +844,7 @@
     builtin.hasTags:
     - SubCut
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -791,6 +857,7 @@
     builtin.hasTags:
     - Spring DI
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -803,6 +870,7 @@
     builtin.hasTags:
     - Micrometer
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -815,6 +883,7 @@
     builtin.hasTags:
     - Spring Web
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -827,6 +896,7 @@
     builtin.hasTags:
     - Spring Boot Cache
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -839,6 +909,7 @@
     builtin.hasTags:
     - Spring Shell
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -851,6 +922,7 @@
     builtin.hasTags:
     - Spring Scheduled
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -863,6 +935,7 @@
     builtin.hasTags:
     - Spring Cloud Function
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -875,6 +948,7 @@
     builtin.hasTags:
     - Quartz
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -887,6 +961,7 @@
     builtin.hasTags:
     - Feign
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -899,6 +974,7 @@
     builtin.hasTags:
     - Zipkin
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -911,6 +987,7 @@
     builtin.hasTags:
     - Redis
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/28-ejb-technology-usage.windup.yaml b/default/generated/technology-usage/28-ejb-technology-usage.windup.yaml
index c7a4a84a..1a1b95f6 100644
--- a/default/generated/technology-usage/28-ejb-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/28-ejb-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/31-database-technology-usage.windup.yaml b/default/generated/technology-usage/31-database-technology-usage.windup.yaml
index 32bed1e6..e7eb29fa 100644
--- a/default/generated/technology-usage/31-database-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/31-database-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - HSQLDB Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - MySQL Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Derby Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - PostgreSQL Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - H2 Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Microsoft SQL Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - SQLite Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Oracle DB Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - Cassandra Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Axion Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - MckoiSQLDB Driver
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - MongoDB Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - Spring Data
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - Morphia
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - LevelDB Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - Apache HBase Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - Apache Accumulo Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/33-connect-technology-usage.windup.yaml b/default/generated/technology-usage/33-connect-technology-usage.windup.yaml
index 5d590b3c..a57a2ca0 100644
--- a/default/generated/technology-usage/33-connect-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/33-connect-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -19,7 +20,7 @@
         location: METHOD_CALL
         pattern: java.lang.Runtime.loadLibrary*
 - customVariables: []
-  description: |
+  description: |-
     JNA usage
     JNA is used in the application
   labels:
@@ -49,7 +50,7 @@
         location: VARIABLE_DECLARATION
         pattern: com.sun.jna*
 - customVariables: []
-  description: |
+  description: |-
     Mail usage
     Mailing is used in the application
   labels:
@@ -76,7 +77,7 @@
         location: PACKAGE
         pattern: org.apache.commons.mail*
 - customVariables: []
-  description: |
+  description: |-
     JCA usage
     JCA is used in the application
   labels:
@@ -111,6 +112,7 @@
     - builtin.file:
         pattern: ra\.xml
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -123,6 +125,7 @@
     builtin.hasTags:
     - Resource Adapter
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -135,6 +138,7 @@
     builtin.hasTags:
     - ActiveMQ
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -147,6 +151,7 @@
     builtin.hasTags:
     - OpenWS
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -159,6 +164,7 @@
     builtin.hasTags:
     - WSDL
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -171,6 +177,7 @@
     builtin.hasTags:
     - RabbitMQ Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -183,6 +190,7 @@
     builtin.hasTags:
     - Spring Messaging Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -195,6 +203,7 @@
     builtin.hasTags:
     - Camel Messaging Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -207,6 +216,7 @@
     builtin.hasTags:
     - Amazon SQS Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -219,6 +229,7 @@
     builtin.hasTags:
     - HornetQ Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -231,6 +242,7 @@
     builtin.hasTags:
     - AMQP Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -243,6 +255,7 @@
     builtin.hasTags:
     - RocketMQ Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -255,6 +268,7 @@
     builtin.hasTags:
     - 0MQ Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -267,6 +281,7 @@
     builtin.hasTags:
     - JBossMQ Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -279,6 +294,7 @@
     builtin.hasTags:
     - Zbus Client
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/35-configuration-management-technology-usage.windup.yaml b/default/generated/technology-usage/35-configuration-management-technology-usage.windup.yaml
index d5e72316..ba55e474 100644
--- a/default/generated/technology-usage/35-configuration-management-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/35-configuration-management-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Spring Cloud Config
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Application Properties File
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/37-clustering-technology-usage.windup.yaml b/default/generated/technology-usage/37-clustering-technology-usage.windup.yaml
index c018233f..ab2f3850 100644
--- a/default/generated/technology-usage/37-clustering-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/37-clustering-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Clustering Web Session
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/39-3rd-party-technology-usage.windup.yaml b/default/generated/technology-usage/39-3rd-party-technology-usage.windup.yaml
index aae0e28d..35572f08 100644
--- a/default/generated/technology-usage/39-3rd-party-technology-usage.windup.yaml
+++ b/default/generated/technology-usage/39-3rd-party-technology-usage.windup.yaml
@@ -1,4 +1,5 @@
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -11,6 +12,7 @@
     builtin.hasTags:
     - Liferay
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -23,6 +25,7 @@
     builtin.hasTags:
     - Oracle Forms
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -35,6 +38,7 @@
     builtin.hasTags:
     - Spring Boot
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -47,6 +51,7 @@
     builtin.hasTags:
     - Elasticsearch
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -59,6 +64,7 @@
     builtin.hasTags:
     - Logstash
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -71,6 +77,7 @@
     builtin.hasTags:
     - Jetty
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -83,6 +90,7 @@
     builtin.hasTags:
     - Tomcat
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -95,6 +103,7 @@
     builtin.hasTags:
     - Kibana
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -107,6 +116,7 @@
     builtin.hasTags:
     - Apache Karaf
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -119,6 +129,7 @@
     builtin.hasTags:
     - Neo4j
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -131,6 +142,7 @@
     builtin.hasTags:
     - Spark
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -143,6 +155,7 @@
     builtin.hasTags:
     - Apache Hadoop
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -155,6 +168,7 @@
     builtin.hasTags:
     - Apache Geronimo
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -167,6 +181,7 @@
     builtin.hasTags:
     - Apache Aries
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -179,6 +194,7 @@
     builtin.hasTags:
     - Cloudera
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -191,6 +207,7 @@
     builtin.hasTags:
     - MapR
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -203,6 +220,7 @@
     builtin.hasTags:
     - TensorFlow
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
@@ -215,6 +233,7 @@
     builtin.hasTags:
     - Weka
 - customVariables: []
+  description: null
   labels:
   - konveyor.io/include=always
   links: []
diff --git a/default/generated/technology-usage/ruleset.yaml b/default/generated/technology-usage/ruleset.yaml
index c0f13114..b94b459b 100644
--- a/default/generated/technology-usage/ruleset.yaml
+++ b/default/generated/technology-usage/ruleset.yaml
@@ -1,3 +1,3 @@
 name: technology-usage
-description: This ruleset adds tags the configuration management technologies so are
-  appropriately categorized on the technology reports.
+description: This ruleset provides statistical summaries of the test frameworks that
+  were found during the analysis.