From 8e9aceed9b236e43ed2853aaccf559f135bd9739 Mon Sep 17 00:00:00 2001
From: Pranav Gaikwad <pgaikwad@redhat.com>
Date: Wed, 24 Apr 2024 18:16:15 -0400
Subject: [PATCH] :ghost: reconcile with latest (#50)

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
---
 resources/rulesets.yaml                       |  47 +-
 resources/rulesets/00-discovery/0.yaml        |  12 +-
 .../azure/01-azure-aws-config.windup.yaml     |  19 +-
 .../azure/02-azure-file-system.windup.yaml    |  14 +-
 .../azure/03-azure-java-version.windup.yaml   |   9 +-
 .../azure/04-azure-logging.windup.yaml        |   4 +-
 .../azure/06-azure-password.windup.yaml       |   6 +-
 ...-azure-appservice-certificates.windup.yaml |   1 +
 ...e-appservice-datasource-driver.windup.yaml |   8 +-
 ...pservice-environment-variables.windup.yaml |  14 +-
 ...10-eap-to-azure-appservice-pom.windup.yaml |   6 +-
 .../11-spring-boot-to-azure-cache.windup.yaml |  13 +-
 ...-spring-boot-to-azure-database.windup.yaml |  20 +-
 .../15-spring-boot-to-azure-feign.windup.yaml |   4 +-
 ...oot-to-azure-identity-provider.windup.yaml |   6 +-
 ...7-spring-boot-to-azure-java-fx.windup.yaml |   5 +-
 ...pring-boot-to-azure-jms-broker.windup.yaml |   4 +-
 ...spring-boot-to-azure-mq-config.windup.yaml |   7 +-
 ...ing-boot-to-azure-schedule-job.windup.yaml |  13 +-
 ...g-boot-to-azure-static-content.windup.yaml |  10 +-
 .../24-spring-boot-to-azure-swing.windup.yaml |   5 +-
 ...ng-boot-to-azure-system-config.windup.yaml |  10 +-
 ...6-spring-boot-to-azure-version.windup.yaml |  15 +-
 ...27-spring-boot-to-azure-zipkin.windup.yaml |   2 +-
 ...-spring-cloud-to-azure-version.windup.yaml |  16 +-
 ...at-to-azure-external-resources.windup.yaml |   6 +-
 .../30-component-changes.groovy.windup.yaml   | 424 ++++++++++++++
 ....yaml => 31-component-changes.windup.yaml} |   0
 ...p.yaml => 32-java-dsl-changes.windup.yaml} |   5 +-
 ...ava-generic-information.groovy.windup.yaml | 247 ++++++++
 ...> 34-java-generic-information.windup.yaml} |  81 +--
 ...per-application-not-supported.windup.yaml} |  12 +-
 .../camel3/36-xml-31-changes.windup.yaml      | 121 ++++
 .../camel3/37-xml-310-changes.windup.yaml     | 250 ++++++++
 .../camel3/38-xml-311-changes.windup.yaml     |  83 +++
 .../camel3/39-xml-312-changes.windup.yaml     |  92 +++
 .../camel3/40-xml-313-changes.windup.yaml     |  50 ++
 .../camel3/41-xml-314-changes.windup.yaml     |  20 +
 .../camel3/42-xml-315-changes.windup.yaml     | 331 +++++++++++
 .../camel3/43-xml-316-changes.windup.yaml     |  45 ++
 .../camel3/44-xml-317-changes.windup.yaml     | 437 ++++++++++++++
 .../camel3/45-xml-318-changes.windup.yaml     |  92 +++
 .../camel3/46-xml-319-changes.windup.yaml     | 132 +++++
 .../camel3/47-xml-32-changes.windup.yaml      | 282 +++++++++
 .../camel3/48-xml-320-changes.windup.yaml     | 102 ++++
 .../camel3/49-xml-321-changes.windup.yaml     | 109 ++++
 .../camel3/50-xml-33-changes.windup.yaml      |  19 +
 .../camel3/51-xml-34-changes.windup.yaml      |  41 ++
 .../camel3/52-xml-35-changes.windup.yaml      |  22 +
 .../camel3/53-xml-36-changes.windup.yaml      |  40 ++
 .../camel3/54-xml-37-changes.windup.yaml      | 338 +++++++++++
 .../camel3/55-xml-38-changes.windup.yaml      |  53 ++
 .../camel3/56-xml-39-changes.windup.yaml      | 413 +++++++++++++
 ...up.yaml => 57-xml-dsl-changes.windup.yaml} |  24 +-
 ....yaml => 58-xml-java-versions.windup.yaml} |  54 +-
 ...ml => 59-xml-moved-components.windup.yaml} |  24 +-
 ... => 60-xml-removed-components.windup.yaml} |   0
 ... => 61-xml-renamed-components.windup.yaml} |   0
 ...dup.yaml => 62-xml-40-changes.windup.yaml} |   0
 ...dup.yaml => 63-xml-41-changes.windup.yaml} |  26 +-
 .../cloud-readiness/04-java-rpc.windup.yaml   |  29 -
 .../07-local-storage.windup.yaml              | 178 ------
 .../cloud-readiness/09-logging.windup.yaml    |  56 --
 .../cloud-readiness/10-mail.windup.yaml       |  38 --
 .../cloud-readiness/11-session.windup.yaml    |  72 ---
 .../cloud-readiness/156-java-rmi.windup.yaml  |  43 --
 .../cloud-readiness/158-jca.windup.yaml       |  24 -
 .../159-jni-native-code.windup.yaml           |  54 --
 .../160-local-storage.windup.yaml             | 151 -----
 .../164-socket-communication.windup.yaml      |  53 --
 ...> 64-embedded-cache-libraries.windup.yaml} |   0
 ....windup.yaml => 65-java-corba.windup.yaml} |   4 +-
 ...mi.windup.yaml => 66-java-rmi.windup.yaml} |  17 +-
 ...pc.windup.yaml => 67-java-rpc.windup.yaml} |   8 +-
 ...{05-jca.windup.yaml => 68-jca.windup.yaml} |  12 +-
 ...up.yaml => 69-jni-native-code.windup.yaml} |  28 +-
 .../70-local-storage.windup.yaml              | 231 ++++++++
 ...t.windup.yaml => 71-localhost.windup.yaml} |   0
 ...ing.windup.yaml => 72-logging.windup.yaml} |  29 +-
 ...2-mail.windup.yaml => 73-mail.windup.yaml} |  15 +-
 ...ion.windup.yaml => 74-session.windup.yaml} |  41 +-
 ...ml => 75-socket-communication.windup.yaml} |  32 +-
 .../rulesets/eap6/51-weblogic-jms.windup.yaml | 185 ------
 .../eap6/52-weblogic-services.windup.yaml     |  67 ---
 .../eap6/53-weblogic-webapp.windup.yaml       | 226 --------
 .../eap6/54-weblogic-webservices.windup.yaml  | 170 ------
 .../55-weblogic-xml-descriptors.windup.yaml   | 406 -------------
 .../rulesets/eap6/56-weblogic.windup.yaml     | 375 ------------
 .../eap6/59-websphere-jms.windup.yaml         | 174 ------
 .../rulesets/eap6/60-websphere-mq.windup.yaml |  94 ---
 .../eap6/61-websphere-mqe.windup.yaml         | 127 ----
 .../eap6/62-websphere-other.windup.yaml       |  54 --
 .../eap6/63-websphere-xml.windup.yaml         | 185 ------
 ...onj.windup.yaml => 77-commonj.windup.yaml} |   8 +-
 ...ndup.yaml => 78-xml-glassfish.windup.yaml} |  19 +
 ...dup.yaml => 79-java-ee-jaxrpc.windup.yaml} |   0
 ...a.windup.yaml => 80-seam-java.windup.yaml} |  59 +-
 ...-ui.windup.yaml => 81-seam-ui.windup.yaml} | 141 ++---
 ...up.yaml => 82-xml-webservices.windup.yaml} |   4 +
 ...up.yaml => 83-eap4-xml-config.windup.yaml} | 318 ++++++----
 ...up.yaml => 84-jboss-eap5-java.windup.yaml} |  95 +--
 ...dup.yaml => 85-jboss-eap5-xml.windup.yaml} |  33 +-
 ...sy.windup.yaml => 86-resteasy.windup.yaml} |   0
 .../rulesets/eap6/87-xml-jonas.windup.yaml    |  20 +
 ...{37-jotm.rhamt.yaml => 88-jotm.rhamt.yaml} |  14 +-
 ...ndup.yaml => 89-jrun-catchall.windup.yaml} |   0
 ...un.windup.yaml => 90-xml-jrun.windup.yaml} |   9 +
 ...{40-jsp.windup.yaml => 91-jsp.windup.yaml} |   4 +-
 ...log4j.windup.yaml => 92-log4j.windup.yaml} |   5 +-
 ...n.windup.yaml => 93-xml-orion.windup.yaml} |   0
 ...n.windup.yaml => 94-xml-resin.windup.yaml} |   0
 ...l => 95-environment-dependent.windup.yaml} |  61 +-
 ...p.yaml => 96-generic-catchall.windup.yaml} |  28 +-
 ....yaml => 97-ignore-references.windup.yaml} |   0
 ...e64.windup.yaml => 100-base64.windup.yaml} |  10 +-
 ...rpc.windup.yaml => 101-jaxrpc.windup.yaml} |   0
 ...yaml => 102-jboss-eap5-7-java.windup.yaml} | 105 ++--
 ....yaml => 103-jboss-eap5-7-xml.windup.yaml} |  38 +-
 ...=> 104-jboss-eap5and6to7-java.windup.yaml} |   5 +-
 ... => 105-jboss-eap5and6to7-xml.windup.yaml} | 100 ++--
 ...y.windup.yaml => 106-resteasy.windup.yaml} |   0
 ...l.windup.yaml => 107-eap6-xml.windup.yaml} |   0
 resources/rulesets/eap7/108-eap6.windup.yaml  | 166 ++++++
 ...up.yaml => 109-hibernate4-xml.windup.yaml} |  24 +-
 ...windup.yaml => 110-hibernate4.windup.yaml} |  50 +-
 ...ch.windup.yaml => 111-hsearch.windup.yaml} |  96 +--
 ...-ws.windup.yaml => 112-jax-ws.windup.yaml} |   5 +-
 ...y.windup.yaml => 113-resteasy.windup.yaml} |  54 +-
 ...indup.yaml => 114-ws-security.windup.yaml} |  18 +-
 ...up.yaml => 115-hibernate50-51.windup.yaml} |  20 +-
 ...up.yaml => 116-hibernate51-53.windup.yaml} |  38 +-
 ...ndup.yaml => 117-picketlink25.windup.yaml} |   8 +-
 ...dup.yaml => 118-resteasy30-36.windup.yaml} |   0
 ...119-deprecated-singletonpolicy.rhamt.yaml} |   0
 ...> 120-maven-artemis-jms-client.rhamt.yaml} |   0
 ... => 121-maven-javax-to-jakarta.rhamt.yaml} |   0
 ...2-maven-jboss-rmi-api_1.0_spec.rhamt.yaml} |   0
 ...o-microprofile-rest-client-1.3.rhamt.yaml} |   0
 ...l => 124-singleton-sessionbean.rhamt.yaml} |  12 +-
 ...25-microprofile_removed_from_eap.mta.yaml} |   0
 .../rulesets/eap7/126-elytron.windup.yaml     |  40 ++
 ...-embedded-framework-libraries.windup.yaml} |   0
 .../128-java-wsdl-mapping.yaml}               |   0
 .../129-weblogic-catchall.windup.yaml}        |  44 +-
 .../130-weblogic-ejb.windup.yaml}             |  22 +-
 ...31-weblogic-ignore-references.windup.yaml} |   0
 ...ndup.yaml => 132-weblogic-jms.windup.yaml} |  80 ++-
 ...yaml => 133-weblogic-services.windup.yaml} |  18 +-
 ...p.yaml => 134-weblogic-webapp.windup.yaml} |  63 +-
 ...l => 135-weblogic-webservices.windup.yaml} |  77 ++-
 ... 136-weblogic-xml-descriptors.windup.yaml} |  60 +-
 ...c.windup.yaml => 137-weblogic.windup.yaml} | 112 ++--
 .../138-websphere-catchall.windup.yaml}       |  22 +-
 ...9-websphere-ignore-references.windup.yaml} |   0
 ...dup.yaml => 140-websphere-jms.windup.yaml} |  41 +-
 ...ndup.yaml => 141-websphere-mq.windup.yaml} |  15 +-
 ...dup.yaml => 142-websphere-mqe.windup.yaml} |  38 +-
 ...p.yaml => 143-websphere-other.windup.yaml} |  18 +-
 ...dup.yaml => 144-websphere-xml.windup.yaml} |  21 +-
 resources/rulesets/eap7/74-eap6.windup.yaml   |  80 ---
 ...98-jboss-eap4and5to6and7-java.windup.yaml} |  14 +-
 ... 99-jboss-eap4and5to6and7-xml.windup.yaml} |  50 +-
 .../eap8/117-jakarta-json-binding.windup.yaml |  20 -
 ...windup.yaml => 145-eap8-faces.windup.yaml} |  30 +-
 ...dup.yaml => 146-eap8-resteasy.windup.yaml} |   4 +-
 ....yaml => 147-eap8-xml-binding.windup.yaml} |   0
 ...b.windup.yaml => 148-eap8.ejb.windup.yaml} |   0
 ...itialcontextfactory-is-removed.windup.yaml |  25 +
 ...p.yaml => 150-empty-beans-xml.windup.yaml} |   4 +-
 ...dup.yaml => 151-hibernate-6.2.windup.yaml} |  42 +-
 ...l => 152-hibernate-search-6.1.windup.yaml} |  48 +-
 ....yaml => 153-hibernate-search.windup.yaml} | 546 ++++++++++++------
 ...windup.yaml => 154-hibernate6.windup.yaml} | 140 ++++-
 ...indup.yaml => 155-jakarta-cdi.windup.yaml} |   8 +
 ...windup.yaml => 156-jakarta-el.windup.yaml} |   4 +
 ...dup.yaml => 157-jakarta-faces.windup.yaml} |  10 +-
 .../eap8/158-jakarta-json-binding.windup.yaml |  20 +
 ...ndup.yaml => 159-jakarta-soap.windup.yaml} |   4 +
 ...dup.yaml => 160-jakarta-ws-rs.windup.yaml} |   2 +
 ...-javaee-to-jakarta-namespaces.windup.yaml} | 124 +++-
 ...o-jakarta-bootstrapping-files.windup.yaml} |   2 +
 ...javax-to-jakarta-dependencies.windup.yaml} |  16 +
 ... 164-javax-to-jakarta-package.windup.yaml} |   4 +-
 ...5-javax-to-jakarta-properties.windup.yaml} |   4 +-
 ... 166-javax-to-jakarta-servlet.windup.yaml} | 182 ++++--
 ...aml => 167-jboss-dependencies.windup.yaml} | 154 +++--
 ...p.yaml => 168-keycloak-openid.windup.yaml} |   0
 ...ndup.yaml => 169-legacy-vault.windup.yaml} |   4 +-
 .../eap8/170-log4j-removed.windup.yaml        | 165 ++++++
 ...dup.yaml => 171-login-modules.windup.yaml} |   0
 ...windup.yaml => 172-picketlink.windup.yaml} |  12 +-
 ...ven_plugin_configuration_changes.mta.yaml} |   0
 ...icroprofile_metrics_not_supported.mta.yaml |  22 +
 ...profile_opentracing_not_supported.mta.yaml |  22 +
 ...orntail_yaml_configuration_files.mta.yaml} |   0
 ...ml => 177-replace_thorntail_boms.mta.yaml} |   0
 ... 178-replace_thorntail_fractions.mta.yaml} |   0
 ...9-replace_thorntail_maven_plugin.mta.yaml} |   0
 ...-5.windup.yaml => 185-soa-p-5.windup.yaml} | 490 +++++++++-------
 ...up.yaml => 182-sonic-catchall.windup.yaml} |   6 +-
 ....windup.yaml => 183-sonic-esb.windup.yaml} | 107 ++--
 ...dup.yaml => 184-xml-sonic-esb.windup.yaml} |   0
 .../hibernate/143-hibernate-xml.windup.yaml   |  76 ---
 ...aml => 186-hibernate-catchall.windup.yaml} |   0
 .../hibernate/187-hibernate-xml.windup.yaml   | 122 ++++
 ....windup.yaml => 188-hibernate.windup.yaml} |  41 +-
 .../189-spring-components.windup.yaml         |  47 ++
 resources/rulesets/jakarta-ee9/ruleset.yaml   |   1 +
 ...dup.yaml => 191-java-removals.windup.yaml} | 180 +++---
 ...=> 192-removed-javaee-modules.windup.yaml} |  28 +-
 ...=> 193-applet-api-deprecation.windup.yaml} |   8 +-
 ...bok.windup.yaml => 194-lombok.windup.yaml} |   8 +-
 ...p.yaml => 195-removed-classes.windup.yaml} |  10 +-
 ....yaml => 196-removed-packages.windup.yaml} |  14 +-
 ...-security-manager-deprecation.windup.yaml} |  48 +-
 ... => 198-deprecation-openjdk18.windup.yaml} |   8 +-
 ... => 199-deprecation-openjdk19.windup.yaml} |   4 +-
 ... => 200-deprecation-openjdk20.windup.yaml} |   4 +-
 ... => 201-deprecation-openjdk21.windup.yaml} |   4 +-
 ...up.yaml => 202-dynamic-agents.windup.yaml} |   6 +-
 ... 203-finalization-deprecation.windup.yaml} |  16 +-
 ...ndup.yaml => 204-removed-apis.windup.yaml} |  15 +-
 ....yaml => 205-utf-8-by-default.windup.yaml} |   8 +-
 ...amt.yaml => 206-oracle2openjdk.rhamt.yaml} | 108 +++-
 ...java-unavailable-technologies.windup.yaml} |   0
 ...here-unavailable-technologies.windup.yaml} |  10 +-
 .../quarkus/01-agroal-to-quarkus.windup.yaml  |  32 -
 .../quarkus/02-amazon-to-quarkus.windup.yaml  | 380 ------------
 .../03-apicurio-to-quarkus.windup.yaml        |  36 --
 .../quarkus/04-artemis-to-quarkus.windup.yaml |  36 --
 .../quarkus/05-avro-to-quarkus.windup.yaml    |  32 -
 .../quarkus/06-config-to-quarkus.windup.yaml  |  36 --
 .../quarkus/07-elytron-to-quarkus.windup.yaml | 108 ----
 .../quarkus/08-flyway-to-quarkus.windup.yaml  |  34 --
 .../09-hibernate-to-quarkus.windup.yaml       | 144 -----
 .../quarkus/10-jdbc-to-quarkus.windup.yaml    | 212 -------
 .../quarkus/11-jsonb-to-quarkus.windup.yaml   |  32 -
 .../quarkus/12-jsonp-to-quarkus.windup.yaml   |  34 --
 .../quarkus/13-kafka-to-quarkus.windup.yaml   |  72 ---
 .../14-keycloak-to-quarkus.windup.yaml        |  36 --
 .../15-kubernetes-to-quarkus.windup.yaml      |  36 --
 .../16-liquibase-to-quarkus.windup.yaml       |  70 ---
 .../quarkus/17-logging-to-quarkus.windup.yaml |  70 ---
 .../18-micrometer-to-quarkus.windup.yaml      |  36 --
 .../19-narayana-to-quarkus.windup.yaml        | 106 ----
 .../20-openshift-to-quarkus.windup.yaml       |  36 --
 .../203-javaee-faces-to-quarkus.windup.yaml   |  26 -
 .../21-opentelemetry-to-quarkus.windup.yaml   |  72 ---
 ...up.yaml => 210-cdi-to-quarkus.windup.yaml} |  22 +-
 ...ependency-removal-for-quarkus.windup.yaml} |   2 +-
 .../212-jakarta-cdi-to-quarkus.windup.yaml    |  99 ++++
 .../213-jakarta-faces-to-quarkus.windup.yaml  |  49 ++
 .../214-jakarta-jaxrs-to-quarkus.windup.yaml  |  38 ++
 .../215-javaee-faces-to-quarkus.windup.yaml   |  26 +
 ... => 216-javaee-pom-to-quarkus.windup.yaml} | 104 ++--
 ....yaml => 217-jaxrs-to-quarkus.windup.yaml} |  12 +-
 .../218-jms-to-reactive-quarkus.windup.yaml   | 152 +++++
 ...pringboot-actuator-to-quarkus.windup.yaml} |   6 +-
 .../quarkus/22-picocli-to-quarkus.windup.yaml |  32 -
 ...ngboot-annotations-to-quarkus.windup.yaml} |   4 +-
 ...1-springboot-cache-to-quarkus.windup.yaml} |   6 +-
 ...loud-config-client-to-quarkus.windup.yaml} |   4 +-
 ...pringboot-data-jpa-to-quarkus.windup.yaml} |   7 +-
 ...pringboot-devtools-to-quarkus.windup.yaml} |   5 +-
 ... 225-springboot-di-to-quarkus.windup.yaml} |   8 +-
 ...6-springboot-generic-catchall.windup.yaml} |   4 +-
 ...ngboot-integration-to-quarkus.windup.yaml} |   8 +-
 ...228-springboot-jmx-to-quarkus.windup.yaml} |  16 +-
 ...springboot-metrics-to-quarkus.windup.yaml} |  11 +-
 .../23-resteasy-to-quarkus.windup.yaml        |  36 --
 ...ingboot-parent-pom-to-quarkus.windup.yaml} |   4 +-
 ...springboot-plugins-to-quarkus.windup.yaml} |   8 +-
 ...ingboot-properties-to-quarkus.windup.yaml} |  42 +-
 ...ringboot-scheduled-to-quarkus.windup.yaml} |   9 +-
 ...pringboot-security-to-quarkus.windup.yaml} |   4 +-
 ...5-springboot-shell-to-quarkus.windup.yaml} |  11 +-
 ...236-springboot-web-to-quarkus.windup.yaml} |  13 +-
 ...-springboot-webmvc-to-quarkus.windup.yaml} |  12 +-
 ...pringboot-associated-artifacts.rhamt.yaml} |  32 +-
 ...amt.yaml => 239-springboot-rhr.rhamt.yaml} |   6 +-
 .../03-web-technology-usage.windup.yaml       | 181 ++++++
 ...t-frameworks-technology-usage.windup.yaml} |   0
 ... 08-security-technology-usage.windup.yaml} |   0
 ...bservability-technology-usage.windup.yaml} |   0
 ...non-xml-rules-technology-usage.rhamt.yaml} |   0
 ...ml => 13-mvc-technology-usage.windup.yaml} |   0
 ...14-messaging-technology-usage.windup.yaml} |   0
 ...=> 15-markup-technology-usage.windup.yaml} |   0
 ...> 17-logging-technology-usage.windup.yaml} |   0
 ...ml => 19-jta-technology-usage.windup.yaml} |   0
 .../197-discovery-target.windup.yaml          |   1 -
 ...=> 21-javase-technology-usage.windup.yaml} |   0
 ...=> 22-javaee-technology-usage.windup.yaml} |   0
 .../24-http-technology-usage.windup.yaml      |   1 -
 .../241-3rd-party-spring.windup.yaml          |  31 +
 ....windup.yaml => 243-3rd-party.windup.yaml} |   0
 .../technology-usage/245-apm.windup.yaml      |  73 +++
 ...windup.yaml => 247-clustering.windup.yaml} |   0
 ... 249-configuration-management.windup.yaml} |   6 +-
 ...-integration-technology-usage.windup.yaml} |   0
 ...up.yaml => 251-connect.groovy.windup.yaml} |  91 +--
 ...p.yaml => 253-database.groovy.windup.yaml} | 137 ++---
 .../254-discovery-target.windup.yaml}         |   0
 ...99-ejb.windup.yaml => 256-ejb.windup.yaml} |   0
 .../257-embedded-cache-libraries.windup.yaml} | 117 ++--
 ...aml => 259-embedded-framework.windup.yaml} |  12 -
 ...l => 26-http-technology-usage.windup.yaml} |   0
 ...indup.yaml => 262-integration.windup.yaml} |   0
 ...3-javaee-technology-tag.groovy.windup.yaml |  13 +
 ...ase.windup.yaml => 266-javase.windup.yaml} |   0
 ...09-jta.windup.yaml => 268-jta.windup.yaml} |   0
 ...dup.yaml => 270-logging-usage.windup.yaml} |   0
 ...15-mvc.windup.yaml => 274-mvc.windup.yaml} |   0
 ...dup.yaml => 277-observability.windup.yaml} |   0
 ...y.windup.yaml => 279-security.windup.yaml} |   0
 ...ed-framework-technology-usage.windup.yaml} |   0
 ...p.yaml => 280-spring-catchall.windup.yaml} |   0
 ... => 282-test-frameworks-usage.windup.yaml} |   0
 ...-usage.windup.yaml => 284-web.windup.yaml} |  86 +--
 ...ml => 31-ejb-technology-usage.windup.yaml} |   0
 ... 34-database-technology-usage.windup.yaml} | 115 +++-
 ...> 36-connect-technology-usage.windup.yaml} |  29 +
 ...n-management-technology-usage.windup.yaml} |   0
 ...0-clustering-technology-usage.windup.yaml} |   0
 .../42-apm-technology-usage.windup.yaml       |  48 ++
 ...44-3rd-party-technology-usage.windup.yaml} |   0
 ...-party-spring-technology-usage.windup.yaml |  48 ++
 327 files changed, 9159 insertions(+), 7090 deletions(-)
 create mode 100644 resources/rulesets/camel3/30-component-changes.groovy.windup.yaml
 rename resources/rulesets/camel3/{16-component-changes.windup.yaml => 31-component-changes.windup.yaml} (100%)
 rename resources/rulesets/camel3/{17-java-dsl-changes.windup.yaml => 32-java-dsl-changes.windup.yaml} (78%)
 create mode 100644 resources/rulesets/camel3/33-java-generic-information.groovy.windup.yaml
 rename resources/rulesets/camel3/{18-java-generic-information.windup.yaml => 34-java-generic-information.windup.yaml} (92%)
 rename resources/rulesets/camel3/{19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml => 35-java-multiple-camelcontexts-per-application-not-supported.windup.yaml} (79%)
 create mode 100644 resources/rulesets/camel3/36-xml-31-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/37-xml-310-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/38-xml-311-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/39-xml-312-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/40-xml-313-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/41-xml-314-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/42-xml-315-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/43-xml-316-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/44-xml-317-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/45-xml-318-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/46-xml-319-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/47-xml-32-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/48-xml-320-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/49-xml-321-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/50-xml-33-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/51-xml-34-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/52-xml-35-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/53-xml-36-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/54-xml-37-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/55-xml-38-changes.windup.yaml
 create mode 100644 resources/rulesets/camel3/56-xml-39-changes.windup.yaml
 rename resources/rulesets/camel3/{20-xml-dsl-changes.windup.yaml => 57-xml-dsl-changes.windup.yaml} (89%)
 rename resources/rulesets/camel3/{21-xml-java-versions.windup.yaml => 58-xml-java-versions.windup.yaml} (62%)
 rename resources/rulesets/camel3/{22-xml-moved-components.windup.yaml => 59-xml-moved-components.windup.yaml} (84%)
 rename resources/rulesets/camel3/{23-xml-removed-components.windup.yaml => 60-xml-removed-components.windup.yaml} (100%)
 rename resources/rulesets/camel3/{24-xml-renamed-components.windup.yaml => 61-xml-renamed-components.windup.yaml} (100%)
 rename resources/rulesets/camel4/{01-xml-40-changes.windup.yaml => 62-xml-40-changes.windup.yaml} (100%)
 rename resources/rulesets/camel4/{02-xml-41-changes.windup.yaml => 63-xml-41-changes.windup.yaml} (95%)
 delete mode 100644 resources/rulesets/cloud-readiness/04-java-rpc.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/07-local-storage.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/09-logging.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/10-mail.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/11-session.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/156-java-rmi.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/158-jca.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/159-jni-native-code.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/160-local-storage.windup.yaml
 delete mode 100644 resources/rulesets/cloud-readiness/164-socket-communication.windup.yaml
 rename resources/rulesets/cloud-readiness/{01-embedded-cache-libraries.windup.yaml => 64-embedded-cache-libraries.windup.yaml} (100%)
 rename resources/rulesets/cloud-readiness/{02-java-corba.windup.yaml => 65-java-corba.windup.yaml} (82%)
 rename resources/rulesets/cloud-readiness/{03-java-rmi.windup.yaml => 66-java-rmi.windup.yaml} (63%)
 rename resources/rulesets/cloud-readiness/{157-java-rpc.windup.yaml => 67-java-rpc.windup.yaml} (69%)
 rename resources/rulesets/cloud-readiness/{05-jca.windup.yaml => 68-jca.windup.yaml} (56%)
 rename resources/rulesets/cloud-readiness/{06-jni-native-code.windup.yaml => 69-jni-native-code.windup.yaml} (76%)
 create mode 100644 resources/rulesets/cloud-readiness/70-local-storage.windup.yaml
 rename resources/rulesets/cloud-readiness/{08-localhost.windup.yaml => 71-localhost.windup.yaml} (100%)
 rename resources/rulesets/cloud-readiness/{161-logging.windup.yaml => 72-logging.windup.yaml} (57%)
 rename resources/rulesets/cloud-readiness/{162-mail.windup.yaml => 73-mail.windup.yaml} (62%)
 rename resources/rulesets/cloud-readiness/{163-session.windup.yaml => 74-session.windup.yaml} (64%)
 rename resources/rulesets/cloud-readiness/{12-socket-communication.windup.yaml => 75-socket-communication.windup.yaml} (55%)
 delete mode 100644 resources/rulesets/eap6/51-weblogic-jms.windup.yaml
 delete mode 100644 resources/rulesets/eap6/52-weblogic-services.windup.yaml
 delete mode 100644 resources/rulesets/eap6/53-weblogic-webapp.windup.yaml
 delete mode 100644 resources/rulesets/eap6/54-weblogic-webservices.windup.yaml
 delete mode 100644 resources/rulesets/eap6/55-weblogic-xml-descriptors.windup.yaml
 delete mode 100644 resources/rulesets/eap6/56-weblogic.windup.yaml
 delete mode 100644 resources/rulesets/eap6/59-websphere-jms.windup.yaml
 delete mode 100644 resources/rulesets/eap6/60-websphere-mq.windup.yaml
 delete mode 100644 resources/rulesets/eap6/61-websphere-mqe.windup.yaml
 delete mode 100644 resources/rulesets/eap6/62-websphere-other.windup.yaml
 delete mode 100644 resources/rulesets/eap6/63-websphere-xml.windup.yaml
 rename resources/rulesets/eap6/{26-commonj.windup.yaml => 77-commonj.windup.yaml} (93%)
 rename resources/rulesets/eap6/{27-xml-glassfish.windup.yaml => 78-xml-glassfish.windup.yaml} (68%)
 rename resources/rulesets/eap6/{28-java-ee-jaxrpc.windup.yaml => 79-java-ee-jaxrpc.windup.yaml} (100%)
 rename resources/rulesets/eap6/{29-seam-java.windup.yaml => 80-seam-java.windup.yaml} (93%)
 rename resources/rulesets/eap6/{30-seam-ui.windup.yaml => 81-seam-ui.windup.yaml} (82%)
 rename resources/rulesets/eap6/{31-xml-webservices.windup.yaml => 82-xml-webservices.windup.yaml} (99%)
 rename resources/rulesets/eap6/{32-eap4-xml-config.windup.yaml => 83-eap4-xml-config.windup.yaml} (63%)
 rename resources/rulesets/eap6/{33-jboss-eap5-java.windup.yaml => 84-jboss-eap5-java.windup.yaml} (82%)
 rename resources/rulesets/eap6/{34-jboss-eap5-xml.windup.yaml => 85-jboss-eap5-xml.windup.yaml} (92%)
 rename resources/rulesets/eap6/{35-resteasy.windup.yaml => 86-resteasy.windup.yaml} (100%)
 create mode 100644 resources/rulesets/eap6/87-xml-jonas.windup.yaml
 rename resources/rulesets/eap6/{37-jotm.rhamt.yaml => 88-jotm.rhamt.yaml} (51%)
 rename resources/rulesets/eap6/{38-jrun-catchall.windup.yaml => 89-jrun-catchall.windup.yaml} (100%)
 rename resources/rulesets/eap6/{39-xml-jrun.windup.yaml => 90-xml-jrun.windup.yaml} (79%)
 rename resources/rulesets/eap6/{40-jsp.windup.yaml => 91-jsp.windup.yaml} (75%)
 rename resources/rulesets/eap6/{41-log4j.windup.yaml => 92-log4j.windup.yaml} (94%)
 rename resources/rulesets/eap6/{42-xml-orion.windup.yaml => 93-xml-orion.windup.yaml} (100%)
 rename resources/rulesets/eap6/{43-xml-resin.windup.yaml => 94-xml-resin.windup.yaml} (100%)
 rename resources/rulesets/eap6/{44-environment-dependent.windup.yaml => 95-environment-dependent.windup.yaml} (68%)
 rename resources/rulesets/eap6/{45-generic-catchall.windup.yaml => 96-generic-catchall.windup.yaml} (91%)
 rename resources/rulesets/eap6/{36-xml-jonas.windup.yaml => 97-ignore-references.windup.yaml} (100%)
 rename resources/rulesets/eap7/{66-base64.windup.yaml => 100-base64.windup.yaml} (56%)
 rename resources/rulesets/eap7/{67-jaxrpc.windup.yaml => 101-jaxrpc.windup.yaml} (100%)
 rename resources/rulesets/eap7/{68-jboss-eap5-7-java.windup.yaml => 102-jboss-eap5-7-java.windup.yaml} (80%)
 rename resources/rulesets/eap7/{69-jboss-eap5-7-xml.windup.yaml => 103-jboss-eap5-7-xml.windup.yaml} (81%)
 rename resources/rulesets/eap7/{70-jboss-eap5and6to7-java.windup.yaml => 104-jboss-eap5and6to7-java.windup.yaml} (97%)
 rename resources/rulesets/eap7/{71-jboss-eap5and6to7-xml.windup.yaml => 105-jboss-eap5and6to7-xml.windup.yaml} (84%)
 rename resources/rulesets/eap7/{72-resteasy.windup.yaml => 106-resteasy.windup.yaml} (100%)
 rename resources/rulesets/eap7/{73-eap6-xml.windup.yaml => 107-eap6-xml.windup.yaml} (100%)
 create mode 100644 resources/rulesets/eap7/108-eap6.windup.yaml
 rename resources/rulesets/eap7/{75-hibernate4-xml.windup.yaml => 109-hibernate4-xml.windup.yaml} (81%)
 rename resources/rulesets/eap7/{76-hibernate4.windup.yaml => 110-hibernate4.windup.yaml} (94%)
 rename resources/rulesets/eap7/{77-hsearch.windup.yaml => 111-hsearch.windup.yaml} (95%)
 rename resources/rulesets/eap7/{78-jax-ws.windup.yaml => 112-jax-ws.windup.yaml} (89%)
 rename resources/rulesets/eap7/{79-resteasy.windup.yaml => 113-resteasy.windup.yaml} (96%)
 rename resources/rulesets/eap7/{80-ws-security.windup.yaml => 114-ws-security.windup.yaml} (75%)
 rename resources/rulesets/eap7/{81-hibernate50-51.windup.yaml => 115-hibernate50-51.windup.yaml} (72%)
 rename resources/rulesets/eap7/{82-hibernate51-53.windup.yaml => 116-hibernate51-53.windup.yaml} (95%)
 rename resources/rulesets/eap7/{83-picketlink25.windup.yaml => 117-picketlink25.windup.yaml} (69%)
 rename resources/rulesets/eap7/{84-resteasy30-36.windup.yaml => 118-resteasy30-36.windup.yaml} (100%)
 rename resources/rulesets/eap7/{85-deprecated-singletonpolicy.rhamt.yaml => 119-deprecated-singletonpolicy.rhamt.yaml} (100%)
 rename resources/rulesets/eap7/{86-maven-artemis-jms-client.rhamt.yaml => 120-maven-artemis-jms-client.rhamt.yaml} (100%)
 rename resources/rulesets/eap7/{87-maven-javax-to-jakarta.rhamt.yaml => 121-maven-javax-to-jakarta.rhamt.yaml} (100%)
 rename resources/rulesets/eap7/{88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml => 122-maven-jboss-rmi-api_1.0_spec.rhamt.yaml} (100%)
 rename resources/rulesets/eap7/{89-move-to-microprofile-rest-client-1.3.rhamt.yaml => 123-move-to-microprofile-rest-client-1.3.rhamt.yaml} (100%)
 rename resources/rulesets/eap7/{90-singleton-sessionbean.rhamt.yaml => 124-singleton-sessionbean.rhamt.yaml} (58%)
 rename resources/rulesets/eap7/{91-microprofile_removed_from_eap.mta.yaml => 125-microprofile_removed_from_eap.mta.yaml} (100%)
 create mode 100644 resources/rulesets/eap7/126-elytron.windup.yaml
 rename resources/rulesets/eap7/{92-embedded-framework-libraries.windup.yaml => 127-embedded-framework-libraries.windup.yaml} (100%)
 rename resources/rulesets/{eap6/46-ignore-references.windup.yaml => eap7/128-java-wsdl-mapping.yaml} (100%)
 rename resources/rulesets/{eap6/48-weblogic-catchall.windup.yaml => eap7/129-weblogic-catchall.windup.yaml} (75%)
 rename resources/rulesets/{eap6/49-weblogic-ejb.windup.yaml => eap7/130-weblogic-ejb.windup.yaml} (86%)
 rename resources/rulesets/{eap6/47-java-wsdl-mapping.yaml => eap7/131-weblogic-ignore-references.windup.yaml} (100%)
 rename resources/rulesets/eap7/{94-weblogic-jms.windup.yaml => 132-weblogic-jms.windup.yaml} (67%)
 rename resources/rulesets/eap7/{95-weblogic-services.windup.yaml => 133-weblogic-services.windup.yaml} (72%)
 rename resources/rulesets/eap7/{96-weblogic-webapp.windup.yaml => 134-weblogic-webapp.windup.yaml} (71%)
 rename resources/rulesets/eap7/{97-weblogic-webservices.windup.yaml => 135-weblogic-webservices.windup.yaml} (63%)
 rename resources/rulesets/eap7/{98-weblogic-xml-descriptors.windup.yaml => 136-weblogic-xml-descriptors.windup.yaml} (87%)
 rename resources/rulesets/eap7/{99-weblogic.windup.yaml => 137-weblogic.windup.yaml} (70%)
 rename resources/rulesets/{eap6/57-websphere-catchall.windup.yaml => eap7/138-websphere-catchall.windup.yaml} (73%)
 rename resources/rulesets/{eap6/50-weblogic-ignore-references.windup.yaml => eap7/139-websphere-ignore-references.windup.yaml} (100%)
 rename resources/rulesets/eap7/{100-websphere-jms.windup.yaml => 140-websphere-jms.windup.yaml} (81%)
 rename resources/rulesets/eap7/{101-websphere-mq.windup.yaml => 141-websphere-mq.windup.yaml} (82%)
 rename resources/rulesets/eap7/{102-websphere-mqe.windup.yaml => 142-websphere-mqe.windup.yaml} (70%)
 rename resources/rulesets/eap7/{103-websphere-other.windup.yaml => 143-websphere-other.windup.yaml} (68%)
 rename resources/rulesets/eap7/{104-websphere-xml.windup.yaml => 144-websphere-xml.windup.yaml} (91%)
 delete mode 100644 resources/rulesets/eap7/74-eap6.windup.yaml
 rename resources/rulesets/eap7/{64-jboss-eap4and5to6and7-java.windup.yaml => 98-jboss-eap4and5to6and7-java.windup.yaml} (84%)
 rename resources/rulesets/eap7/{65-jboss-eap4and5to6and7-xml.windup.yaml => 99-jboss-eap4and5to6and7-xml.windup.yaml} (78%)
 delete mode 100644 resources/rulesets/eap8/117-jakarta-json-binding.windup.yaml
 rename resources/rulesets/eap8/{105-eap8-faces.windup.yaml => 145-eap8-faces.windup.yaml} (91%)
 rename resources/rulesets/eap8/{106-eap8-resteasy.windup.yaml => 146-eap8-resteasy.windup.yaml} (98%)
 rename resources/rulesets/eap8/{107-eap8-xml-binding.windup.yaml => 147-eap8-xml-binding.windup.yaml} (100%)
 rename resources/rulesets/eap8/{108-eap8.ejb.windup.yaml => 148-eap8.ejb.windup.yaml} (100%)
 create mode 100644 resources/rulesets/eap8/149-deprecated-initialcontextfactory-is-removed.windup.yaml
 rename resources/rulesets/eap8/{109-empty-beans-xml.windup.yaml => 150-empty-beans-xml.windup.yaml} (83%)
 rename resources/rulesets/eap8/{110-hibernate-6.2.windup.yaml => 151-hibernate-6.2.windup.yaml} (93%)
 rename resources/rulesets/eap8/{111-hibernate-search-6.1.windup.yaml => 152-hibernate-search-6.1.windup.yaml} (90%)
 rename resources/rulesets/eap8/{112-hibernate-search.windup.yaml => 153-hibernate-search.windup.yaml} (81%)
 rename resources/rulesets/eap8/{113-hibernate6.windup.yaml => 154-hibernate6.windup.yaml} (84%)
 rename resources/rulesets/eap8/{114-jakarta-cdi.windup.yaml => 155-jakarta-cdi.windup.yaml} (92%)
 rename resources/rulesets/eap8/{115-jakarta-el.windup.yaml => 156-jakarta-el.windup.yaml} (91%)
 rename resources/rulesets/eap8/{116-jakarta-faces.windup.yaml => 157-jakarta-faces.windup.yaml} (76%)
 create mode 100644 resources/rulesets/eap8/158-jakarta-json-binding.windup.yaml
 rename resources/rulesets/eap8/{118-jakarta-soap.windup.yaml => 159-jakarta-soap.windup.yaml} (90%)
 rename resources/rulesets/eap8/{119-jakarta-ws-rs.windup.yaml => 160-jakarta-ws-rs.windup.yaml} (92%)
 rename resources/rulesets/eap8/{120-javaee-to-jakarta-namespaces.windup.yaml => 161-javaee-to-jakarta-namespaces.windup.yaml} (91%)
 rename resources/rulesets/eap8/{121-javax-to-jakarta-bootstrapping-files.windup.yaml => 162-javax-to-jakarta-bootstrapping-files.windup.yaml} (91%)
 rename resources/rulesets/eap8/{122-javax-to-jakarta-dependencies.windup.yaml => 163-javax-to-jakarta-dependencies.windup.yaml} (92%)
 rename resources/rulesets/eap8/{123-javax-to-jakarta-package.windup.yaml => 164-javax-to-jakarta-package.windup.yaml} (85%)
 rename resources/rulesets/eap8/{124-javax-to-jakarta-properties.windup.yaml => 165-javax-to-jakarta-properties.windup.yaml} (80%)
 rename resources/rulesets/eap8/{125-javax-to-jakarta-servlet.windup.yaml => 166-javax-to-jakarta-servlet.windup.yaml} (71%)
 rename resources/rulesets/eap8/{126-jboss-dependencies.windup.yaml => 167-jboss-dependencies.windup.yaml} (80%)
 rename resources/rulesets/eap8/{127-keycloak-openid.windup.yaml => 168-keycloak-openid.windup.yaml} (100%)
 rename resources/rulesets/eap8/{128-legacy-vault.windup.yaml => 169-legacy-vault.windup.yaml} (74%)
 create mode 100644 resources/rulesets/eap8/170-log4j-removed.windup.yaml
 rename resources/rulesets/eap8/{129-login-modules.windup.yaml => 171-login-modules.windup.yaml} (100%)
 rename resources/rulesets/eap8/{130-picketlink.windup.yaml => 172-picketlink.windup.yaml} (72%)
 rename resources/rulesets/eapxp/{131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml => 173-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml} (100%)
 create mode 100644 resources/rulesets/eapxp/174-eapxp_microprofile_metrics_not_supported.mta.yaml
 create mode 100644 resources/rulesets/eapxp/175-eapxp_microprofile_opentracing_not_supported.mta.yaml
 rename resources/rulesets/eapxp/{132-remove_thorntail_yaml_configuration_files.mta.yaml => 176-remove_thorntail_yaml_configuration_files.mta.yaml} (100%)
 rename resources/rulesets/eapxp/{133-replace_thorntail_boms.mta.yaml => 177-replace_thorntail_boms.mta.yaml} (100%)
 rename resources/rulesets/eapxp/{134-replace_thorntail_fractions.mta.yaml => 178-replace_thorntail_fractions.mta.yaml} (100%)
 rename resources/rulesets/eapxp/{135-replace_thorntail_maven_plugin.mta.yaml => 179-replace_thorntail_maven_plugin.mta.yaml} (100%)
 rename resources/rulesets/fuse-service-works/{141-soa-p-5.windup.yaml => 185-soa-p-5.windup.yaml} (56%)
 rename resources/rulesets/fuse/{138-sonic-catchall.windup.yaml => 182-sonic-catchall.windup.yaml} (78%)
 rename resources/rulesets/fuse/{139-sonic-esb.windup.yaml => 183-sonic-esb.windup.yaml} (75%)
 rename resources/rulesets/fuse/{140-xml-sonic-esb.windup.yaml => 184-xml-sonic-esb.windup.yaml} (100%)
 delete mode 100644 resources/rulesets/hibernate/143-hibernate-xml.windup.yaml
 rename resources/rulesets/hibernate/{142-hibernate-catchall.windup.yaml => 186-hibernate-catchall.windup.yaml} (100%)
 create mode 100644 resources/rulesets/hibernate/187-hibernate-xml.windup.yaml
 rename resources/rulesets/hibernate/{144-hibernate.windup.yaml => 188-hibernate.windup.yaml} (82%)
 create mode 100644 resources/rulesets/jakarta-ee9/189-spring-components.windup.yaml
 create mode 100644 resources/rulesets/jakarta-ee9/ruleset.yaml
 rename resources/rulesets/openjdk11/{145-java-removals.windup.yaml => 191-java-removals.windup.yaml} (59%)
 rename resources/rulesets/openjdk11/{146-removed-javaee-modules.windup.yaml => 192-removed-javaee-modules.windup.yaml} (68%)
 rename resources/rulesets/openjdk17/{147-applet-api-deprecation.windup.yaml => 193-applet-api-deprecation.windup.yaml} (68%)
 rename resources/rulesets/openjdk17/{148-lombok.windup.yaml => 194-lombok.windup.yaml} (64%)
 rename resources/rulesets/openjdk17/{149-removed-classes.windup.yaml => 195-removed-classes.windup.yaml} (63%)
 rename resources/rulesets/openjdk17/{150-removed-packages.windup.yaml => 196-removed-packages.windup.yaml} (71%)
 rename resources/rulesets/openjdk17/{151-security-manager-deprecation.windup.yaml => 197-security-manager-deprecation.windup.yaml} (76%)
 rename resources/rulesets/openjdk21/{01-deprecation-openjdk18.windup.yaml => 198-deprecation-openjdk18.windup.yaml} (78%)
 rename resources/rulesets/openjdk21/{02-deprecation-openjdk19.windup.yaml => 199-deprecation-openjdk19.windup.yaml} (90%)
 rename resources/rulesets/openjdk21/{03-deprecation-openjdk20.windup.yaml => 200-deprecation-openjdk20.windup.yaml} (85%)
 rename resources/rulesets/openjdk21/{04-deprecation-openjdk21.windup.yaml => 201-deprecation-openjdk21.windup.yaml} (77%)
 rename resources/rulesets/openjdk21/{05-dynamic-agents.windup.yaml => 202-dynamic-agents.windup.yaml} (73%)
 rename resources/rulesets/openjdk21/{06-finalization-deprecation.windup.yaml => 203-finalization-deprecation.windup.yaml} (61%)
 rename resources/rulesets/openjdk21/{07-removed-apis.windup.yaml => 204-removed-apis.windup.yaml} (77%)
 rename resources/rulesets/openjdk21/{08-utf-8-by-default.windup.yaml => 205-utf-8-by-default.windup.yaml} (96%)
 rename resources/rulesets/openjdk7/{152-oracle2openjdk.rhamt.yaml => 206-oracle2openjdk.rhamt.yaml} (54%)
 rename resources/rulesets/openliberty/{153-liberty-java-unavailable-technologies.windup.yaml => 207-liberty-java-unavailable-technologies.windup.yaml} (100%)
 rename resources/rulesets/openliberty/{154-liberty-websphere-unavailable-technologies.windup.yaml => 208-liberty-websphere-unavailable-technologies.windup.yaml} (99%)
 delete mode 100644 resources/rulesets/quarkus/01-agroal-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/02-amazon-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/03-apicurio-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/04-artemis-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/05-avro-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/06-config-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/07-elytron-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/08-flyway-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/09-hibernate-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/10-jdbc-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/11-jsonb-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/12-jsonp-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/13-kafka-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/14-keycloak-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/15-kubernetes-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/16-liquibase-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/17-logging-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/18-micrometer-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/19-narayana-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/20-openshift-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/203-javaee-faces-to-quarkus.windup.yaml
 delete mode 100644 resources/rulesets/quarkus/21-opentelemetry-to-quarkus.windup.yaml
 rename resources/rulesets/quarkus/{201-cdi-to-quarkus.windup.yaml => 210-cdi-to-quarkus.windup.yaml} (77%)
 rename resources/rulesets/quarkus/{202-dependency-removal-for-quarkus.windup.yaml => 211-dependency-removal-for-quarkus.windup.yaml} (88%)
 create mode 100644 resources/rulesets/quarkus/212-jakarta-cdi-to-quarkus.windup.yaml
 create mode 100644 resources/rulesets/quarkus/213-jakarta-faces-to-quarkus.windup.yaml
 create mode 100644 resources/rulesets/quarkus/214-jakarta-jaxrs-to-quarkus.windup.yaml
 create mode 100644 resources/rulesets/quarkus/215-javaee-faces-to-quarkus.windup.yaml
 rename resources/rulesets/quarkus/{204-javaee-pom-to-quarkus.windup.yaml => 216-javaee-pom-to-quarkus.windup.yaml} (70%)
 rename resources/rulesets/quarkus/{205-jaxrs-to-quarkus.windup.yaml => 217-jaxrs-to-quarkus.windup.yaml} (76%)
 create mode 100644 resources/rulesets/quarkus/218-jms-to-reactive-quarkus.windup.yaml
 rename resources/rulesets/quarkus/{166-springboot-actuator-to-quarkus.windup.yaml => 219-springboot-actuator-to-quarkus.windup.yaml} (84%)
 delete mode 100644 resources/rulesets/quarkus/22-picocli-to-quarkus.windup.yaml
 rename resources/rulesets/quarkus/{167-springboot-annotations-to-quarkus.windup.yaml => 220-springboot-annotations-to-quarkus.windup.yaml} (91%)
 rename resources/rulesets/quarkus/{168-springboot-cache-to-quarkus.windup.yaml => 221-springboot-cache-to-quarkus.windup.yaml} (78%)
 rename resources/rulesets/quarkus/{169-springboot-cloud-config-client-to-quarkus.windup.yaml => 222-springboot-cloud-config-client-to-quarkus.windup.yaml} (88%)
 rename resources/rulesets/quarkus/{170-springboot-data-jpa-to-quarkus.windup.yaml => 223-springboot-data-jpa-to-quarkus.windup.yaml} (69%)
 rename resources/rulesets/quarkus/{171-springboot-devtools-to-quarkus.windup.yaml => 224-springboot-devtools-to-quarkus.windup.yaml} (79%)
 rename resources/rulesets/quarkus/{172-springboot-di-to-quarkus.windup.yaml => 225-springboot-di-to-quarkus.windup.yaml} (90%)
 rename resources/rulesets/quarkus/{173-springboot-generic-catchall.windup.yaml => 226-springboot-generic-catchall.windup.yaml} (91%)
 rename resources/rulesets/quarkus/{174-springboot-integration-to-quarkus.windup.yaml => 227-springboot-integration-to-quarkus.windup.yaml} (78%)
 rename resources/rulesets/quarkus/{175-springboot-jmx-to-quarkus.windup.yaml => 228-springboot-jmx-to-quarkus.windup.yaml} (65%)
 rename resources/rulesets/quarkus/{176-springboot-metrics-to-quarkus.windup.yaml => 229-springboot-metrics-to-quarkus.windup.yaml} (79%)
 delete mode 100644 resources/rulesets/quarkus/23-resteasy-to-quarkus.windup.yaml
 rename resources/rulesets/quarkus/{177-springboot-parent-pom-to-quarkus.windup.yaml => 230-springboot-parent-pom-to-quarkus.windup.yaml} (90%)
 rename resources/rulesets/quarkus/{178-springboot-plugins-to-quarkus.windup.yaml => 231-springboot-plugins-to-quarkus.windup.yaml} (66%)
 rename resources/rulesets/quarkus/{179-springboot-properties-to-quarkus.windup.yaml => 232-springboot-properties-to-quarkus.windup.yaml} (71%)
 rename resources/rulesets/quarkus/{180-springboot-scheduled-to-quarkus.windup.yaml => 233-springboot-scheduled-to-quarkus.windup.yaml} (62%)
 rename resources/rulesets/quarkus/{181-springboot-security-to-quarkus.windup.yaml => 234-springboot-security-to-quarkus.windup.yaml} (86%)
 rename resources/rulesets/quarkus/{182-springboot-shell-to-quarkus.windup.yaml => 235-springboot-shell-to-quarkus.windup.yaml} (61%)
 rename resources/rulesets/quarkus/{183-springboot-web-to-quarkus.windup.yaml => 236-springboot-web-to-quarkus.windup.yaml} (83%)
 rename resources/rulesets/quarkus/{184-springboot-webmvc-to-quarkus.windup.yaml => 237-springboot-webmvc-to-quarkus.windup.yaml} (79%)
 rename resources/rulesets/rhr/{185-springboot-associated-artifacts.rhamt.yaml => 238-springboot-associated-artifacts.rhamt.yaml} (92%)
 rename resources/rulesets/rhr/{186-springboot.rhamt.yaml => 239-springboot-rhr.rhamt.yaml} (96%)
 create mode 100644 resources/rulesets/technology-usage/03-web-technology-usage.windup.yaml
 rename resources/rulesets/technology-usage/{04-test-frameworks-technology-usage.windup.yaml => 05-test-frameworks-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{07-security-technology-usage.windup.yaml => 08-security-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{09-observability-technology-usage.windup.yaml => 10-observability-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{10-non-xml-rules-technology-usage.rhamt.yaml => 11-non-xml-rules-technology-usage.rhamt.yaml} (100%)
 rename resources/rulesets/technology-usage/{12-mvc-technology-usage.windup.yaml => 13-mvc-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/{eap6/58-websphere-ignore-references.windup.yaml => technology-usage/14-messaging-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{14-markup-technology-usage.windup.yaml => 15-markup-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{16-logging-technology-usage.windup.yaml => 17-logging-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{18-jta-technology-usage.windup.yaml => 19-jta-technology-usage.windup.yaml} (100%)
 delete mode 100644 resources/rulesets/technology-usage/197-discovery-target.windup.yaml
 rename resources/rulesets/technology-usage/{20-javase-technology-usage.windup.yaml => 21-javase-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{21-javaee-technology-usage.windup.yaml => 22-javaee-technology-usage.windup.yaml} (100%)
 delete mode 100644 resources/rulesets/technology-usage/24-http-technology-usage.windup.yaml
 create mode 100644 resources/rulesets/technology-usage/241-3rd-party-spring.windup.yaml
 rename resources/rulesets/technology-usage/{188-3rd-party.windup.yaml => 243-3rd-party.windup.yaml} (100%)
 create mode 100644 resources/rulesets/technology-usage/245-apm.windup.yaml
 rename resources/rulesets/technology-usage/{190-clustering.windup.yaml => 247-clustering.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{192-configuration-management.windup.yaml => 249-configuration-management.windup.yaml} (91%)
 rename resources/rulesets/technology-usage/{23-integration-technology-usage.windup.yaml => 25-integration-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{194-connect.windup.yaml => 251-connect.groovy.windup.yaml} (53%)
 rename resources/rulesets/technology-usage/{196-database.windup.yaml => 253-database.groovy.windup.yaml} (53%)
 rename resources/rulesets/{eap7/93-java-wsdl-mapping.yaml => technology-usage/254-discovery-target.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{199-ejb.windup.yaml => 256-ejb.windup.yaml} (100%)
 rename resources/rulesets/{cloud-readiness/155-embedded-cache-libraries.windup.yaml => technology-usage/257-embedded-cache-libraries.windup.yaml} (53%)
 rename resources/rulesets/technology-usage/{201-embedded-framework.windup.yaml => 259-embedded-framework.windup.yaml} (98%)
 rename resources/rulesets/technology-usage/{13-messaging-technology-usage.windup.yaml => 26-http-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{204-integration.windup.yaml => 262-integration.windup.yaml} (100%)
 create mode 100644 resources/rulesets/technology-usage/263-javaee-technology-tag.groovy.windup.yaml
 rename resources/rulesets/technology-usage/{207-javase.windup.yaml => 266-javase.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{209-jta.windup.yaml => 268-jta.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{211-logging-usage.windup.yaml => 270-logging-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{215-mvc.windup.yaml => 274-mvc.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{218-observability.windup.yaml => 277-observability.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{220-security.windup.yaml => 279-security.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{26-embedded-framework-technology-usage.windup.yaml => 28-embedded-framework-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{221-spring-catchall.windup.yaml => 280-spring-catchall.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{223-test-frameworks-usage.windup.yaml => 282-test-frameworks-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{02-web-technology-usage.windup.yaml => 284-web.windup.yaml} (69%)
 rename resources/rulesets/technology-usage/{28-ejb-technology-usage.windup.yaml => 31-ejb-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{31-database-technology-usage.windup.yaml => 34-database-technology-usage.windup.yaml} (61%)
 rename resources/rulesets/technology-usage/{33-connect-technology-usage.windup.yaml => 36-connect-technology-usage.windup.yaml} (91%)
 rename resources/rulesets/technology-usage/{35-configuration-management-technology-usage.windup.yaml => 38-configuration-management-technology-usage.windup.yaml} (100%)
 rename resources/rulesets/technology-usage/{37-clustering-technology-usage.windup.yaml => 40-clustering-technology-usage.windup.yaml} (100%)
 create mode 100644 resources/rulesets/technology-usage/42-apm-technology-usage.windup.yaml
 rename resources/rulesets/technology-usage/{39-3rd-party-technology-usage.windup.yaml => 44-3rd-party-technology-usage.windup.yaml} (100%)
 create mode 100644 resources/rulesets/technology-usage/46-3rd-party-spring-technology-usage.windup.yaml

diff --git a/resources/rulesets.yaml b/resources/rulesets.yaml
index d1a34ba..bbb8458 100644
--- a/resources/rulesets.yaml
+++ b/resources/rulesets.yaml
@@ -4,7 +4,7 @@ items:
     - uuid: 10667615-e067-45b4-a925-563a79ea0949
       name: .discovery
       directory: rulesets/00-discovery
-      checksum: cca8ebc01fc12470769cfa93f35f5371658763f1dbbc4a28b237bf9cc12eef18
+      checksum: 607f7cce00b3e8a495ffa6ccd60000e6d1708a3b52ebd3ed8148770e46585704
     - uuid: 2eed70c0-305c-4061-bb92-d638ee834e47
       name: azure/springboot
       description: Recommend OpenFeign instead of Feign.
@@ -12,7 +12,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 2e0d6f382beda8cdac1cb64139daf50cdf0c65cf0066ee4f7901d12b6b9341aa
+      checksum: 711988128bdbdb602d9d069e08e2fb4be62af05fad433a3ca99ca954cce4945d
     - uuid: e92057bc-5b66-4f7d-976f-f76aa3ad50e6
       name: camel3/camel2
       description: Rules for changes in XML file (e.g. pom.xml) to run on Apache Camel 3
@@ -20,7 +20,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 95b2f53bff9fea0279ae23bbc85e1efd5a3393d77b7ea096b1153854430b94c2
+      checksum: cdd0619159876ae71394881bc4eb6949c7cac7b99c45eacdcb0445a9e04def45
     - uuid: eb900f9e-6ff3-413d-9023-167765ce1311
       name: droolsjbpm
       description: This ruleset provides help for migrating to a unified KIE (Knowledge Is Everything) API in the upgrade from version 5 to 6.
@@ -36,14 +36,14 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: b77bfdf178c1b1073478538b8861a2209455667640a86eff316ae669d3aedaff
+      checksum: 6ca6805a0ce6e0dd9c57ea6ec75244f2052c8ff3a50416bdbbf4a1743b2e9728
     - uuid: 1a523b92-1fb3-422b-aaf7-35f43a259fb9
       name: eap7/weblogic/tests/data
       directory: rulesets/eap7
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 1917b5da349f3a65ef92fcdbc223fc49b84ffa02e19dec97504d8ef9e8387fc3
+      checksum: 9a119a395bf846278554527f1ae99f976b24b574276c35d0820229f1cb98d56f
     - uuid: 3c471738-dfcf-46e8-b803-df07c304acc7
       name: eap8/eap7
       description: This ruleset provides analysis of Java EE applications that need to change certain CDI-related method calls.
@@ -51,7 +51,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 09561c82a5a89ce4c3e6491db30fdebe273986bd8a989b9270b88d1f0fffd48e
+      checksum: 377291f9de5f858768d583bc3eddfcfe5d9ada155042d8b23d3bee8d57362c3b
     - uuid: 288037b2-279f-4d11-9ea9-f91ff274447f
       name: eapxp/thorntail
       description: This ruleset provides analysis of Maven built applications that use Thorntail Maven Plugin, which should be replaced by JBoss EAP XP Bootable JAR Maven Plugin, when migrating to JBoss EAP XP.
@@ -59,7 +59,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 4e563a5c5c7af2fa433baf23a604ef7f9eaca5dbb765a9c778f776cff9a29015
+      checksum: e806fe0159bcbbef28aa92c2ea40909ca73f07a8229f813e3c00d8f8ea0bf5a6
     - uuid: d51b30c0-a0a1-49ff-a0bb-861c43343c6b
       directory: rulesets/filemappings
       dependencies:
@@ -73,7 +73,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: b50c61018e384a87cbf9138ecfa97960e0f7efb045983b4ca5a19045bbd45a4c
+      checksum: f3e722522d3f2dd883d2513e4c6f5bec0f9e7f587bbecf9acb5433890a688520
     - uuid: 416ffaad-3d9b-4808-953e-623d9f2d7314
       name: fuse-service-works/soa-p-5
       description: This ruleset provides analysis of JBoss SOA Platform 5 applications and provides information on how to migrate these to Red Hat JBoss Fuse Service Works
@@ -81,7 +81,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 70d18b2053a86c346f651acfda2ccd1079bd6e48d9ffc4949951d1852550a7c3
+      checksum: 9b1e8c4f0cf6353e8de0e29cae7d732977541d8c769c1024fb5ef35dc2c6ffd4
     - uuid: e4db9c96-103c-409b-a347-098e7a04f172
       name: hibernate
       description: This ruleset provides analysis of deprecated Hibernate java constructs and their migration to newer one.
@@ -89,7 +89,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 8bb7e139031629bbf792c99274fe2aad6047ba2a9aaec8f45cb3474ce6bd525f
+      checksum: 41d14326e59c2fd553d2e22e7f56b2289bbe502e88b57143774f147625431c73
     - uuid: 72b74cb6-dba7-452d-93a3-1a26855051e0
       name: openjdk7/oraclejdk7
       description: This ruleset provides analysis with respect to the migration from OracleJDK to OpenJDK.
@@ -97,7 +97,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 68ebb6732e131062e924afd1af8c4be123ee56fef33d47ef0bfbc4fae98dc3e4
+      checksum: 8129f6da62a61f2aee7f3f15435a8411de18cc89cefb65bcc8be0e75d12ef3ac
     - uuid: e83339db-4dd8-4b06-bb31-6dfcb29c964a
       name: openjdk11/openjdk8
       description: This ruleset provides analysis with respect to API removals between OpenJDK 8 and 11.
@@ -105,7 +105,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 98bd947faddc0df37d675ad68802fd321d1cf50f8fb1ecdd2478f1601be028ad
+      checksum: 3be861f1c86482c37fe5785c63f284a2db4bc25e0bf0ab900efc0a17bd58c4f0
     - uuid: c73c3986-64a5-4c2e-8149-fba57347af99
       name: openjdk17/openjdk11
       description: This ruleset provides analysis Security Manager classes and methods deprecated between OpenJDK 11 to 17.
@@ -113,7 +113,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: b4389376cce0a2699bf4abaec76987b9d990fc0b6b451a8badb330156b5700b3
+      checksum: 9987767a759ee2d9ccf170e5ef0de1fe33e4242fec8b43f94e76c77971bf6a9b
     - uuid: 53ba6b0f-ad48-4211-9673-a2065c2a4b4d
       name: openliberty/websphere
       description: This ruleset identifies usage of Java APIs and technologies which are not provided by Open Liberty.
@@ -121,7 +121,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 24bfdbe5de5ad40e4082cc229026b80045c60e48ebcad17ee0115011849047ed
+      checksum: fea5a17ed496dc0420bb7663f0744593b502db308df4d41206cf7c97fac23fca
     - uuid: feb6648e-dd3c-4536-bf99-e40ee124653d
       name: os/windows
       description: This is a ruleset for Windows operating system specific rules while migrating to Linux operating system.
@@ -137,7 +137,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: dbc284bdaaeb00d03a30aca37fd7210dbb28708c319d18f1509d796bf66bab34
+      checksum: dec2221e6db2b89fa7e38fc6ba6268e803dfa21e1e1a95a1a515f53c97dbfb5b
     - uuid: 9179982c-6007-4e40-b67c-9a7272e44e87
       name: rhr/springboot
       description: Verify the version of the Spring Boot framework is compatible with those supported by Red Hat Runtimes
@@ -145,12 +145,12 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 561326a9208de0f43f5b2cb0a231153e91f92b5fe0f8444d87b1eb0bcd53251e
+      checksum: d8451213e8be090118d5c1621dd5277f1669b4f8d5374cb11b6e94f7887c1aa0
     - uuid: 1b2a0eef-511c-4c07-a36a-d301b15d8207
       name: .technology-usage
       description: This ruleset provides analysis of logging libraries.
       directory: rulesets/technology-usage
-      checksum: a8d9066199c6e4876650e7d12f5c126c1bdb76df16460333a7e63230b47b5c4e
+      checksum: 290db0c4bee1a155ca2663f7f144b5be0532a852793fa2332c816c4abde66e18
     - uuid: 2a3357e3-c79f-4875-a869-b38cb28ac498
       name: camel3
       description: Rules for changes between Camel 3.0 and Camel 4.0
@@ -158,7 +158,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: 7b244b76d2cf906621e8b908476825de7745086c4b66d16f1e9e1f9cbd16cc57
+      checksum: dd055c6666ee58e3678ca779d444cc1efd61369d386ae304320f7c723b1ba52c
     - uuid: da06e738-168a-4384-a4cd-9607fdc4c39a
       name: jws5
       description: This ruleset provides analysis of applications that need to change their pom dependencies to upgrade dependencies that belong to the groupId `org.apache.tomcat`
@@ -174,7 +174,7 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: d8bdeb9913217c22954267d10f0211e4de11dbe59cb215afbab66062c3155951
+      checksum: 08f290c85a0702d04cb5f0e93f9ab59f65875e31f75fb609b09dbbe613289173
     - uuid: e981e01a-5722-4df0-bf01-9e0694e7bb05
       name: cloud-readiness
       description: This ruleset detects logging configurations that may be problematic when migrating an application to a cloud environment.
@@ -182,4 +182,11 @@ items:
       dependencies:
         - 10667615-e067-45b4-a925-563a79ea0949
         - 1b2a0eef-511c-4c07-a36a-d301b15d8207
-      checksum: d8f7458f5aee460d23e44e6f92f6f9e0218bfedfd6ffc7e7a74b45f71fd0044f
+      checksum: 5d5cc0c345bcfa322d5a950dab8edbc0b0c4a7e7010ec2d4b4841850d513f88c
+    - uuid: e7da3a17-8b21-4579-8021-375ffa53e28f
+      name: jakarta-ee9
+      directory: rulesets/jakarta-ee9
+      dependencies:
+        - 10667615-e067-45b4-a925-563a79ea0949
+        - 1b2a0eef-511c-4c07-a36a-d301b15d8207
+      checksum: f784dd8cb1f99abf28270f0220832a0026b224b91f1d1c27f1227afd49d36266
diff --git a/resources/rulesets/00-discovery/0.yaml b/resources/rulesets/00-discovery/0.yaml
index 9a2b7af..b545a32 100644
--- a/resources/rulesets/00-discovery/0.yaml
+++ b/resources/rulesets/00-discovery/0.yaml
@@ -4,6 +4,7 @@
   - License={{matchingText}}
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     or:
     - builtin.filecontent:
@@ -30,6 +31,7 @@
   description: "Hardcoded IP Address"
   labels:
   - konveyor.io/target=cloud-readiness
+  - konveyor.io/target=discovery
   when:
     builtin.filecontent:
       pattern: ([0-9]{1,3}\.){3}[0-9]{1,3}
@@ -41,6 +43,7 @@
   description: "Properties file"
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     builtin.file:
       pattern: "^.*\\.properties$"
@@ -49,6 +52,7 @@
   description: "Manifest file"
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     builtin.file:
       pattern: "MANIFEST.MF"
@@ -57,6 +61,7 @@
   description: "Java source files"
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     builtin.file:
       pattern: "*.java"
@@ -65,6 +70,7 @@
   description: "Maven XML file"
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     builtin.file:
       pattern: "pom.xml"
@@ -72,6 +78,7 @@
 - ruleID: windup-discover-ejb-configuration
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   tag: ["EJB XML"]
   when:
     builtin.xml:
@@ -80,6 +87,7 @@
   tag: ["Spring XML"]
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     builtin.xml:
       xpath: "/beans"
@@ -87,6 +95,7 @@
   tag: ["JPA XML"]
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   when:
     or:
       - builtin.xml:
@@ -98,8 +107,9 @@
 - ruleID: windup-discover-web-configuration
   labels:
   - konveyor.io/include=always
+  - konveyor.io/target=discovery
   tag: ["Web XML"]
   when:
     # TODO extract version as in rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverWebXmlRuleProvider.java
     builtin.xml:
-      xpath: /web-app
+      xpath: /web-app
\ No newline at end of file
diff --git a/resources/rulesets/azure/01-azure-aws-config.windup.yaml b/resources/rulesets/azure/01-azure-aws-config.windup.yaml
index e91b13c..d645ce7 100644
--- a/resources/rulesets/azure/01-azure-aws-config.windup.yaml
+++ b/resources/rulesets/azure/01-azure-aws-config.windup.yaml
@@ -12,7 +12,7 @@
   - konveyor.io/target=azure-container-apps
   - AWS
   links: []
-  message: "\n \n The application contains AWS credential configuration.\n \n "
+  message: The application contains AWS credential configuration.
   ruleID: azure-aws-config-credential-01000
   when:
     or:
@@ -39,7 +39,7 @@
   - konveyor.io/target=azure-container-apps
   - AWS
   links: []
-  message: "\n \n The application contains AWS region configuration.\n \n "
+  message: The application contains AWS region configuration.
   ruleID: azure-aws-config-region-02000
   when:
     or:
@@ -66,8 +66,9 @@
   - konveyor.io/target=azure-container-apps
   - AWS
   links: []
-  message: "\n \n The application contains AWS S3 configuration.\n Consider using
-    Azure Blob Storage instead.\n \n "
+  message: |-
+    The application contains AWS S3 configuration.
+     Consider using Azure Blob Storage instead.
   ruleID: azure-aws-config-s3-03000
   when:
     or:
@@ -88,8 +89,9 @@
   - konveyor.io/target=azure-container-apps
   - AWS
   links: []
-  message: "\n \n The application contains Amazon Simple Queue Service configuration.\n
-    Consider using Azure Service Bus instead.\n \n "
+  message: |-
+    The application contains Amazon Simple Queue Service configuration.
+     Consider using Azure Service Bus instead.
   ruleID: azure-aws-config-sqs-04000
   when:
     or:
@@ -110,8 +112,9 @@
   - konveyor.io/target=azure-container-apps
   - AWS
   links: []
-  message: "\n \n The application contains AWS Secrets Manager configuration.\n Consider
-    using Azure Key Vault instead.\n \n "
+  message: |-
+    The application contains AWS Secrets Manager configuration.
+     Consider using Azure Key Vault instead.
   ruleID: azure-aws-config-secret-manager-05000
   when:
     or:
diff --git a/resources/rulesets/azure/02-azure-file-system.windup.yaml b/resources/rulesets/azure/02-azure-file-system.windup.yaml
index e7d5ba1..6e1041a 100644
--- a/resources/rulesets/azure/02-azure-file-system.windup.yaml
+++ b/resources/rulesets/azure/02-azure-file-system.windup.yaml
@@ -16,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: "\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 "
+  message: "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."
   ruleID: azure-file-system-01000
   when:
     or:
@@ -46,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: "\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 "
+  message: "Relative path found.\n \n Any usage of the file system on the application
+    will require reconfiguration or, in rare cases, architectural changes."
   ruleID: azure-file-system-02000
   when:
     builtin.filecontent:
@@ -69,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: "\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 "
+  message: "Home path found.\n \n Any usage of the file system on the application
+    will require reconfiguration or, in rare cases, architectural changes."
   ruleID: azure-file-system-03000
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/azure/03-azure-java-version.windup.yaml b/resources/rulesets/azure/03-azure-java-version.windup.yaml
index b87ee75..b2b0da5 100644
--- a/resources/rulesets/azure/03-azure-java-version.windup.yaml
+++ b/resources/rulesets/azure/03-azure-java-version.windup.yaml
@@ -12,8 +12,8 @@
   - konveyor.io/target=azure-container-apps
   - version
   links: []
-  message: "\n \n The application is using non-LTS version Java. \n JDK on LTS version
-    is recommended, i.e. JAVA_8, JAVA_11 or JAVA_17.\n \n "
+  message: "The application is using non-LTS version Java. \n JDK on LTS version is
+    recommended, i.e. JAVA_8, JAVA_11 or JAVA_17."
   ruleID: azure-java-version-01000
   when:
     as: result
@@ -37,8 +37,9 @@
   - konveyor.io/target=azure-container-apps
   - version
   links: []
-  message: "\n \n The application is using Java version lower than JAVA_8.\n JDK on
-    LTS version is recommended, i.e. JAVA_8, JAVA_11 or JAVA_17.\n \n "
+  message: |-
+    The application is using Java version lower than JAVA_8.
+     JDK on LTS version is recommended, i.e. JAVA_8, JAVA_11 or JAVA_17.
   ruleID: azure-java-version-02000
   when:
     as: result
diff --git a/resources/rulesets/azure/04-azure-logging.windup.yaml b/resources/rulesets/azure/04-azure-logging.windup.yaml
index 70551fd..0aa2a33 100644
--- a/resources/rulesets/azure/04-azure-logging.windup.yaml
+++ b/resources/rulesets/azure/04-azure-logging.windup.yaml
@@ -12,6 +12,8 @@
   - konveyor.io/target=azure-container-apps
   - logging
   links: []
+  message: "Logging to the file system is not recommended when running applications
+    in the cloud. \n \n Instead, use a console appender to log to standard output."
   ruleID: azure-logging-0000
   tag:
   - Logging to file system
@@ -22,7 +24,7 @@
         pattern: (?i)((Daily)?Rolling)?FileAppender|type\s*=\s*((Daily)?Rolling)?File|<\/((Daily)?Rolling)?File>
     - java.referenced:
         location: IMPORT
-        pattern: org.apache*log4j*FileAppender*
+        pattern: org.apache.*log4j.*FileAppender*
     - java.referenced:
         location: IMPORT
         pattern: java.util.logging.FileHandler*
diff --git a/resources/rulesets/azure/06-azure-password.windup.yaml b/resources/rulesets/azure/06-azure-password.windup.yaml
index dc2cf4d..2b79a0a 100644
--- a/resources/rulesets/azure/06-azure-password.windup.yaml
+++ b/resources/rulesets/azure/06-azure-password.windup.yaml
@@ -23,8 +23,10 @@
     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: "\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 "
+  message: |-
+    Password found in configuration file.
+
+     Consider using Azure Key Vault and/or parameter injection with application settings where possible.
   ruleID: azure-password-01000
   when:
     or:
diff --git a/resources/rulesets/azure/07-eap-to-azure-appservice-certificates.windup.yaml b/resources/rulesets/azure/07-eap-to-azure-appservice-certificates.windup.yaml
index e86892e..9c5c52d 100644
--- a/resources/rulesets/azure/07-eap-to-azure-appservice-certificates.windup.yaml
+++ b/resources/rulesets/azure/07-eap-to-azure-appservice-certificates.windup.yaml
@@ -12,6 +12,7 @@
   - title: Migrate JBoss EAP applications to JBoss EAP on Azure App Service - Inventory
       all certificates
     url: https://docs.microsoft.com/en-us/azure/developer/java/migration/migrate-jboss-eap-to-jboss-eap-on-azure-app-service#inventory-all-certificates
+  message: Azure - The application loads certificates into a KeyStore
   ruleID: eap-to-azure-appservice-certificates-001
   tag:
   - Azure
diff --git a/resources/rulesets/azure/08-eap-to-azure-appservice-datasource-driver.windup.yaml b/resources/rulesets/azure/08-eap-to-azure-appservice-datasource-driver.windup.yaml
index 612d279..6fa8a89 100644
--- a/resources/rulesets/azure/08-eap-to-azure-appservice-datasource-driver.windup.yaml
+++ b/resources/rulesets/azure/08-eap-to-azure-appservice-datasource-driver.windup.yaml
@@ -17,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: "\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
+  message: "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.\n \n For more information, see Datasource Management
-    in the JBoss EAP documentation. \n \n "
+    in the JBoss EAP documentation."
   ruleID: eap-to-azure-appservice-datasource-driver-01000
   when:
     or:
diff --git a/resources/rulesets/azure/09-eap-to-azure-appservice-environment-variables.windup.yaml b/resources/rulesets/azure/09-eap-to-azure-appservice-environment-variables.windup.yaml
index 15d4ecb..5a8c1d6 100644
--- a/resources/rulesets/azure/09-eap-to-azure-appservice-environment-variables.windup.yaml
+++ b/resources/rulesets/azure/09-eap-to-azure-appservice-environment-variables.windup.yaml
@@ -13,12 +13,14 @@
     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: "\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.\n \n "
+  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
+     or by defining an App Setting with the name JAVA_OPTS and include any system properties in it.
   ruleID: eap-to-azure-appservice-environment-variables-001
   when:
     or:
diff --git a/resources/rulesets/azure/10-eap-to-azure-appservice-pom.windup.yaml b/resources/rulesets/azure/10-eap-to-azure-appservice-pom.windup.yaml
index ba2b8b3..cfeac0b 100644
--- a/resources/rulesets/azure/10-eap-to-azure-appservice-pom.windup.yaml
+++ b/resources/rulesets/azure/10-eap-to-azure-appservice-pom.windup.yaml
@@ -14,8 +14,8 @@
     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: "\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
+  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)\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
@@ -26,7 +26,7 @@
     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 "
+    --type ear --src-path app.ear\n </pre>"
   ruleID: eap-to-azure-appservice-pom-001
   when:
     java.dependency:
diff --git a/resources/rulesets/azure/11-spring-boot-to-azure-cache.windup.yaml b/resources/rulesets/azure/11-spring-boot-to-azure-cache.windup.yaml
index 97f2e26..31c3579 100644
--- a/resources/rulesets/azure/11-spring-boot-to-azure-cache.windup.yaml
+++ b/resources/rulesets/azure/11-spring-boot-to-azure-cache.windup.yaml
@@ -19,8 +19,10 @@
     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: "\n \n The application uses a Redis Cache.\n\n Checkout Azure Cache for
-    Redis for a fully managed cache on Azure.\n \n "
+  message: |-
+    The application uses a Redis Cache.
+
+     Checkout Azure Cache for Redis for a fully managed cache on Azure.
   ruleID: spring-boot-to-azure-cache-redis-01000
   when:
     or:
@@ -57,9 +59,10 @@
     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: "\n \n Redis Cache connection string, username, or password used in this
-    application.\n\n Checkout Azure Cache for Redis for a fully managed cache on Azure.\n
-    \n "
+  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:
diff --git a/resources/rulesets/azure/13-spring-boot-to-azure-database.windup.yaml b/resources/rulesets/azure/13-spring-boot-to-azure-database.windup.yaml
index e5ee78c..784172e 100644
--- a/resources/rulesets/azure/13-spring-boot-to-azure-database.windup.yaml
+++ b/resources/rulesets/azure/13-spring-boot-to-azure-database.windup.yaml
@@ -21,9 +21,10 @@
     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: "\n \n The application uses a JDBC connection string, username or password
-    in the configuration file.\n\n Checkout the different types of databases that
-    are fully managed on Azure.\n \n "
+  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.
   ruleID: spring-boot-to-azure-database-jdbc-01000
   when:
     or:
@@ -78,8 +79,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: "\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 "
+  message: |-
+    The application uses a MongoDB connection string.
+
+     Checkout the different types of databases that are fully managed on Azure.
   ruleID: spring-boot-to-azure-database-mongodb-02000
   when:
     or:
@@ -118,9 +121,10 @@
     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: "\n \n The application uses a R2DBC connection string, username or password
-    in the configuration file.\n\n Checkout the different types of databases that
-    are fully managed on Azure.\n \n "
+  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:
diff --git a/resources/rulesets/azure/15-spring-boot-to-azure-feign.windup.yaml b/resources/rulesets/azure/15-spring-boot-to-azure-feign.windup.yaml
index 1715c9b..b8fd19c 100644
--- a/resources/rulesets/azure/15-spring-boot-to-azure-feign.windup.yaml
+++ b/resources/rulesets/azure/15-spring-boot-to-azure-feign.windup.yaml
@@ -14,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: "\n \n The application uses Feign. Spring Cloud Service Registry uses OpenFeign
+  message: "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.\n \n Update the clients to use Spring Cloud OpenFeign
-    instead.\n \n "
+    instead."
   ruleID: spring-boot-to-azure-feign-01000
   when:
     or:
diff --git a/resources/rulesets/azure/16-spring-boot-to-azure-identity-provider.windup.yaml b/resources/rulesets/azure/16-spring-boot-to-azure-identity-provider.windup.yaml
index b2ba6f4..bd74121 100644
--- a/resources/rulesets/azure/16-spring-boot-to-azure-identity-provider.windup.yaml
+++ b/resources/rulesets/azure/16-spring-boot-to-azure-identity-provider.windup.yaml
@@ -18,8 +18,10 @@
     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: "\n \n The application uses Spring security.\n\n Checkout Azure Active
-    Directory as an identity provider.\n \n "
+  message: |-
+    The application uses Spring security.
+
+     Checkout Azure Active Directory as an identity provider.
   ruleID: spring-boot-to-azure-identity-provider-01000
   when:
     or:
diff --git a/resources/rulesets/azure/17-spring-boot-to-azure-java-fx.windup.yaml b/resources/rulesets/azure/17-spring-boot-to-azure-java-fx.windup.yaml
index cbc452e..5626e79 100644
--- a/resources/rulesets/azure/17-spring-boot-to-azure-java-fx.windup.yaml
+++ b/resources/rulesets/azure/17-spring-boot-to-azure-java-fx.windup.yaml
@@ -10,8 +10,9 @@
   - konveyor.io/target=azure-container-apps
   - JavaFX
   links: []
-  message: "\n \n The application uses JavaFX.\n JavaFX is not cloud compatible and
-    requires the JRE on the remote device.\n \n "
+  message: |-
+    The application uses JavaFX.
+     JavaFX is not cloud compatible and requires the JRE on the remote device.
   ruleID: spring-boot-to-azure-java-fx-01000
   when:
     java.referenced:
diff --git a/resources/rulesets/azure/19-spring-boot-to-azure-jms-broker.windup.yaml b/resources/rulesets/azure/19-spring-boot-to-azure-jms-broker.windup.yaml
index a7fc91b..295d172 100644
--- a/resources/rulesets/azure/19-spring-boot-to-azure-jms-broker.windup.yaml
+++ b/resources/rulesets/azure/19-spring-boot-to-azure-jms-broker.windup.yaml
@@ -19,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: "\n \n The application uses an ActiveMQ message broker.\n \n Checkout Azure
-    Service Bus for a fully managed message broker.\n \n "
+  message: "The application uses an ActiveMQ message broker.\n \n Checkout Azure Service
+    Bus for a fully managed message broker."
   ruleID: spring-boot-to-azure-jms-broker-01000
   when:
     or:
diff --git a/resources/rulesets/azure/20-spring-boot-to-azure-mq-config.windup.yaml b/resources/rulesets/azure/20-spring-boot-to-azure-mq-config.windup.yaml
index 5c1b0a4..700a752 100644
--- a/resources/rulesets/azure/20-spring-boot-to-azure-mq-config.windup.yaml
+++ b/resources/rulesets/azure/20-spring-boot-to-azure-mq-config.windup.yaml
@@ -37,9 +37,10 @@
   links:
   - title: Service connection in Azure Spring Apps
     url: https://learn.microsoft.com/azure/service-connector/quickstart-portal-spring-cloud-connection
-  message: "\n The application uses a RabbitMQ connection string, username, or password.\n\n
-    Consider using Azure Event Grid/Azure Event Hubs/Azure Service Bus or Apache Kafka
-    on Confluent Cloud and connect it with Service Connector\n "
+  message: |-
+    The application uses a RabbitMQ connection string, username, or password.
+
+     Consider using Azure Event Grid/Azure Event Hubs/Azure Service Bus or Apache Kafka on Confluent Cloud and connect it with Service Connector
   ruleID: spring-boot-to-azure-mq-config-rabbitmq-01000
   tag:
   - RabbitMQ Client
diff --git a/resources/rulesets/azure/22-spring-boot-to-azure-schedule-job.windup.yaml b/resources/rulesets/azure/22-spring-boot-to-azure-schedule-job.windup.yaml
index 1d3f552..71258fd 100644
--- a/resources/rulesets/azure/22-spring-boot-to-azure-schedule-job.windup.yaml
+++ b/resources/rulesets/azure/22-spring-boot-to-azure-schedule-job.windup.yaml
@@ -13,12 +13,13 @@
   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: "\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 "
+  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.
   ruleID: spring-boot-to-azure-schedule-job-01000
   when:
     or:
diff --git a/resources/rulesets/azure/23-spring-boot-to-azure-static-content.windup.yaml b/resources/rulesets/azure/23-spring-boot-to-azure-static-content.windup.yaml
index 7478d85..0e55b45 100644
--- a/resources/rulesets/azure/23-spring-boot-to-azure-static-content.windup.yaml
+++ b/resources/rulesets/azure/23-spring-boot-to-azure-static-content.windup.yaml
@@ -16,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: "\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 "
+  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.\n \n For more
+    information, see Static website hosting in Azure Storage and Quickstart: Integrate
+    an Azure storage account with Azure CDN."
   ruleID: spring-boot-to-azure-static-content-01000
   when:
     builtin.file:
diff --git a/resources/rulesets/azure/24-spring-boot-to-azure-swing.windup.yaml b/resources/rulesets/azure/24-spring-boot-to-azure-swing.windup.yaml
index 605557c..43d3238 100644
--- a/resources/rulesets/azure/24-spring-boot-to-azure-swing.windup.yaml
+++ b/resources/rulesets/azure/24-spring-boot-to-azure-swing.windup.yaml
@@ -10,8 +10,9 @@
   - konveyor.io/target=azure-container-apps
   - Swing
   links: []
-  message: "\n \n The application uses Java Swing.\n Upgrade to modern cloud native
-    UI framework.\n \n "
+  message: |-
+    The application uses Java Swing.
+     Upgrade to modern cloud native UI framework.
   ruleID: spring-boot-to-azure-swing-01000
   when:
     java.referenced:
diff --git a/resources/rulesets/azure/25-spring-boot-to-azure-system-config.windup.yaml b/resources/rulesets/azure/25-spring-boot-to-azure-system-config.windup.yaml
index 7c1fdd6..898edd0 100644
--- a/resources/rulesets/azure/25-spring-boot-to-azure-system-config.windup.yaml
+++ b/resources/rulesets/azure/25-spring-boot-to-azure-system-config.windup.yaml
@@ -12,10 +12,12 @@
   links:
   - title: Configure per-service secrets and externalized settings
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-spring-boot-to-azure-spring-apps#configure-per-service-secrets-and-externalized-settings
-  message: "\n \n Review the usage of environment variables and system properties
-    and externalize them.\n\n You can inject any per-service configuration settings
-    into each service as environment variables.\n\n Any system properties that the
-    code depends on will need to be defined in JVM options.\n \n "
+  message: |-
+    Review the usage of environment variables and system properties and externalize them.
+
+     You can inject any per-service configuration settings into each service as environment variables.
+
+     Any system properties that the code depends on will need to be defined in JVM options.
   ruleID: spring-boot-to-azure-system-config-01000
   when:
     or:
diff --git a/resources/rulesets/azure/26-spring-boot-to-azure-version.windup.yaml b/resources/rulesets/azure/26-spring-boot-to-azure-version.windup.yaml
index c58e0db..c341f26 100644
--- a/resources/rulesets/azure/26-spring-boot-to-azure-version.windup.yaml
+++ b/resources/rulesets/azure/26-spring-boot-to-azure-version.windup.yaml
@@ -12,8 +12,9 @@
   links:
   - title: Spring Boot Support Versions
     url: https://github.com/spring-projects/spring-boot/wiki/Supported-Versions
-  message: "\n The application uses Spring Boot 1.x, which is too low.\n Update to
-    open source support version of Spring Boot.\n "
+  message: |-
+    The application uses Spring Boot 1.x, which is too low.
+     Update to open source support version of Spring Boot.
   ruleID: spring-boot-to-azure-version-01000
   when:
     java.dependency:
@@ -34,8 +35,9 @@
   links:
   - title: Spring Boot Supported Versions
     url: https://github.com/spring-projects/spring-boot/wiki/Supported-Versions
-  message: "\n Spring boot version is out of any spring boot support scope.\n Update
-    to open source support version of Spring Boot.\n "
+  message: |-
+    Spring boot version is out of any spring boot support scope.
+     Update to open source support version of Spring Boot.
   ruleID: spring-boot-to-azure-version-02000
   when:
     java.dependency:
@@ -56,8 +58,9 @@
   links:
   - title: Spring Boot Supported Versions
     url: https://github.com/spring-projects/spring-boot/wiki/Supported-Versions
-  message: "\n Spring Boot version is out of open source software support.\n Update
-    to open source support version of Spring Boot, if you don't have commercial support.\n "
+  message: |-
+    Spring Boot version is out of open source software support.
+     Update to open source support version of Spring Boot, if you don't have commercial support.
   ruleID: spring-boot-to-azure-version-03000
   when:
     java.dependency:
diff --git a/resources/rulesets/azure/27-spring-boot-to-azure-zipkin.windup.yaml b/resources/rulesets/azure/27-spring-boot-to-azure-zipkin.windup.yaml
index 56c81a2..c93c42c 100644
--- a/resources/rulesets/azure/27-spring-boot-to-azure-zipkin.windup.yaml
+++ b/resources/rulesets/azure/27-spring-boot-to-azure-zipkin.windup.yaml
@@ -14,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: "\n \n The application uses Zipkin.\n \n "
+  message: The application uses Zipkin.
   ruleID: spring-boot-to-azure-zipkin-01000
   when:
     or:
diff --git a/resources/rulesets/azure/28-spring-cloud-to-azure-version.windup.yaml b/resources/rulesets/azure/28-spring-cloud-to-azure-version.windup.yaml
index ee9ef0c..5803529 100644
--- a/resources/rulesets/azure/28-spring-cloud-to-azure-version.windup.yaml
+++ b/resources/rulesets/azure/28-spring-cloud-to-azure-version.windup.yaml
@@ -12,8 +12,9 @@
   links:
   - title: Spring Cloud Supported Versions
     url: https://github.com/spring-cloud/spring-cloud-release/wiki/Supported-Versions
-  message: "\n \n Spring Cloud version too low.\n Update to open source support version
-    of Spring Cloud.\n \n "
+  message: |-
+    Spring Cloud version too low.
+     Update to open source support version of Spring Cloud.
   ruleID: spring-cloud-to-azure-version-01000
   when:
     java.dependency:
@@ -34,8 +35,9 @@
   links:
   - title: Spring Cloud Supported Versions
     url: https://github.com/spring-cloud/spring-cloud-release/wiki/Supported-Versions
-  message: "\n \n Spring Cloud version is out of any Spring Cloud support scope.\n
-    Update to open source support version of Spring Cloud.\n \n "
+  message: |-
+    Spring Cloud version is out of any Spring Cloud support scope.
+     Update to open source support version of Spring Cloud.
   ruleID: spring-cloud-to-azure-version-02000
   when:
     java.dependency:
@@ -56,9 +58,9 @@
   links:
   - title: Spring Cloud Supported Versions
     url: https://github.com/spring-cloud/spring-cloud-release/wiki/Supported-Versions
-  message: "\n \n Spring Cloud version is out of open source software support.\n Update
-    to open source support version of Spring Cloud, if you don't have commercial support.\n
-    \n "
+  message: |-
+    Spring Cloud version is out of open source software support.
+     Update to open source support version of Spring Cloud, if you don't have commercial support.
   ruleID: spring-cloud-to-azure-version-03000
   when:
     or:
diff --git a/resources/rulesets/azure/29-tomcat-to-azure-external-resources.windup.yaml b/resources/rulesets/azure/29-tomcat-to-azure-external-resources.windup.yaml
index d7219ba..0300a8d 100644
--- a/resources/rulesets/azure/29-tomcat-to-azure-external-resources.windup.yaml
+++ b/resources/rulesets/azure/29-tomcat-to-azure-external-resources.windup.yaml
@@ -12,9 +12,9 @@
   links:
   - title: Inventory external resources
     url: https://learn.microsoft.com/azure/developer/java/migration/migrate-tomcat-to-azure-spring-apps
-  message: "\n \n External resources, such as data sources, JMS message brokers, and
-    others are injected via Java Naming and Directory Interface (JNDI).\n \n Some
-    such resources may require migration or reconfiguration.\n \n "
+  message: "External resources, such as data sources, JMS message brokers, and others
+    are injected via Java Naming and Directory Interface (JNDI).\n \n Some such resources
+    may require migration or reconfiguration."
   ruleID: tomcat-to-azure-external-resources-01000
   when:
     builtin.xml:
diff --git a/resources/rulesets/camel3/30-component-changes.groovy.windup.yaml b/resources/rulesets/camel3/30-component-changes.groovy.windup.yaml
new file mode 100644
index 0000000..573e304
--- /dev/null
+++ b/resources/rulesets/camel3/30-component-changes.groovy.windup.yaml
@@ -0,0 +1,424 @@
+- category: mandatory
+  customVariables: []
+  description: '[camel-telegram] Authorization token parameter required!'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: telegram'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_telegram
+  message: Authorization token was moved from uri-path to a query parameter. Use `telegram:bots?authorizationToken=myTokenHere`.
+  ruleID: component-changes-00001
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: (telegram:)(?!.*authorizationToken.*)
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:route/*[contains(@uri ,'telegram') and not(contains(@uri,'authorizationToken'))]
+- category: mandatory
+  customVariables: []
+  description: Shiro - default encryption key was removed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: shiro_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_shiro_component
+  message: It's mandatory to specify key/passphrase for `ShiroSecurityPolicy`.
+  ruleID: component-changes-00002
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.component.shiro.security.ShiroSecurityPolicy*
+- category: mandatory
+  customVariables: []
+  description: Mock API function has been removed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: out_message_removed_from_simple_language_and_mock_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_out_message_removed_from_simple_language_and_mock_component
+  message: '`{{method}}` has been removed from the mock component''s assertion api.'
+  ruleID: component-changes-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*\.java
+      pattern: .*.(outBody|outHeaders).*
+- category: mandatory
+  customVariables: []
+  description: '@OutHeaders annotation has been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: out_message_removed_from_simple_language_and_mock_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_out_message_removed_from_simple_language_and_mock_component
+  message: '`@OutHeaders` annotation has been removed. Use `@Headers` instead'
+  ruleID: component-changes-00004
+  when:
+    or:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: org.apache.camel.OutHeaders
+    - java.referenced:
+        location: IMPORT
+        pattern: org.apache.camel.OutHeaders
+- category: mandatory
+  customVariables: []
+  description: 'Simple language: out.body/out.header have been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: out_message_removed_from_simple_language_and_mock_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_out_message_removed_from_simple_language_and_mock_component
+  message: out.body/out.header has been removed from simple language
+  ruleID: component-changes-00005
+  when:
+    builtin.xml:
+      namespaces:
+        c: http://camel.apache.org/schema/spring
+      xpath: //*/c:simple[text()=matches(self::node(), '{*}out.(body|header){*}')]
+- category: mandatory
+  customVariables: []
+  description: 'Simple language: out.body/out.header have been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: out_message_removed_from_simple_language_and_mock_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_out_message_removed_from_simple_language_and_mock_component
+  message: out.body/out.header has been removed from simple language
+  ruleID: component-changes-00006
+  when:
+    builtin.xml:
+      namespaces:
+        b: http://camel.apache.org/schema/blueprint
+      xpath: //*/b:simple[text()=matches(self::node(), '{*}out.(body|header){*}')]
+- category: mandatory
+  customVariables: []
+  description: 'Simple language: out.body/out.header have been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: out_message_removed_from_simple_language_and_mock_component'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_out_message_removed_from_simple_language_and_mock_component
+  message: out.body/out.header has been removed from simple language
+  ruleID: component-changes-00007
+  when:
+    builtin.filecontent:
+      filePattern: ""
+      pattern: .*simple\(.*out.(body|header).*\)
+- category: mandatory
+  customVariables: []
+  description: 'Simple language: property function has been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: languages'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_languages
+  message: '`property` function has been removed from simple language. Use `exchangeProperty`
+    instead.'
+  ruleID: component-changes-00008
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: .*simple\(.*property.*\)
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:simple[text()=matches(self::node(), '{*}property{*}')]
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*/b:simple[text()=matches(self::node(), '{*}property{*}')]
+- category: mandatory
+  customVariables: []
+  description: 'Terser language: language renamed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: languages'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_languages
+  message: '`terser` language renamed to `hl7terser`'
+  ruleID: component-changes-00009
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: ""
+        pattern: .*terser\(.*
+      from: file
+    - as: file
+      java.referenced:
+        location: IMPORT
+        pattern: org.apache.camel.component.hl7.HL7.terser
+- category: potential
+  customVariables: []
+  description: 'Crypto dataformat: The default encryption algorithm changed to null'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: crypto_dataformat'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_crypto_dataformat
+  message: The default encryption algorithm is mandatory changed from `DES/CBC/PKCS5Padding`
+    to null. Therefore if algorithm hasn't been set yet, it's required to set a value
+    for it.
+  ruleID: component-changes-00010
+  when:
+    or:
+    - java.referenced:
+        location: VARIABLE_DECLARATION
+        pattern: org.apache.camel.converter.crypto.CryptoDataFormat
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*[c:crypto and not(b:crypto/@algorithm)]/c:crypto
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*[b:crypto and not(b:crypto/@algorithm)]/b:crypto
+- category: mandatory
+  customVariables: []
+  description: 'XMLsecure dataformat: The default encryption key has been removed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: xml_security_dataformat'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_xml_security_dataformat
+  message: The default encryption key has been removed, so it is now mandatory to
+    supply the key String/bytes if you are using symmetric encryption.
+  ruleID: component-changes-00011
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: .*secureXML
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*[c:secureXML and (count(c:secureXML/@passPhrase)+count(c:secureXML/@passPhraseByte))<1]/c:secureXML/
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*[b:secureXML and (count(b:secureXML/@passPhrase)+count(b:secureXML/@passPhraseByte))<1]/b:secureXML/
+- category: mandatory
+  customVariables: []
+  description: 'Consumer endpoints: options with consumer. prefix have been removed.'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: using_endpoint_options_with_consumer_prefix'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_using_endpoint_options_with_consumer_prefix
+  message: Consumer.options with `consumer.` prefix have been removed. Use options
+    without the prefix i.e `delay` instead of `consumer.delay`
+  ruleID: component-changes-00012
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: .*from\(.*consumer..*\)
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:from[@uri=matches(self::node(), '{*}consumer.{*}')]
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*/b:from[@uri=matches(self::node(), '{*}consumer.{*}')]
+- category: mandatory
+  customVariables: []
+  description: 'Tracing: Tracer class removed'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: Tracer in Camel 3
+    url: https://camel.apache.org/manual/latest/tracer.html
+  message: '`org.apache.camel.processor.interceptor.Tracer` class has been removed
+    and replaced by `org.apache.camel.Tracing`. See the documentation.'
+  ruleID: component-changes-00013
+  when:
+    or:
+    - java.referenced:
+        location: IMPORT
+        pattern: org.apache.camel.processor.interceptor.Tracer
+    - builtin.xml:
+        namespaces: {}
+        xpath: //*[@class='org.apache.camel.processor.interceptor.Tracer']
+- category: mandatory
+  customVariables: []
+  description: 'Tracing: DefaultTraceFormatter formatter removed'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: Tracer in Camel 3
+    url: https://camel.apache.org/manual/latest/tracer.html
+  message: '`org.apache.camel.processor.interceptor.DefaultTraceFormatter` class has
+    been removed. Use `ExchangeFormatter` as described in the documentation.'
+  ruleID: component-changes-00014
+  when:
+    or:
+    - java.referenced:
+        location: IMPORT
+        pattern: org.apache.camel.processor.interceptor.DefaultTraceFormatter
+    - builtin.xml:
+        namespaces: {}
+        xpath: //*[@class='org.apache.camel.processor.interceptor.DefaultTraceFormatter']
+- category: mandatory
+  customVariables: []
+  description: 'Tracing:  BacklogTracer is no longer enabled by default in JMX'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: tracing'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_tracing
+  message: '`BacklogTracer` is no longer enabled by default in JMX. For using BacklogTracer
+    you need to enable by setting `backlogTracing=true` on CamelContext.'
+  ruleID: component-changes-00015
+  when:
+    builtin.xml:
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:dependencies[m:dependency/m:artifactId/text() = 'camel-core']
+- category: potential
+  customVariables: []
+  description: 'XMLSecurity component: The default signature algorithm has changed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: using_endpoint_options_with_consumer_prefix'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_using_endpoint_options_with_consumer_prefix
+  message: The default signature algorithm in the XMLSecurity component has changed
+    `SHA1WithDSA` to `SHA256withRSA`.
+  ruleID: component-changes-00016
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: .to\(.*xmlsecurity.*
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:to[contains(@uri,'xmlsecurity')]
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*/b:to[contains(@uri,'xmlsecurity')]
+- category: potential
+  customVariables: []
+  description: 'Crypto component: The default signature algorithm has changed'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: using_endpoint_options_with_consumer_prefix'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_using_endpoint_options_with_consumer_prefix
+  message: The default signature algorithm in the Crypto component has changed from
+    `SHA1WithDSA` to `SHA256withRSA`.
+  ruleID: component-changes-00017
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: .to\(.*crypto:.*
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:route/*[contains(@uri,'crypto:')]
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*/b:route/*[contains(@uri,'crypto:')]
+- category: potential
+  customVariables: []
+  description: 'XSLT: Use xslt-saxon component to use Saxon'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: Camel 3 XSLT Saxon Documentation
+    url: https://camel.apache.org/components/latest/xslt-saxon-component.html
+  message: The XSLT component has moved out of `camel-core` into `camel-xslt` and
+    `camel-xslt-saxon`. Use `xslt-saxon` in URI as described in the documentation.
+  ruleID: component-changes-00018
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: ..*xslt:.*saxon=true
+    - builtin.xml:
+        namespaces:
+          c: http://camel.apache.org/schema/spring
+        xpath: //*/c:route/*[contains(@uri,'xslt:') and contains(@uri,'saxon=true')]
+    - builtin.xml:
+        namespaces:
+          b: http://camel.apache.org/schema/blueprint
+        xpath: //*/b:route/*[contains(@uri,'xslt:') and contains(@uri,'saxon=true')]
diff --git a/resources/rulesets/camel3/16-component-changes.windup.yaml b/resources/rulesets/camel3/31-component-changes.windup.yaml
similarity index 100%
rename from resources/rulesets/camel3/16-component-changes.windup.yaml
rename to resources/rulesets/camel3/31-component-changes.windup.yaml
diff --git a/resources/rulesets/camel3/17-java-dsl-changes.windup.yaml b/resources/rulesets/camel3/32-java-dsl-changes.windup.yaml
similarity index 78%
rename from resources/rulesets/camel3/17-java-dsl-changes.windup.yaml
rename to resources/rulesets/camel3/32-java-dsl-changes.windup.yaml
index 40835c9..1397953 100644
--- a/resources/rulesets/camel3/17-java-dsl-changes.windup.yaml
+++ b/resources/rulesets/camel3/32-java-dsl-changes.windup.yaml
@@ -10,8 +10,9 @@
   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()`\n
-    instead of `hystrix()`\n "
+  message: |-
+    Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker()`
+     instead of `hystrix()`
   ruleID: java-dsl-changes-00001
   when:
     java.referenced:
diff --git a/resources/rulesets/camel3/33-java-generic-information.groovy.windup.yaml b/resources/rulesets/camel3/33-java-generic-information.groovy.windup.yaml
new file mode 100644
index 0000000..caec144
--- /dev/null
+++ b/resources/rulesets/camel3/33-java-generic-information.groovy.windup.yaml
@@ -0,0 +1,247 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.ThreadPoolRejectedPolicy was moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: eips'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_eips
+  message: '`org.apache.camel.ThreadPoolRejectedPolicy` was moved to `org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy`.'
+  ruleID: java-generic-information-00034
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.ThreadPoolRejectedPolicy
+- category: optional
+  customVariables: []
+  description: SimpleRegistry was moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: generic_information'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
+  message: '`The org.apache.camel.support.DefaultRegistry` should be favoured instead
+    of `SimpleRegistry`. Also `bind` operation should be used instead of `put` to
+    add entries to the `SimpleRegistry` or `DefaultRegistry`.'
+  ruleID: java-generic-information-00035
+  when:
+    java.referenced:
+      location: METHOD_CALL
+      pattern: org.apache.camel.impl.SimpleRegistry.put*
+- category: optional
+  customVariables: []
+  description: getOut/hasOut are deprecated
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: getout_on_exchange'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_getout_on_exchange
+  message: Methods `getOut`, `hasOut` on `Exchange` has been deprecated in favour
+    of using `getMessage` instead.
+  ruleID: java-generic-information-00036
+  when:
+    java.referenced:
+      location: METHOD_CALL
+      pattern: org.apache.camel.Exchange.{get|has}Out*
+- category: mandatory
+  customVariables: []
+  description: Fault API on Message was removed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: fault_api_on_message'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_fault_api_on_message
+  message: Fault API was removed from `org.apache.camel.Message`. The option `handleFault`
+    has also been removed and you now need to turn this on as endpoint or component
+    option on `camel-cxf` or `camel-spring-ws`.
+  ruleID: java-generic-information-00037
+  when:
+    or:
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.Message.(is|set)Fault*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.CamelContext.(is|set)HandleFault*
+- category: mandatory
+  customVariables: []
+  description: Route control methods were moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: controlling_routes'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_controlling_routes
+  message: 'Methods for controlling routes were moved from `CamelContext` to the `RouteController`.
+    To call moved method use: `context.getRouteController().startRoute("myRoute")`'
+  ruleID: java-generic-information-00038
+  when:
+    or:
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.CamelContext.(start|stop|suspend|resume)Route*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.CamelContext.startAllRoutes*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.CamelContext.isStartingRoutes*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: org.apache.camel.CamelContext.getRouteStatus*
+- category: mandatory
+  customVariables:
+  - name: param
+    nameOfCaptureGroup: param
+    pattern: .*.Main.getCamelContext(?P<param>(s|map))?\(\)
+  description: getCamelContextMap,getCamelContexts methods removed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: main_class_2'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_main_class_2
+  message: The methods `getCamelContextMap` and `getCamelContexts` have been removed
+    from the `Main` classes, and there is just a `getCamelContext` method now.
+  ruleID: java-generic-information-00039
+  when:
+    java.referenced:
+      location: METHOD_CALL
+      pattern: '*.Main.getCamelContext(s|map)*'
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.util.jsse packages were moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: main_class_2'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_main_class_2
+  message: The `org.apache.camel.util.jsse` package was moved to `org.apache.camel.support.jsse`
+  ruleID: java-generic-information-00040
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.util.jsse*
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.util.jndi.JndiContext was moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: class'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_class
+  message: '`org.apache.camel.util.jndi.JndiContext` was moved to `org.apache.camel.support.jndi.JndiContext`'
+  ruleID: java-generic-information-00041
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.util.jndi.JndiContext
+- category: optional
+  customVariables: []
+  description: Override of `createRegistry` is not necessary anymore
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: camel_test'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_camel_test
+  message: 'An override the `createRegistry` method for beans registration is no longer
+    necessary. The preferred way is to use the `bind` method from the Registry API:
+    `context.getRegistry().bind("myId", myBean);`'
+  ruleID: java-generic-information-00042
+  when:
+    and:
+    - as: classes
+      java.referenced:
+        location: INHERITANCE
+        pattern: (org.apache.camel.test.junit4.CamelTestSupport|org.apache.camel.ContextTestSupport)
+    - from: classes
+      java.referenced:
+        location: METHOD
+        pattern: '*createRegistry*'
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.management.event package was moved
+  effort: 1
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: class'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_class
+  message: '`org.apache.camel.management.event` was moved to the `org.apache.camel.spi.CamelEvent`
+    class'
+  ruleID: java-generic-information-00043
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.management.event*
+- category: mandatory
+  customVariables: []
+  description: Testing with 'adviceWith' changed
+  effort: 3
+  labels:
+  - konveyor.io/source=camel2
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: advicewith'
+    url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_advicewith
+  message: |-
+    Testing with `adviceWith` changed. It's necessary to use `RouteReifier` or `AdviceWithRouteBuilder` such as
+     ```
+     AdviceWithRouteBuilder.adviceWith(context, "myRoute", a -> {{
+     a.replaceFromWith("direct:start");
+     }}
+     ```
+  ruleID: java-generic-information-00044
+  when:
+    and:
+    - as: classes
+      java.referenced:
+        location: INHERITANCE
+        pattern: org.apache.camel.test.junit4.CamelTestSupport
+    - from: classes
+      java.referenced:
+        location: METHOD
+        pattern: '*adviceWith*'
+    - from: classes
+      java.referenced:
+        location: METHOD_CALL
+        pattern: '*adviceWith*'
diff --git a/resources/rulesets/camel3/18-java-generic-information.windup.yaml b/resources/rulesets/camel3/34-java-generic-information.windup.yaml
similarity index 92%
rename from resources/rulesets/camel3/18-java-generic-information.windup.yaml
rename to resources/rulesets/camel3/34-java-generic-information.windup.yaml
index 3774871..4fdcbc9 100644
--- a/resources/rulesets/camel3/18-java-generic-information.windup.yaml
+++ b/resources/rulesets/camel3/34-java-generic-information.windup.yaml
@@ -11,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: "\n The class `org.apache.camel.processor.aggregate.AggregationStrategy`
-    has been moved to `org.apache.camel.AggregationStrategy`.\n "
+  message: The class `org.apache.camel.processor.aggregate.AggregationStrategy` has
+    been moved to `org.apache.camel.AggregationStrategy`.
   ruleID: java-generic-information-00000
   when:
     java.referenced:
@@ -33,9 +33,8 @@
   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: "\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 "
+  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`.
   ruleID: java-generic-information-00001
   when:
     java.referenced:
@@ -51,7 +50,7 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: "`zip` and `gzip` dataformats were renamed to `zipdeflater and `gzipdeflater`\n "
+  message: '`zip` and `gzip` dataformats were renamed to `zipdeflater and `gzipdeflater`'
   ruleID: java-generic-information-00002
   when:
     or:
@@ -81,8 +80,8 @@
   - konveyor.io/target=camel3+
   - konveyor.io/target=camel
   links: []
-  message: "\n The class `org.apache.camel.impl.{{registry}}` has been removed. Use
-    `org.apache.camel.support.DefaultRegistry` instead.\n "
+  message: The class `org.apache.camel.impl.{{registry}}` has been removed. Use `org.apache.camel.support.DefaultRegistry`
+    instead.
   ruleID: java-generic-information-00004
   when:
     as: javaClass
@@ -102,9 +101,9 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: "\n The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport`
-    has been removed. Use\n `org.apache.camel.processor.loadbalancer.LoadBalancerSupport`
-    instead.\n "
+  message: |-
+    The class `org.apache.camel.processor.loadbalancer.SimpleLoadBalancerSupport` has been removed. Use
+     `org.apache.camel.processor.loadbalancer.LoadBalancerSupport` instead.
   ruleID: java-generic-information-00005
   when:
     as: javaClass
@@ -126,7 +125,7 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: "\n The class `org.apache.camel.{{removed}}` has been removed.\n "
+  message: The class `org.apache.camel.{{removed}}` has been removed.
   ruleID: java-generic-information-00006
   when:
     as: javaClass
@@ -145,8 +144,8 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: "\n The class `org.apache.camel.util.toolbox.AggregationStrategies` has
-    been moved to `org.apache.camel.builder.AggregationStrategies`.\n "
+  message: The class `org.apache.camel.util.toolbox.AggregationStrategies` has been
+    moved to `org.apache.camel.builder.AggregationStrategies`.
   ruleID: java-generic-information-00008
   when:
     java.referenced:
@@ -164,8 +163,8 @@
   links:
   - title: 'Camel 3 - Migration Guide: Generic Information'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_generic_information
-  message: "\n The class `org.apache.camel.management.JmxSystemPropertyKeys` has been
-    moved to ` org.apache.camel.api.management.JmxSystemPropertyKeys`.\n "
+  message: The class `org.apache.camel.management.JmxSystemPropertyKeys` has been
+    moved to ` org.apache.camel.api.management.JmxSystemPropertyKeys`.
   ruleID: java-generic-information-00009
   when:
     java.referenced:
@@ -183,7 +182,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\n "
+  message: '`includeRoutes` method has been removed'
   ruleID: java-generic-information-00010
   when:
     builtin.filecontent:
@@ -536,9 +535,9 @@
   links:
   - title: 'Camel 3 - Migration Guide: Idempotent repositories'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_idempotent_repositories
-  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 "
+  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`.
   ruleID: java-generic-information-00029
   when:
     or:
@@ -665,11 +664,13 @@
   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
-    `org.apache.camel.api.management.ManagedCamelContext.{{method}}`. You can access
-    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 "
+  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.
   ruleID: java-generic-information-00045
   when:
     java.referenced:
@@ -772,9 +773,11 @@
   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:\n\n `CatalogCamelContext
-    ccc = context.adapt(CatalogCamelContext.class);`\n `ccc.{{method}}(...);`\n "
+  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}}(...);`
   ruleID: java-generic-information-00049
   when:
     java.referenced:
@@ -795,9 +798,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.\n "
+    instead.
   ruleID: java-generic-information-00050
   when:
     java.referenced:
@@ -819,10 +822,11 @@
   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
-    `org.apache.camel.model.Model.{{method}}`. You can access it by adapting your
-    `CamelContext` like so:\n\n `ModelCamelContext ccc = context.adapt(ModelCamelContext.class);`\n
-    `mcc.{{method}}(...);`\n "
+  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}}(...);`
   ruleID: java-generic-information-00051
   when:
     java.referenced:
@@ -844,10 +848,11 @@
   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
-    `org.apache.camel.ExtendedCamelContext.{{method}}`. You can access it by adapting
-    your `CamelContext` like so:\n\n `ExtendedCamelContext ecc = context.adapt(ExtendedCamelContext.class);`\n
-    `ecc.{{method}}(...);`\n "
+  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}}(...);`
   ruleID: java-generic-information-00052
   when:
     java.referenced:
diff --git a/resources/rulesets/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml b/resources/rulesets/camel3/35-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
similarity index 79%
rename from resources/rulesets/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
rename to resources/rulesets/camel3/35-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
index 8575ff4..f6768e7 100644
--- a/resources/rulesets/camel3/19-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
+++ b/resources/rulesets/camel3/35-java-multiple-camelcontexts-per-application-not-supported.windup.yaml
@@ -14,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: "\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 "
+  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.
   ruleID: java-multiple-camelcontexts-per-application-not-supported-00000
   when:
     java.referenced:
@@ -38,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: "\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 "
+  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`.
   ruleID: java-multiple-camelcontexts-per-application-not-supported-00001
   when:
     java.referenced:
diff --git a/resources/rulesets/camel3/36-xml-31-changes.windup.yaml b/resources/rulesets/camel3/36-xml-31-changes.windup.yaml
new file mode 100644
index 0000000..b28e1ae
--- /dev/null
+++ b/resources/rulesets/camel3/36-xml-31-changes.windup.yaml
@@ -0,0 +1,121 @@
+- category: mandatory
+  customVariables: []
+  description: HttpOperationFailedException has moved from package org.apache.camel.http.common
+    to org.apache.camel.http.base
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html#_camel_undertow
+  message: '`HttpOperationFailedException` has moved from package org.apache.camel.http.common
+    to org.apache.camel.http.base in Camel 3.1.'
+  ruleID: classes-removed-camel31-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.http.common.HttpOperationFailedException
+- category: mandatory
+  customVariables: []
+  description: camel-jaxp component has been renamed to camel-xml-jaxp
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html
+  message: '`camel-jaxp` component has been renamed to camel-xml-jaxp in Apache Camel
+    3.1.'
+  ruleID: xml-removed-camel31-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jaxp
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jaxp
+- category: optional
+  customVariables: []
+  description: The camel-management dependency has been removed from camel-spring-boot
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html#_spring_boot_jmx
+  message: The `camel-management` dependency has been removed from camel-spring-boot
+    - If you need JMX support with Camel Spring Boot, please add a dependency on org.apache.camel:camel-management
+  ruleID: xml-removed-camel31-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: org\.apache\.camel\.springboot\..*
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: org\.apache\.camel\.springboot\..*
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.http.common.cookie package has been renamed to org.apache.camel.http.base.cookie
+    and moved into the camel-http-base JAR*
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html#_cookies
+  message: '`org.apache.camel.http.common.cookie` package has been renamed to org.apache.camel.http.base.cookie
+    and moved into the camel-http-base JAR'
+  ruleID: xml-moved-camel31-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.http.common.cookie*
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.tooling.util.JSonSchemaHelper class has been removed
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html#_jsonschemahelper_removed
+  message: '`org.apache.camel.tooling.util.JSonSchemaHelper` class has been removed
+    in Apache Camel 3.1. Instead you can use utils coming from camel-util-json and
+    the class org.apache.camel.tooling.util.PackageHelper.'
+  ruleID: xml-moved-camel31-00002
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.http.common.HttpOperationFailedException
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.processor.validation.PredicateValidatingProcessor
+    class has been moved from camel-xml-jaxp JAR to camel-support JAR and renamed
+    to org.apache.camel.support.processor.PredicateValidatingProcessor
+  effort: 2
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.1+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_1.html#_camel_xml_jaxp
+  message: '`org.apache.camel.processor.validation.PredicateValidatingProcessor` class
+    has been moved from camel-xml-jaxp JAR to camel-support JAR and renamed to org.apache.camel.support.processor.'
+  ruleID: xml-moved-camel31-00003
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.processor.validation.PredicateValidatingProcessor
diff --git a/resources/rulesets/camel3/37-xml-310-changes.windup.yaml b/resources/rulesets/camel3/37-xml-310-changes.windup.yaml
new file mode 100644
index 0000000..b877986
--- /dev/null
+++ b/resources/rulesets/camel3/37-xml-310-changes.windup.yaml
@@ -0,0 +1,250 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-jdbc no longer depends on Spring Framework
+  effort: 2
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_camel_jdbc
+  message: '`org.apache.camel:camel-jdbc` no longer depends on Spring Framework. Please
+    use camel-spring-jdbc if you need Spring and Spring transaction support.'
+  ruleID: xml-removed-camel310-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jdbc
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jdbc
+- category: mandatory
+  customVariables: []
+  description: camel.component.atomix.cluster.service configuration key has been renamed
+    to camel.cluster.atomix
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.atomix.cluster.service` configuration key has been renamed
+    to camel.cluster.atomix.'
+  ruleID: properties-removed-camel310-00002
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.atomix.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.consul.cluster.service configuration key has been renamed
+    to camel.cluster.consul
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.consul.cluster.service` configuration key has been renamed
+    to camel.cluster.consul.'
+  ruleID: properties-removed-camel310-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.consul.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.consul.service-registry configuration key has been
+    renamed to camel.cloud.consul.service-registry
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.consul.service-registry` configuration key has been renamed
+    to camel.cloud.consul.service-registry.'
+  ruleID: properties-removed-camel310-00004
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.consul.service-registry
+- category: mandatory
+  customVariables: []
+  description: camel.component.file.cluster.service configuration key has been renamed
+    to camel.cluster.file
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.file.cluster.service` configuration key has been renamed
+    to camel.cluster.file.'
+  ruleID: properties-removed-camel310-00005
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.file.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.hystrix.mapping configuration key has been renamed
+    to camel.hystrix.mapping
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.hystrix.mapping` configuration key has been renamed to
+    camel.hystrix.mapping.'
+  ruleID: properties-removed-camel310-00006
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.hystrix.mapping
+- category: mandatory
+  customVariables: []
+  description: camel.component.jgroups.lock.cluster.service configuration key has
+    been renamed to camel.cluster.jgroups
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.jgroups.lock.cluster.service` configuration key has been
+    renamed to camel.cluster.jgroups.'
+  ruleID: properties-removed-camel310-00007
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.jgroups.lock.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.jgroups.raft.cluster.service configuration key has
+    been renamed to camel.cluster.jgroups-raft
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.jgroups.raft.cluster.service` configuration key has been
+    renamed to camel.cluster.jgroups-raft.'
+  ruleID: properties-removed-camel310-00008
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.jgroups.raft.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.kubernetes.cluster.service configuration key has been
+    renamed to camel.cluster.kubernetes
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.kubernetes.cluster.service` configuration key has been
+    renamed to camel.cluster.kubernetes.'
+  ruleID: properties-removed-camel310-00009
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.kubernetes.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.servlet.mapping configuration key has been renamed
+    to camel.servlet.mapping
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.servlet.mapping` configuration key has been renamed to
+    camel.servlet.mapping.'
+  ruleID: properties-removed-camel310-00010
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.servlet.mapping
+- category: mandatory
+  customVariables: []
+  description: camel.component.undertow.spring.security configuration key has been
+    renamed to camel.security.undertow
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.undertow.spring.security` configuration key has been
+    renamed to camel.security.undertow.'
+  ruleID: properties-removed-camel310-00011
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.undertow.spring.security
+- category: mandatory
+  customVariables: []
+  description: camel.component.zookeeper.cluster.service configuration key has been
+    renamed to camel.cluster.zookeeper
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.zookeeper.cluster.service` configuration key has been
+    renamed to camel.cluster.zookeeper.'
+  ruleID: properties-removed-camel310-00012
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.zookeeper.cluster.service
+- category: mandatory
+  customVariables: []
+  description: camel.component.zookeeper.service-registry configuration key has been
+    renamed to camel.cloud.zookeeper
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.10+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_10.html#_spring_boot_starters
+  message: '`camel.component.zookeeper.service-registry` configuration key has been
+    renamed to camel.cloud.zookeeper.'
+  ruleID: properties-removed-camel310-00013
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.zookeeper.service-registry
diff --git a/resources/rulesets/camel3/38-xml-311-changes.windup.yaml b/resources/rulesets/camel3/38-xml-311-changes.windup.yaml
new file mode 100644
index 0000000..4b0bb25
--- /dev/null
+++ b/resources/rulesets/camel3/38-xml-311-changes.windup.yaml
@@ -0,0 +1,83 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-apns component has been retired
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.11+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_11.html#_camel_apns
+  message: '`org.apache.camel:camel-apns` component has been retired in Apache Camel
+    3.11. APNS (Apple Push Network System) has been retired by Apple.'
+  ruleID: xml-removed-camel311-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-apns
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-apns
+- category: optional
+  customVariables: []
+  description: org.apache.camel:camel-saxon artifact has been removed
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.11+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_11.html#_camel_saxon
+  message: '`org.apache.camel:camel-saxon` no longer depends on camel-saxon-xslt in
+    3.11. Any application that needs to do xslt transformation with saxon should now
+    declare an explicit dependency on camel-saxon-xslt.'
+  ruleID: xml-changed-camel311-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-saxon
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-saxon
+- category: mandatory
+  customVariables: []
+  description: camel.component.consul.service-registry configuration key has been
+    renamed to camel.cloud.consul
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.11+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_11.html#_spring_boot_starters
+  message: '`camel.component.consul.service-registry` configuration key has been renamed
+    to camel.cloud.consul.'
+  ruleID: properties-removed-camel311-00001
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component.consul.service-registry..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.cloud.consul.service-registry configuration key has been renamed
+    to camel.cloud.consul
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.11+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_11.html#_spring_boot_starters
+  message: '`camel.cloud.consul.service-registry` configuration key has been renamed
+    to camel.cloud.consul.'
+  ruleID: properties-removed-camel311-00002
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.cloud.consul.service-registry=.*
diff --git a/resources/rulesets/camel3/39-xml-312-changes.windup.yaml b/resources/rulesets/camel3/39-xml-312-changes.windup.yaml
new file mode 100644
index 0000000..33ee79d
--- /dev/null
+++ b/resources/rulesets/camel3/39-xml-312-changes.windup.yaml
@@ -0,0 +1,92 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.springboot:camel-spring-cloud-starter starter has
+    been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.12+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_12.html#_camel_spring_cloud_starter
+  message: '`org.apache.camel.springboot:camel-spring-cloud-starter` starter has been
+    removed in Apache Camel 3.12.'
+  ruleID: xml-removed-camel312-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-starter
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.springboot:camel-spring-cloud-consul-starter starter
+    has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.12+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_12.html#_camel_spring_cloud_starter
+  message: '`org.apache.camel.springboot:camel-spring-cloud-consul-starter has been
+    removed in Apache Camel 3.12.'
+  ruleID: xml-removed-camel312-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-consul-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-consul-starter
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.springboot:camel-spring-cloud-netflix-starter starter
+    has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.12+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_12.html#_camel_spring_cloud_starter
+  message: '`org.apache.camel.springboot:camel-spring-cloud-netflix-starter` starter
+    has been removed in Apache Camel 3.12.'
+  ruleID: xml-removed-camel312-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-netflix-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-netflix-starter
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.springboot:camel-spring-cloud-zookeeper-starter starter
+    has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.12+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_12.html#_camel_spring_cloud_starter
+  message: '`org.apache.camel.springboot:camel-spring-cloud-zookeeper-starter` starter
+    has been removed in Apache Camel 3.12.'
+  ruleID: xml-removed-camel312-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-zookeeper-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-spring-cloud-zookeeper-starter
diff --git a/resources/rulesets/camel3/40-xml-313-changes.windup.yaml b/resources/rulesets/camel3/40-xml-313-changes.windup.yaml
new file mode 100644
index 0000000..4cfcdd7
--- /dev/null
+++ b/resources/rulesets/camel3/40-xml-313-changes.windup.yaml
@@ -0,0 +1,50 @@
+- category: optional
+  customVariables: []
+  description: org.apache.camel.springboot:camel-hazelzcast-starter starter no longer
+    has customer auto configuration options for all its components
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.13+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_13.html#_camel_hazelcast_starter
+  message: '`org.apache.camel.springboot:camel-hazelzcast-starter` starter no longer
+    has customer auto configuration options in Apache Camel 3.13.'
+  ruleID: xml-removed-camel313-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-hazelzcast-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-hazelzcast-starter
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-mllp starter has been refactored
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.13+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_13.html#_camel_mllp
+  message: This component has been refactored to be similar to other Camel components.
+    The old component had an unusual static configuration of the MllpComponent which
+    now is refactored to be Camel standard with regular getter/setters. The component
+    is now also configured reflection free. We also cleaned up how the component dealt
+    with which charset to use when processing HL7 messages. Users using camel-mllp
+    is recommended to test their applications when upgrading to ensure this continues
+    to work.
+  ruleID: xml-removed-camel313-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-mllp
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-mllp
diff --git a/resources/rulesets/camel3/41-xml-314-changes.windup.yaml b/resources/rulesets/camel3/41-xml-314-changes.windup.yaml
new file mode 100644
index 0000000..61e1084
--- /dev/null
+++ b/resources/rulesets/camel3/41-xml-314-changes.windup.yaml
@@ -0,0 +1,20 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.kafka.clients.producer.KafkaProducer and org.apache.kafka.clients.consumer.KafkaConsumer
+    have changed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.14+
+  - konveyor.io/target=camel
+  links:
+  - title: Camel 3.14 - Upgrade Guide
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_14.html#_camel_kafka
+  message: org.apache.kafka.clients.producer.KafkaProducer and org.apache.kafka.clients.consumer.KafkaConsumer
+    have changed to using their interfaces org.apache.kafka.clients.producer.Producer
+    and org.apache.kafka.clients.consumer.Consumer.
+  ruleID: xml-314-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.kafka.clients.producer*
diff --git a/resources/rulesets/camel3/42-xml-315-changes.windup.yaml b/resources/rulesets/camel3/42-xml-315-changes.windup.yaml
new file mode 100644
index 0000000..a48c3c9
--- /dev/null
+++ b/resources/rulesets/camel3/42-xml-315-changes.windup.yaml
@@ -0,0 +1,331 @@
+- category: potential
+  customVariables: []
+  description: JDK 8 no longer supported
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JDK Upgrade'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_upgrading_camel_3_14_to_3_15
+  message: JDK 8 no longer supported - In Camel 3.15, JDK 11 or 17 is required.
+  ruleID: xml-315-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: org\.apache\.camel\..*
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: org\.apache\.camel\..*
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-kamelet-reify component has been retired
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_removed_components
+  message: '`camel-kamelet-reify` component has been retired in Apache Camel 3.15.'
+  ruleID: xml-removed-camel315-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kamelet-reify
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kamelet-reify
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-spring-javaconfig component has been retired
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_removed_components
+  message: '`camel-spring-javaconfig` component has been retired in Apache Camel 3.15.'
+  ruleID: xml-removed-camel315-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spring-javaconfig
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spring-javaconfig
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.fhirjson configuration key has been renamed to camel.dataformat.fhir-json
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.fhirjson` configuration key has been renamed to camel.dataformat.fhir-json.'
+  ruleID: properties-removed-camel315-00001
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.fhirjson..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.fhirxml configuration key has been renamed to camel.dataformat.fhir-xml
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.fhirxml` configuration key has been renamed to camel.dataformat.fhir-xml.'
+  ruleID: properties-removed-camel315-00002
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.fhirxml..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.gzipdeflater configuration key has been renamed to
+    camel.dataformat.gzip-deflater
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.gzipdeflater` configuration key has been renamed to
+    camel.dataformat.gzip-deflater.'
+  ruleID: properties-removed-camel315-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.gzipdeflater..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.jacksonxml configuration key has been renamed to camel.dataformat.jackson-xml
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.jacksonxml` configuration key has been renamed to camel.dataformat.jackson-xml.'
+  ruleID: properties-removed-camel315-00004
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.jacksonxml..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.jsonapi configuration key has been renamed to camel.dataformat.json-api
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.jsonapi` configuration key has been renamed to camel.dataformat.json-api.'
+  ruleID: properties-removed-camel315-00005
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.jsonapi..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.mimemultipart configuration key has been renamed to
+    camel.dataformat.mime-multipart
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.mimemultipart` configuration key has been renamed to
+    camel.dataformat.mime-multipart.'
+  ruleID: properties-removed-camel315-00006
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.mimemultipart..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.securexml configuration key has been renamed to camel.dataformat.xml-security
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.securexml` configuration key has been renamed to camel.dataformat.xml-security.'
+  ruleID: properties-removed-camel315-00007
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.securexml..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.tarfile configuration key has been renamed to camel.dataformat.tar-file
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.tarfile` configuration key has been renamed to camel.dataformat.tar-file.'
+  ruleID: properties-removed-camel315-00008
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.tarfile..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.tidymarkup configuration key has been renamed to camel.dataformat.tidy-markup
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.tidymarkup` configuration key has been renamed to camel.dataformat.tidy-markup.'
+  ruleID: properties-removed-camel315-00009
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.tidymarkup..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.univocitycsv configuration key has been renamed to
+    camel.dataformat.univocity-csv
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.univocitycsv` configuration key has been renamed to
+    camel.dataformat.univocity-csv.'
+  ruleID: properties-removed-camel315-00010
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.univocitycsv..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.univocityfixed configuration key has been renamed
+    to camel.dataformat.univocity-fixed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.univocityfixed` configuration key has been renamed to
+    camel.dataformat.univocity-fixed.'
+  ruleID: properties-removed-camel315-00011
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.univocityfixed..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.univocitytsv configuration key has been renamed to
+    camel.dataformat.univocity-tsv
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.univocitytsv` configuration key has been renamed to
+    camel.dataformat.univocity-tsv.'
+  ruleID: properties-removed-camel315-00012
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.univocitytsv..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.yaml-snakeyaml configuration key has been renamed
+    to camel.dataformat.snake-yaml
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.yaml-snakeyaml` configuration key has been renamed to
+    camel.dataformat.snake-yaml.'
+  ruleID: properties-removed-camel315-00013
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.yaml-snakeyaml..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.zipdeflater configuration key has been renamed to
+    camel.dataformat.zip-deflater
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.zipdeflater` configuration key has been renamed to camel.dataformat.zip-deflater.'
+  ruleID: properties-removed-camel315-00014
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.zipdeflater..*=.*
+- category: mandatory
+  customVariables: []
+  description: camel.dataformat.zipfile configuration key has been renamed to camel.dataformat.zip-file
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.15+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_15.html#_data_formats
+  message: '`camel.dataformat.zipfile` configuration key has been renamed to camel.dataformat.zip-file.'
+  ruleID: properties-removed-camel315-00015
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.dataformat.zipfile..*=.*
diff --git a/resources/rulesets/camel3/43-xml-316-changes.windup.yaml b/resources/rulesets/camel3/43-xml-316-changes.windup.yaml
new file mode 100644
index 0000000..06c18e2
--- /dev/null
+++ b/resources/rulesets/camel3/43-xml-316-changes.windup.yaml
@@ -0,0 +1,45 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-testcontainers-spring component has been replaced
+    with camel-test-infra
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.16+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_16.html#_camel_testcontainers_spring
+  message: '`camel-testcontainers-spring` component has been replaced with camel-test-infra.'
+  ruleID: xml-removed-camel316-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-testcontainers-spring
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-testcontainers-spring
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-testcontainers-spring-junit5 component has been
+    retired
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.16+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_16.html#_camel_testcontainers_spring
+  message: '`camel-testcontainers-spring-junit5` component has been replaced with
+    camel-test-infra.'
+  ruleID: xml-removed-camel316-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-testcontainers-spring-junit5
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-testcontainers-spring-junit5
diff --git a/resources/rulesets/camel3/44-xml-317-changes.windup.yaml b/resources/rulesets/camel3/44-xml-317-changes.windup.yaml
new file mode 100644
index 0000000..6db86a6
--- /dev/null
+++ b/resources/rulesets/camel3/44-xml-317-changes.windup.yaml
@@ -0,0 +1,437 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-atomix component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-atomix` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-atomix
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-atomix
+- category: mandatory
+  customVariables: []
+  description: camel-beanstalk component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-beanstalk` component has been removed in Camel
+    3.17.0.'
+  ruleID: xml-removed-camel317-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-beanstalk
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-beanstalk
+- category: mandatory
+  customVariables: []
+  description: camel-beanio component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-beanio` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-beanio
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-beanio
+- category: mandatory
+  customVariables: []
+  description: camel-etcd component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-etcd` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-etcd
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-etcd
+- category: mandatory
+  customVariables: []
+  description: camel-elsql component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-elsql` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00005
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-elsql
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-elsql
+- category: mandatory
+  customVariables: []
+  description: camel-ganglia component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-ganglia` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00006
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ganglia
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ganglia
+- category: mandatory
+  customVariables: []
+  description: camel-nsq component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-nsq` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00007
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-nsq
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-nsq
+- category: mandatory
+  customVariables: []
+  description: camel-hystrix component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-hystrix` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00008
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-hystrix
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-hystrix
+- category: mandatory
+  customVariables: []
+  description: camel-jing component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-jing` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00009
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jing
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-jing
+- category: mandatory
+  customVariables: []
+  description: camel-leveldb-legacy component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-leveldb-legacy` component has been removed in
+    Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00010
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-leveldb-legacy
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-leveldb-legacy
+- category: mandatory
+  customVariables: []
+  description: camel-msv component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-msv` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00011
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-msv
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-msv
+- category: mandatory
+  customVariables: []
+  description: camel-nagios component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-nagios` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00012
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-nagios
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-nagios
+- category: mandatory
+  customVariables: []
+  description: camel-ribbon component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-ribbon` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00013
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ribbon
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ribbon
+- category: mandatory
+  customVariables: []
+  description: camel-sip component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-sip` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00014
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-sip
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-sip
+- category: mandatory
+  customVariables: []
+  description: camel-soroush component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-soroush` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00015
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-soroush
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-soroush
+- category: mandatory
+  customVariables: []
+  description: camel-tagsoup component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-tagsoup` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00016
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-tagsoup
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-tagsoup
+- category: mandatory
+  customVariables: []
+  description: camel-yammer component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_deprecated_components
+  message: '`org.apache.camel:camel-yammer` component has been removed in Camel 3.17.0.'
+  ruleID: xml-removed-camel317-00017
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-yammer
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-yammer
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.builder.DeadLetterChannelBuilder component has been
+    replaced by org.apache.camel.builder.LegacyDeadLetterChannelBuilder
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_camel_spring_xml_camel_blueprint
+  message: '`org.apache.camel.builder.DeadLetterChannelBuilder` component has been
+    replaced by org.apache.camel.builder.LegacyDeadLetterChannelBuilder in Camel 3.17.0.'
+  ruleID: xml-legacy-camel317-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.builder.DeadLetterChannelBuilder
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.builder.DefaultErrorHandlerBuilder component has been
+    replaced by org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_camel_spring_xml_camel_blueprint
+  message: '`org.apache.camel.builder.DefaultErrorHandlerBuilder` component has been
+    replaced by org.apache.camel.builder.LegacyDefaultErrorHandlerBuilder in Camel
+    3.17.0.'
+  ruleID: xml-legacy-camel317-00002
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.builder.DefaultErrorHandlerBuilder
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.builder.NoErrorHandlerBuilder component has been replaced
+    by org.apache.camel.builder.LegacyDeadLetterChannelBuilder
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_camel_spring_xml_camel_blueprint
+  message: '`org.apache.camel.builder.NoErrorHandlerBuilder` component has been replaced
+    by org.apache.camel.builder.LegacyDeadLetterChannelBuilder in Camel 3.17.0.'
+  ruleID: xml-legacy-camel317-00003
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.builder.NoErrorHandlerBuilder
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.spring.spi.TransactionErrorHandlerBuilder component
+    has been replaced by org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.17+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_17.html#_camel_spring_xml_camel_blueprint
+  message: '`org.apache.camel.spring.spi.TransactionErrorHandlerBuilder` component
+    has been replaced by org.apache.camel.spring.spi.LegacyTransactionErrorHandlerBuilder
+    in Camel 3.17.0.'
+  ruleID: xml-legacy-camel317-00004
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.spring.spi.TransactionErrorHandlerBuilder
diff --git a/resources/rulesets/camel3/45-xml-318-changes.windup.yaml b/resources/rulesets/camel3/45-xml-318-changes.windup.yaml
new file mode 100644
index 0000000..721615e
--- /dev/null
+++ b/resources/rulesets/camel3/45-xml-318-changes.windup.yaml
@@ -0,0 +1,92 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-milo component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.18+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_18.html#_camel_karaf
+  message: '`org.apache.camel:camel-milo` component has been removed in Camel 3.18.0.'
+  ruleID: xml-removed-camel318-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-milo
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-milo
+- category: mandatory
+  customVariables: []
+  description: camel-cxf component has been split up
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.18+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_18.html#_camel_cxf
+  message: The camel-cxf JAR has been split up into SOAP vs REST and Spring and non
+    Spring JARs in Camel 3.18.0. Please see the Camel 3.18 upgrade guide for details
+    on which artifacts to migrate camel-cxf to.
+  ruleID: xml-removed-camel318-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cxf
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cxf
+- category: mandatory
+  customVariables: []
+  description: camel-cxf-starter component has been split up
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.18+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_18.html#_camel_cxf
+  message: '`camel-cxf-starter` component has been split up - The camel-cxf-starter
+    has been split up into SOAP vs REST (camel-cxf-soap-starter and camel-cxf-rest-starter)
+    in Camel 3.18.0. Please see the Camel 3.18 upgrade guide for details on which
+    artifacts to migrate camel-cxf-starter to.'
+  ruleID: xml-removed-camel318-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cxf-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cxf-starter
+- category: mandatory
+  customVariables: []
+  description: camel-cxf-starter component has been split up
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.18+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_18.html#_camel_cxf
+  message: '`camel-cxf-starter` component has been split up - The camel-cxf-starter
+    has been split up into SOAP vs REST (camel-cxf-soap-starter and camel-cxf-rest-starter)
+    in Camel 3.18.0. Please see the Camel 3.18 upgrade guide for details on which
+    artifacts to migrate camel-cxf-starter to.'
+  ruleID: xml-removed-camel318-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-cxf-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-cxf-starter
diff --git a/resources/rulesets/camel3/46-xml-319-changes.windup.yaml b/resources/rulesets/camel3/46-xml-319-changes.windup.yaml
new file mode 100644
index 0000000..28300c1
--- /dev/null
+++ b/resources/rulesets/camel3/46-xml-319-changes.windup.yaml
@@ -0,0 +1,132 @@
+- category: optional
+  customVariables: []
+  description: org.apache.camel:camel-ftp default TLS protocol is changed from TLSv1.2
+    to TLSv1.3.
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_ftp
+  message: '`org.apache.camel:camel-ftp` default TLS protocol is changed from TLSv1.2
+    to TLSv1.3.'
+  ruleID: xml-removed-camel319-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ftp
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ftp
+- category: mandatory
+  customVariables: []
+  description: camel-kafka default TLS protocol is TLSv1.2,TLSv1.3
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_kafka
+  message: '`camel-kafka` default TLS protocol is TLSv1.2,TLSv1.3 - the default TLS
+    protocol in Kafka Clients running on JDK11+ is TLSv1.2,TLSv1.3 (prefer v1.3 but
+    can fall back to v1.2). in Camel 3.19.0.'
+  ruleID: xml-removed-camel319-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kafka
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kafka
+- category: mandatory
+  customVariables: []
+  description: camel-netty default TLS protocol is TLSv1.2,TLSv1.3
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_netty_camel_netty_http
+  message: '`org.apache.camel:camel-netty` - the default TLS protocol is changed from
+    TLSv1,TLSv1.1,TLSv1.2 to TLSv1.2,TLSv1.3 in Camel 3.19.0.'
+  ruleID: xml-removed-camel319-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-netty
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-netty
+- category: mandatory
+  customVariables: []
+  description: camel-netty-http default TLS protocol is TLSv1.2,TLSv1.3
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_camel_netty_camel_netty_http
+  message: '`org.apache.camel:camel-netty-http` - the default TLS protocol is changed
+    from TLSv1,TLSv1.1,TLSv1.2 to TLSv1.2,TLSv1.3 in Camel 3.19.0.'
+  ruleID: xml-removed-camel319-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-netty-http
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-netty-http
+- category: mandatory
+  customVariables: []
+  description: camel-ahc component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_deprecated_components
+  message: '`org.apache.camel:camel-ahc` component has been removed in Camel 3.19.0.'
+  ruleID: xml-removed-camel319-00005
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ahc
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ahc
+- category: mandatory
+  customVariables: []
+  description: camel-ahc-ws component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.19+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_19.html#_deprecated_components
+  message: '`org.apache.camel:camel-ahc-ws` component has been removed in Camel 3.19.0.'
+  ruleID: xml-removed-camel319-00006
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ahc-ws
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-ahc-ws
diff --git a/resources/rulesets/camel3/47-xml-32-changes.windup.yaml b/resources/rulesets/camel3/47-xml-32-changes.windup.yaml
new file mode 100644
index 0000000..452880d
--- /dev/null
+++ b/resources/rulesets/camel3/47-xml-32-changes.windup.yaml
@@ -0,0 +1,282 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.impl.JndiRegistry has been removed
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_jndiregistry
+  message: '`org.apache.camel.impl.JndiRegistry` has been removed - please use org.apache.camel.support.jndi.JndiBeanRepository
+    in org.apache.camel:camel-support instead.'
+  ruleID: jndiregistry-removed-camel32-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.JndiRegistry
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_camel_with_karaf_and_osgi
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-blueprint` dependency to `org.apache.came.karaf:camel-blueprint`.'
+  ruleID: xml-removed-camel32-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-blueprint
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-blueprint
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-test-blueprint` dependency to `org.apache.camel.karaf:camel-test-blueprint`.'
+  ruleID: xml-removed-camel32-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test-blueprint
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-blueprint
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-test-karaf` dependency to `org.apache.camel.karaf:camel-test-karaf`.'
+  ruleID: xml-removed-camel32-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test-karaf
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test-karaf
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-eventadmin` dependency to `org.apache.camel.karaf:camel-eventadmin`.'
+  ruleID: xml-removed-camel32-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-eventadmin
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-eventadmin
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-kura` dependency to `org.apache.camel.karaf:camel-kura`.'
+  ruleID: xml-removed-camel32-00005
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kura
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-kura
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-osgi-activator` dependency to `org.apache.camel.karaf:camel-osgi-activator`.'
+  ruleID: xml-removed-camel32-00006
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-osgi-activator
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-osgi-activator
+- category: mandatory
+  customVariables: []
+  description: 'Camel on Apache Karaf / OSGi has been moved to its own project at:
+    https://github.com/apache/camel-karaf'
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_other_components_involved
+  message: 'Camel on Apache Karaf / OSGi has been moved to its own project at: https://github.com/apache/camel-karaf.
+    Please change the `org.apache.camel:camel-paxlogging` dependency to `org.apache.camel.karaf:camel-paxlogging`.'
+  ruleID: xml-removed-camel32-00007
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-paxlogging
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-paxlogging
+- category: mandatory
+  customVariables: []
+  description: camel-spark-rest has been removed
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_camel_spark_rest
+  message: camel-spark-rest component has been removed - please any of the other REST
+    capable components, such as camel-jetty, camel-netty-http or camel-undertow..
+  ruleID: xml-removed-camel32-00008
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spark-rest
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spark-rest
+- category: mandatory
+  customVariables: []
+  description: Camel Spring Boot has flattened its option keys and the .configuration
+    prefix has been removed
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot configuration'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_configuring_components_via_spring_boot_auto_configuration
+  message: Camel Spring Boot has flattened its option keys and the .configuration
+    prefix has been removed. See the example in the upgrade guide for 3.2 for more
+    details
+  ruleID: xml-moved-camel32-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.component..*.configuration..*=.*
+- category: mandatory
+  customVariables: []
+  description: broker-u-r-l in Spring Boot properties renamed to broker-url
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot configuration'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_configuring_camel_activemq_camel_amqp_and_camel_stomp_via_spring_boot_auto_configuration
+  message: broker-u-r-l in Spring Boot properties renamed to broker-url. See the example
+    in the upgrade guide for 3.2 for more details
+  ruleID: xml-moved-camel32-00004
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: .*.broker-u-r-l=.*
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.cluster has been moved out of org.apache.camel:camel-core-engine
+    into org.apache.camel:camel-cluster
+  effort: 2
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot configuration'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_camel_cluster
+  message: org.apache.camel.cluster has been moved out of org.apache.camel:camel-core-engine
+    into org.apache.camel:camel-cluster. See the example in the upgrade guide for
+    3.2 for more details
+  ruleID: xml-moved-camel32-00005
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.cluster*
+- category: optional
+  customVariables: []
+  description: The org.apache.camel.spring.Main class has been moved out of camel-spring
+    JAR into its own JAR named camel-spring-main.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.2+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Moved components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_2.html#_main_in_camel_spring
+  message: The org.apache.camel.spring.Main class has been moved out of camel-spring
+    JAR into its own JAR named camel-spring-main.
+  ruleID: xml-removed-camel32-00010
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spring
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-spring
diff --git a/resources/rulesets/camel3/48-xml-320-changes.windup.yaml b/resources/rulesets/camel3/48-xml-320-changes.windup.yaml
new file mode 100644
index 0000000..0f9bd06
--- /dev/null
+++ b/resources/rulesets/camel3/48-xml-320-changes.windup.yaml
@@ -0,0 +1,102 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-bom no longer includes dependencies with type
+    test-jar
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.20+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_20.html#_camel_bom
+  message: '`org.apache.camel:camel-bom` no longer includes dependencies with a type
+    of test-jar, and the entries to several maven plugins have changed to include
+    the correct groupId of org.apache.camel.maven'
+  ruleID: xml-changed-camel320-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-bom
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-bom
+- category: mandatory
+  customVariables: []
+  description: camel-debezium-maven-plugin has a new groupId of org.apache.camel.maven
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.20+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_20.html#_camel_bom
+  message: '`camel-debezium-maven-plugin` has a new groupId of org.apache.camel.maven'
+  ruleID: xml-changed-camel320-00002
+  when:
+    java.dependency:
+      lowerbound: 0.0.0
+      name: org.apache.camel.camel-debezium-maven-plugin
+- category: mandatory
+  customVariables: []
+  description: camel-salesforce-maven-plugin has a new groupId of org.apache.camel.maven
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.20+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_20.html#_camel_bom
+  message: '`camel-salesforce-maven-plugin` has a new groupId of org.apache.camel.maven'
+  ruleID: xml-changed-camel320-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-salesforce-maven-plugin
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-salesforce-maven-plugin
+- category: mandatory
+  customVariables: []
+  description: camel-servicenow-maven-plugin has a new groupId of org.apache.camel.maven
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.20+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_20.html#_camel_bom
+  message: '`camel-servicenow-maven-plugin` has a new groupId of org.apache.camel.maven'
+  ruleID: xml-changed-camel320-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-servicenow-maven-plugin
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-servicenow-maven-plugin
+- category: mandatory
+  customVariables: []
+  description: The Camel Google Pubsub headers have been renamed, since dotted keys
+    are not allowed.
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.20+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_20.html#_camel_google_pubsub
+  message: The Camel Google Pubsub headers have been renamed, since dotted keys are
+    not allowed.
+  ruleID: xml-changed-camel320-00005
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.component.google.pubsub.GooglePubsubConstants
diff --git a/resources/rulesets/camel3/49-xml-321-changes.windup.yaml b/resources/rulesets/camel3/49-xml-321-changes.windup.yaml
new file mode 100644
index 0000000..f5b1ab2
--- /dev/null
+++ b/resources/rulesets/camel3/49-xml-321-changes.windup.yaml
@@ -0,0 +1,109 @@
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.console.AbstractDevConsole has moved
+    from camel-console to camel-support
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.21+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_21.html#_camel_console
+  message: The class org.apache.camel.impl.console.AbstractDevConsole has moved from
+    camel-console to camel-support and moved to package org.apache.camel.support.console.AbstractDevConsole.
+  ruleID: xml-changed-camel321-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.console.AbstractDevConsole
+- category: mandatory
+  customVariables: []
+  description: camel-java-joor-dsl can no longer load routes defined in class files
+  effort: 3
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.21+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_21.html#_camel_java_joor_dsl
+  message: camel-java-joor-dsl can no longer load routes defined in class files as
+    we consider it no longer needed, consequently the ability to configure the compile
+    directory and the compile load first flag using the corresponding camel-main properties
+    is no longer possible.
+  ruleID: xml-changed-camel321-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-java-joor-dsl
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-java-joor-dsl
+- category: mandatory
+  customVariables: []
+  description: camel-dozer has been deprecated and removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.21+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Deprecated components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_21.html#_deprecated_components
+  message: camel-dozer has been deprecated and removed.
+  ruleID: xml-changed-camel321-00003
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-dozer
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-dozer
+- category: mandatory
+  customVariables: []
+  description: camel-cmis has been deprecated and removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.21+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Deprecated components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_21.html#_deprecated_components
+  message: camel-cmis has been deprecated and removed.
+  ruleID: xml-changed-camel321-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cmis
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-cmis
+- category: mandatory
+  customVariables: []
+  description: The platform-http-starter has been changed from using camel-servlet
+    to use Spring HTTP server directly.
+  effort: 2
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.21+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Changed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_21.html#_camel_platform_http_starter
+  message: The platform-http-starter has been changed from using camel-servlet to
+    use Spring HTTP server directly. Therefore, all the HTTP endpoints are no longer
+    prefixed with the servlet context-path. See the upgrade guide for an example.
+  ruleID: xml-changed-camel321-00005
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-platform-http-starter
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.springboot.camel-platform-http-starter
diff --git a/resources/rulesets/camel3/50-xml-33-changes.windup.yaml b/resources/rulesets/camel3/50-xml-33-changes.windup.yaml
new file mode 100644
index 0000000..05adc23
--- /dev/null
+++ b/resources/rulesets/camel3/50-xml-33-changes.windup.yaml
@@ -0,0 +1,19 @@
+- category: mandatory
+  customVariables: []
+  description: The dump model classes in package org.apache.camel.support.dump have
+    been removed as they were not in use by Camel
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.3+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_3.html#_api_changes
+  message: The dump model classes in package org.apache.camel.support.dump have been
+    removed as they were not in use by Camel.
+  ruleID: java-camel33-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.support.dump*
diff --git a/resources/rulesets/camel3/51-xml-34-changes.windup.yaml b/resources/rulesets/camel3/51-xml-34-changes.windup.yaml
new file mode 100644
index 0000000..b20aab1
--- /dev/null
+++ b/resources/rulesets/camel3/51-xml-34-changes.windup.yaml
@@ -0,0 +1,41 @@
+- category: mandatory
+  customVariables: []
+  description: camel-management dependency has been removed from camel-test
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.4+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Renamed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_4.html#_camel_test_and_jmx
+  message: '`camel-management` dependency has been removed from camel-test. camel-management
+    allows JMX support - which is optional - in order to enable it please adda a dependency
+    to org.apache.camel:camel-management.'
+  ruleID: xml-removed-camel34-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test
+- category: mandatory
+  customVariables: []
+  description: camel.service.lra keys have been flattened to camel.lra
+  effort: 2
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.4+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot configuration'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_4.html#_camel_lra_starter
+  message: camel.service.lra keys have been flattened to camel.lra. See the example
+    in the upgrade guide for 3.4 for more details
+  ruleID: xml-moved-camel34-00001
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.service.lra..*=.*
diff --git a/resources/rulesets/camel3/52-xml-35-changes.windup.yaml b/resources/rulesets/camel3/52-xml-35-changes.windup.yaml
new file mode 100644
index 0000000..2eb407a
--- /dev/null
+++ b/resources/rulesets/camel3/52-xml-35-changes.windup.yaml
@@ -0,0 +1,22 @@
+- category: mandatory
+  customVariables: []
+  description: Camel has been migrated to using JUnit 5 as the default testing framework
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.5+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring / JUnit 5'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_5.html#_junit_5_testing
+  message: Camel has been migrated to using JUnit 5 as the default testing framework.
+    Please read the notes in the upgrade guide and look to using org.apache.camel:camel-test-spring-junit5
+  ruleID: xml-removed-camel35-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test-spring
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-test-spring
diff --git a/resources/rulesets/camel3/53-xml-36-changes.windup.yaml b/resources/rulesets/camel3/53-xml-36-changes.windup.yaml
new file mode 100644
index 0000000..1e14a02
--- /dev/null
+++ b/resources/rulesets/camel3/53-xml-36-changes.windup.yaml
@@ -0,0 +1,40 @@
+- category: mandatory
+  customVariables: []
+  description: The class CamelFileDataSource has moved from camel-http-common package
+    org.apache.camel.http.common to camel-attachments package org.apache.camel.attachment
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.6+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_6.html#_camelfiledatasource
+  message: The class CamelFileDataSource has moved from camel-http-common package
+    org.apache.camel.http.common to camel-attachments package org.apache.camel.attachment.
+  ruleID: java-camel36-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.http.common.CamelFileDataSource
+- category: mandatory
+  customVariables: []
+  description: camel-hipchat component has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.6+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_6.html#_camel_hipchat
+  message: '`camel-hipchat` component has been removed.'
+  ruleID: xml-removed-camel36-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-hipchat
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-hipchat
diff --git a/resources/rulesets/camel3/54-xml-37-changes.windup.yaml b/resources/rulesets/camel3/54-xml-37-changes.windup.yaml
new file mode 100644
index 0000000..8b75c92
--- /dev/null
+++ b/resources/rulesets/camel3/54-xml-37-changes.windup.yaml
@@ -0,0 +1,338 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel.processor.interceptor.BreakpointSupport moved to to
+    org.apache.camel.support.BreakpointSupport
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: org.apache.camel.processor.interceptor.BreakpointSupport moved to to org.apache.camel.support.BreakpointSupport.
+  ruleID: java-generic-information-camel37-00000
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.processor.interceptor.BreakpointSupport
+- category: mandatory
+  customVariables: []
+  description: 'The class org.apache.camel.impl.validator.ProcessorValidator moved
+    to org.apache.camel.processor.validator.ProcessorValidator. '
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.validator.ProcessorValidator moved to org.apache.camel.processor.validator.ProcessorValidator.
+  ruleID: java-generic-information-camel37-00001
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.validator.ProcessorValidator
+- category: mandatory
+  customVariables: []
+  description: 'The class org.apache.camel.impl.transformer.ProcessorTransformer moved
+    to org.apache.camel.processor.transformer.ProcessorTransformer. '
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.transformer.ProcessorTransformer moved
+    to org.apache.camel.processor.transformer.ProcessorTransformer.
+  ruleID: java-generic-information-camel37-00002
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.transformer.ProcessorTransformer
+- category: mandatory
+  customVariables: []
+  description: 'The class org.apache.camel.impl.transformer.DataFormatTransformer
+    moved to org.apache.camel.processor.transformer.DataFormatTransformer. '
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.transformer.DataFormatTransformer moved
+    to org.apache.camel.processor.transformer.DataFormatTransformer.
+  ruleID: java-generic-information-camel37-00003
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.transformer.DataFormatTransformer
+- category: mandatory
+  customVariables: []
+  description: 'The class org.apache.camel.impl.validator.ValidatorKey moved to org.apache.camel.impl.engine.ValidatorKey. '
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.validator.ValidatorKey moved to org.apache.camel.impl.engine.ValidatorKey.
+  ruleID: java-generic-information-camel37-00004
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.validator.ValidatorKey
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.transformer.TransformerKey moved to
+    org.apache.camel.impl.engine.TransformerKey.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.transformer.TransformerKey moved to org.apache.camel.impl.engine.TransformerKey.
+  ruleID: java-generic-information-camel37-00005
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.transformer.TransformerKey
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.DefaultExecutorServiceManager was moved
+    from camel-core-engine JAR to org.apache.camel.impl.engine.DefaultExecutorServiceManager
+    in the camel-base JAR.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.DefaultExecutorServiceManager was moved
+    from camel-core-engine JAR to org.apache.camel.impl.engine.DefaultExecutorServiceManager
+    in the camel-base JAR.
+  ruleID: java-generic-information-camel37-00006
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.DefaultExecutorServiceManager
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.processor.ConvertBodyProcessor was moved
+    to org.apache.camel.support.ConvertBodyProcessor in the camel-support JAR.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.processor.ConvertBodyProcessor was moved to
+    org.apache.camel.support.ConvertBodyProcessor in the camel-support JAR.
+  ruleID: java-generic-information-camel37-00007
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.processor.ConvertBodyProcessor
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.DefaultClaimCheckRepository
+    moved to org.apache.camel.processor.DefaultClaimCheckRepository in the camel-core-processor
+    JAR.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.DefaultClaimCheckRepository moved
+    to org.apache.camel.processor.DefaultClaimCheckRepository in the camel-core-processor
+    JAR.
+  ruleID: java-generic-information-camel37-00007-01
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.DefaultClaimCheckRepository
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.DefaultProducerCache was moved
+    to org.apache.camel.support.cache.DefaultProducerCache.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.DefaultProducerCache was moved to
+    org.apache.camel.support.cache.DefaultProducerCache.
+  ruleID: java-generic-information-camel37-00008
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.DefaultProducerCache
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.DefaultConsumerCache was moved
+    to org.apache.camel.support.cache.DefaultConsumerCache.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.DefaultConsumerCache was moved to
+    org.apache.camel.support.cache.DefaultConsumerCache.
+  ruleID: java-generic-information-camel37-00009
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.DefaultConsumerCache
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.EmptyProducerCache was moved
+    to org.apache.camel.support.cache.EmptyProducerCache.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.EmptyProducerCache was moved to
+    org.apache.camel.support.cache.EmptyProducerCache.
+  ruleID: java-generic-information-camel37-00010
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.EmptyProducerCache
+- category: mandatory
+  customVariables: []
+  description: 'The class org.apache.camel.impl.engine.ServicePool was moved to org.apache.camel.support.cache.ServicePool. '
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.ServicePool was moved to org.apache.camel.support.cache.ServicePool.
+  ruleID: java-generic-information-camel37-00011
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.ServicePool
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.ProducerServicePool was moved
+    to org.apache.camel.support.cache.ProducerServicePool.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.ProducerServicePool was moved to
+    org.apache.camel.support.cache.ProducerServicePool.
+  ruleID: java-generic-information-camel37-00012
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.ProducerServicePool
+- category: mandatory
+  customVariables: []
+  description: ' The class org.apache.camel.impl.engine.PollingConsumerServicePool
+    was moved to org.apache.camel.support.cache.PollingConsumerServicePool.'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.PollingConsumerServicePool was moved
+    to org.apache.camel.support.cache.PollingConsumerServicePool.
+  ruleID: java-generic-information-camel37-00013
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.PollingConsumerServicePool
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.engine.EventNotifierCallback was moved
+    to org.apache.camel.support.cache.EventNotifierCallback.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.engine.EventNotifierCallback was moved
+    to org.apache.camel.support.cache.EventNotifierCallback.
+  ruleID: java-generic-information-camel37-00014
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.engine.EventNotifierCallback
+- category: mandatory
+  customVariables: []
+  description: The class org.apache.camel.impl.saga.InMemorySagaService was moved
+    to org.apache.camel.saga.InMemorySagaService.
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.saga.InMemorySagaService was moved to org.apache.camel.saga.InMemorySagaService.
+  ruleID: java-generic-information-camel37-00015
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.saga.InMemorySagaService
+- category: mandatory
+  customVariables: []
+  description: ' The class org.apache.camel.impl.saga.InMemorySagaCoordinator was
+    moved to org.apache.camel.saga.InMemorySagaCoordinator.'
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.7+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Generic Information'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_7.html#_api_changes
+  message: The class org.apache.camel.impl.saga.InMemorySagaCoordinator was moved
+    to org.apache.camel.saga.InMemorySagaCoordinator.
+  ruleID: java-generic-information-camel37-00016
+  when:
+    java.referenced:
+      location: IMPORT
+      pattern: org.apache.camel.impl.saga.InMemorySagaCoordinator
diff --git a/resources/rulesets/camel3/55-xml-38-changes.windup.yaml b/resources/rulesets/camel3/55-xml-38-changes.windup.yaml
new file mode 100644
index 0000000..6b93182
--- /dev/null
+++ b/resources/rulesets/camel3/55-xml-38-changes.windup.yaml
@@ -0,0 +1,53 @@
+- category: mandatory
+  customVariables: []
+  description: camel.springboot.xml-routes configuration key has been renamed to camel.springboot.routes-include-pattern
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.8+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_8.html#_configuration_changes
+  message: '`camel.springboot.xml-routes` configuration key has been renamed to camel.springboot.routes-include-pattern.'
+  ruleID: properties-removed-camel38-00001
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.springboot.xml-routes
+- category: mandatory
+  customVariables: []
+  description: camel.springboot.xml-route-templates configuration key has been renamed
+    to camel.springboot.routes-include-pattern
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.8+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_8.html#_configuration_changes
+  message: '`camel.springboot.xml-route-templates` configuration key has been renamed
+    to camel.springboot.routes-include-pattern.'
+  ruleID: properties-removed-camel38-00002
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.springboot.xml-route-templates
+- category: mandatory
+  customVariables: []
+  description: camel.springboot.xml-rests configuration key has been renamed to camel.springboot.routes-include-pattern
+  effort: 1
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.8+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Spring Boot Starters'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_8.html#_configuration_changes
+  message: '`camel.springboot.xml-rests` configuration key has been renamed to camel.springboot.routes-include-pattern.'
+  ruleID: properties-removed-camel38-00003
+  when:
+    builtin.filecontent:
+      filePattern: .*\.properties
+      pattern: camel.springboot.xml-rests
diff --git a/resources/rulesets/camel3/56-xml-39-changes.windup.yaml b/resources/rulesets/camel3/56-xml-39-changes.windup.yaml
new file mode 100644
index 0000000..7bd71a1
--- /dev/null
+++ b/resources/rulesets/camel3/56-xml-39-changes.windup.yaml
@@ -0,0 +1,413 @@
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-azure artifact has been removed
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_azure_component
+  message: '`org.apache.camel:camel-azure` artifact has been removed in Apache Camel
+    3.9. Please use camel-azure-storage-blob or camel-azure-storage-queue.'
+  ruleID: xml-removed-camel39-00002
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-azure
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-azure
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-sdb artifact has been removed
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: Removed components'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-sdb` artifact has been removed in Apache Camel
+    3.9. The upgrade guide states that there will be no substitution for this component
+    because there is no SDK v2 client for it and the service is not listed in the
+    AWS console.'
+  ruleID: xml-removed-camel39-00004
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sdb
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sdb
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-translate artifact has been removed - please
+    use camel-aws2-translate
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-translate` artifact has been removed in Apache
+    Camel 3.9. Please use camel-aws2-translate instead.'
+  ruleID: xml-removed-camel39-00005
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-translate
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-translate
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-sqs artifact has been removed - please use
+    camel-aws2-sqs
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-sqs` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-sqs instead.'
+  ruleID: xml-removed-camel39-00006
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sqs
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sqs
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-sns artifact has been removed - please use
+    camel-aws2-sns
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-sns` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-sns instead.'
+  ruleID: xml-removed-camel39-00007
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sns
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-sns
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-msk artifact has been removed - please use
+    camel-aws2-msk
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-msk` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-msk instead.'
+  ruleID: xml-removed-camel39-00008
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-msk
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-msk
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-mq artifact has been removed - please use
+    camel-aws2-mq
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-mq` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-mq instead.'
+  ruleID: xml-removed-camel39-00009
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-mq
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-mq
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-kms artifact has been removed - please use
+    camel-aws2-kms
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-kms` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-kms instead.'
+  ruleID: xml-removed-camel39-00010
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kms
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kms
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-kinesis artifact has been removed - please
+    use camel-aws2-kinesis
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-kinesis` artifact has been removed in Apache
+    Camel 3.9. Please use camel-aws2-kinesis instead.'
+  ruleID: xml-removed-camel39-00011
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kinesis
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kinesis
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-kinesis-firehose artifact has been removed
+    - please use camel-aws2-kinesis-firehose
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-kinesis-firehose` artifact has been removed
+    in Apache Camel 3.9. Please use camel-aws2-kinesis-firehose instead.'
+  ruleID: xml-removed-camel39-00012
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kinesis-firehose
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-kinesis-firehose
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-iam artifact has been removed - please use
+    camel-aws2-iam
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-iam` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-iam instead.'
+  ruleID: xml-removed-camel39-00013
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-iam
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-iam
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-eks artifact has been removed - please use
+    camel-aws2-eks
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-eks` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-eks instead.'
+  ruleID: xml-removed-camel39-00014
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-eks
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-eks
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-ecs artifact has been removed - please use
+    camel-aws2-ecs
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-ecs` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-ecs instead.'
+  ruleID: xml-removed-camel39-00015
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ecs
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ecs
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-ecs2 artifact has been removed - please
+    use camel-aws2-ecs2
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-ecs2` artifact has been removed in Apache
+    Camel 3.9. Please use camel-aws2-ecs2 instead.'
+  ruleID: xml-removed-camel39-00016
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ecs2
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ecs2
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-ddb artifact has been removed - please use
+    camel-aws2-ddb
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-ddb` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-ddb instead.'
+  ruleID: xml-removed-camel39-00017
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ddb
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-ddb
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-cw artifact has been removed - please use
+    camel-aws2-cw
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-cw` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-cw instead.'
+  ruleID: xml-removed-camel39-00018
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-cw
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-cw
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-s3 artifact has been removed - please use
+    camel-aws2-s3
+  effort: 5
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-s3` artifact has been removed in Apache Camel
+    3.9. Please use camel-aws2-s3 instead.'
+  ruleID: xml-removed-camel39-00019
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-s3
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-s3
+- category: mandatory
+  customVariables: []
+  description: org.apache.camel:camel-aws-swf artifact has been removed - no replacement
+  effort: 7
+  labels:
+  - konveyor.io/source=camel
+  - konveyor.io/target=camel3.9+
+  - konveyor.io/target=camel
+  links:
+  - title: 'Camel 3 - Migration Guide: JAVAX.SCRIPT'
+    url: https://camel.apache.org/manual/camel-3x-upgrade-guide-3_9.html#_camel_aws_components_removed
+  message: '`org.apache.camel:camel-aws-swf` artifact has been removed in Apache Camel
+    3.9. The migration guide notes that there will not be a replacement for it.'
+  ruleID: xml-removed-camel39-00020
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-swf
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.apache.camel.camel-aws-swf
diff --git a/resources/rulesets/camel3/20-xml-dsl-changes.windup.yaml b/resources/rulesets/camel3/57-xml-dsl-changes.windup.yaml
similarity index 89%
rename from resources/rulesets/camel3/20-xml-dsl-changes.windup.yaml
rename to resources/rulesets/camel3/57-xml-dsl-changes.windup.yaml
index 6954f18..253d94b 100644
--- a/resources/rulesets/camel3/20-xml-dsl-changes.windup.yaml
+++ b/resources/rulesets/camel3/57-xml-dsl-changes.windup.yaml
@@ -10,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`\n\n "
+  message: '`zip` and `gzip` dataformats were renamed to `zipdeflater` and `gzipdeflater`'
   ruleID: xml-dsl-changes-00001
   when:
     or:
@@ -34,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`\n\n "
+  message: '`custom` load balancer was renamed to `customLoadBalancer`'
   ruleID: xml-dsl-changes-00002
   when:
     or:
@@ -58,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`\n\n "
+  message: '`zipFile` data format was renamed to `zipfile`'
   ruleID: xml-dsl-changes-00003
   when:
     or:
@@ -90,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`\n\n "
+  message: '`keyOrTrustStoreParametersId` attribute was renamed to `keyOrTrustStoreParametersRef`'
   ruleID: xml-dsl-changes-00004
   when:
     or:
@@ -114,8 +114,9 @@
   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`\n
-    instead of `hystrix'.\n "
+  message: |-
+    Hystrix circuit breaker has been generalized as circuit breaker. Use `circuitBreaker`
+     instead of `hystrix'.
   ruleID: xml-dsl-changes-00005
   when:
     or:
@@ -139,8 +140,9 @@
   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\n setting correlation size/timeout were renamed.\n "
+  message: |-
+    Use `completionSizeExpression` instead of `completionSize`. Expressions (not the attributes) for
+     setting correlation size/timeout were renamed.
   ruleID: xml-dsl-changes-00006
   when:
     or:
@@ -164,8 +166,10 @@
   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\n attributes) for\n setting correlation size/timeout were renamed.\n "
+  message: |-
+    Use `completionTimeoutExpression` instead of `completionTimeout`. Expressions (not the
+     attributes) for
+     setting correlation size/timeout were renamed.
   ruleID: xml-dsl-changes-00007
   when:
     or:
diff --git a/resources/rulesets/camel3/21-xml-java-versions.windup.yaml b/resources/rulesets/camel3/58-xml-java-versions.windup.yaml
similarity index 62%
rename from resources/rulesets/camel3/21-xml-java-versions.windup.yaml
rename to resources/rulesets/camel3/58-xml-java-versions.windup.yaml
index fc700cf..0ad0db2 100644
--- a/resources/rulesets/camel3/21-xml-java-versions.windup.yaml
+++ b/resources/rulesets/camel3/58-xml-java-versions.windup.yaml
@@ -10,12 +10,18 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  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 "
+  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>
+     ```
   ruleID: xml-java-versions-00001
   when:
     or:
@@ -42,12 +48,18 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  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 "
+  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>
+     ```
   ruleID: xml-java-versions-00002
   when:
     or:
@@ -74,12 +86,18 @@
   links:
   - title: 'Camel 3 - Migration Guide: Java Versions'
     url: https://camel.apache.org/manual/latest/camel-3-migration-guide.html#_java_versions
-  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 "
+  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>
+     ```
   ruleID: xml-java-versions-00003
   when:
     or:
diff --git a/resources/rulesets/camel3/22-xml-moved-components.windup.yaml b/resources/rulesets/camel3/59-xml-moved-components.windup.yaml
similarity index 84%
rename from resources/rulesets/camel3/22-xml-moved-components.windup.yaml
rename to resources/rulesets/camel3/59-xml-moved-components.windup.yaml
index d275d06..57e3cac 100644
--- a/resources/rulesets/camel3/22-xml-moved-components.windup.yaml
+++ b/resources/rulesets/camel3/59-xml-moved-components.windup.yaml
@@ -8,10 +8,9 @@
   - 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`.\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.\n "
+  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 a transitive dependency of `camel-core` but it could be used also separately to trim the application size.
   ruleID: xml-moved-components-00012
   when:
     as: javaClass
@@ -31,10 +30,9 @@
   - 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.\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.\n "
+  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 dependency of `camel-core` but it could be used also separately to trim the application size.
   ruleID: xml-moved-components-00013
   when:
     as: javaClass
@@ -51,9 +49,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`.\n `org.apache.camel:camel-main`
-    has to be added as a dependency to your project pom.xml file\n "
+  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
   ruleID: xml-moved-components-00014
   when:
     as: javaClass
@@ -70,9 +68,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.\n "
+    as a dependency.
   ruleID: xml-moved-components-00015
   when:
     as: dependencies-block
diff --git a/resources/rulesets/camel3/23-xml-removed-components.windup.yaml b/resources/rulesets/camel3/60-xml-removed-components.windup.yaml
similarity index 100%
rename from resources/rulesets/camel3/23-xml-removed-components.windup.yaml
rename to resources/rulesets/camel3/60-xml-removed-components.windup.yaml
diff --git a/resources/rulesets/camel3/24-xml-renamed-components.windup.yaml b/resources/rulesets/camel3/61-xml-renamed-components.windup.yaml
similarity index 100%
rename from resources/rulesets/camel3/24-xml-renamed-components.windup.yaml
rename to resources/rulesets/camel3/61-xml-renamed-components.windup.yaml
diff --git a/resources/rulesets/camel4/01-xml-40-changes.windup.yaml b/resources/rulesets/camel4/62-xml-40-changes.windup.yaml
similarity index 100%
rename from resources/rulesets/camel4/01-xml-40-changes.windup.yaml
rename to resources/rulesets/camel4/62-xml-40-changes.windup.yaml
diff --git a/resources/rulesets/camel4/02-xml-41-changes.windup.yaml b/resources/rulesets/camel4/63-xml-41-changes.windup.yaml
similarity index 95%
rename from resources/rulesets/camel4/02-xml-41-changes.windup.yaml
rename to resources/rulesets/camel4/63-xml-41-changes.windup.yaml
index 9a6a470..c303558 100644
--- a/resources/rulesets/camel4/02-xml-41-changes.windup.yaml
+++ b/resources/rulesets/camel4/63-xml-41-changes.windup.yaml
@@ -90,7 +90,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineOperation.*
+        pattern: setHeader\("CamelAwsStateMachineOperation.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -117,7 +117,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachinesMaxResults.*
+        pattern: setHeader\("CamelAwsStateMachinesMaxResults.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -145,7 +145,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStepFunctionsStateMachineActivityName.*
+        pattern: setHeader\("CamelAwsStepFunctionsStateMachineActivityName.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -173,7 +173,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStepFunctionsStateMachineActivityArn.*
+        pattern: setHeader\("CamelAwsStepFunctionsStateMachineActivityArn.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -201,7 +201,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineActivitiesMaxResults.*
+        pattern: setHeader\("CamelAwsStateMachineActivitiesMaxResults.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -229,7 +229,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionArn.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionArn.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -257,7 +257,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionName.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionName.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -285,7 +285,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionInput.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionInput.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -313,7 +313,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionTraceHeader.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionTraceHeader.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -341,7 +341,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionHistoryMaxResults.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionHistoryMaxResults.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -369,7 +369,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionHistoryIncludeExecutionData.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionHistoryIncludeExecutionData.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -397,7 +397,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionHistoryReverseOrder.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionHistoryReverseOrder.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
@@ -425,7 +425,7 @@
     or:
     - builtin.filecontent:
         filePattern: .*\.java
-        pattern: setHeader("CamelAwsStateMachineExecutionMaxResults.*
+        pattern: setHeader\("CamelAwsStateMachineExecutionMaxResults.*
     - builtin.xml:
         namespaces:
           c: http://camel.apache.org/schema/blueprint
diff --git a/resources/rulesets/cloud-readiness/04-java-rpc.windup.yaml b/resources/rulesets/cloud-readiness/04-java-rpc.windup.yaml
deleted file mode 100644
index 2645a06..0000000
--- a/resources/rulesets/cloud-readiness/04-java-rpc.windup.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- category: optional
-  customVariables: []
-  description: Java API for XML-based RPC (JAX-RPC)
-  effort: 5
-  labels:
-  - konveyor.io/source=java
-  - konveyor.io/source=rpc
-  - konveyor.io/target=cloud-readiness
-  - rpc
-  links:
-  - title: JAX-RPC not supported in JBoss EAP 7
-    url: https://access.redhat.com/solutions/4030521
-  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:
-    - as: default
-      java.referenced:
-        location: PACKAGE
-        pattern: javax.xml.rpc*
-    - java.referenced:
-        location: PACKAGE
-        pattern: org.apache.xmlrpc*
-    - java.referenced:
-        location: PACKAGE
-        pattern: redstone.xmlrpc*
diff --git a/resources/rulesets/cloud-readiness/07-local-storage.windup.yaml b/resources/rulesets/cloud-readiness/07-local-storage.windup.yaml
deleted file mode 100644
index 98ffec7..0000000
--- a/resources/rulesets/cloud-readiness/07-local-storage.windup.yaml
+++ /dev/null
@@ -1,178 +0,0 @@
-- 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://' 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*
-- category: mandatory
-  customVariables: []
-  description: Apache Commons I/O
-  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-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/resources/rulesets/cloud-readiness/09-logging.windup.yaml b/resources/rulesets/cloud-readiness/09-logging.windup.yaml
deleted file mode 100644
index d612e5e..0000000
--- a/resources/rulesets/cloud-readiness/09-logging.windup.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/10-mail.windup.yaml b/resources/rulesets/cloud-readiness/10-mail.windup.yaml
deleted file mode 100644
index ca0be6e..0000000
--- a/resources/rulesets/cloud-readiness/10-mail.windup.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/11-session.windup.yaml b/resources/rulesets/cloud-readiness/11-session.windup.yaml
deleted file mode 100644
index 26f8401..0000000
--- a/resources/rulesets/cloud-readiness/11-session.windup.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/156-java-rmi.windup.yaml b/resources/rulesets/cloud-readiness/156-java-rmi.windup.yaml
deleted file mode 100644
index bbfc294..0000000
--- a/resources/rulesets/cloud-readiness/156-java-rmi.windup.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-- 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
-  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/resources/rulesets/cloud-readiness/158-jca.windup.yaml b/resources/rulesets/cloud-readiness/158-jca.windup.yaml
deleted file mode 100644
index d6cfdd0..0000000
--- a/resources/rulesets/cloud-readiness/158-jca.windup.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/159-jni-native-code.windup.yaml b/resources/rulesets/cloud-readiness/159-jni-native-code.windup.yaml
deleted file mode 100644
index 3a58830..0000000
--- a/resources/rulesets/cloud-readiness/159-jni-native-code.windup.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/160-local-storage.windup.yaml b/resources/rulesets/cloud-readiness/160-local-storage.windup.yaml
deleted file mode 100644
index e256c23..0000000
--- a/resources/rulesets/cloud-readiness/160-local-storage.windup.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-- 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://' 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/resources/rulesets/cloud-readiness/164-socket-communication.windup.yaml b/resources/rulesets/cloud-readiness/164-socket-communication.windup.yaml
deleted file mode 100644
index 583f7f9..0000000
--- a/resources/rulesets/cloud-readiness/164-socket-communication.windup.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- 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/resources/rulesets/cloud-readiness/01-embedded-cache-libraries.windup.yaml b/resources/rulesets/cloud-readiness/64-embedded-cache-libraries.windup.yaml
similarity index 100%
rename from resources/rulesets/cloud-readiness/01-embedded-cache-libraries.windup.yaml
rename to resources/rulesets/cloud-readiness/64-embedded-cache-libraries.windup.yaml
diff --git a/resources/rulesets/cloud-readiness/02-java-corba.windup.yaml b/resources/rulesets/cloud-readiness/65-java-corba.windup.yaml
similarity index 82%
rename from resources/rulesets/cloud-readiness/02-java-corba.windup.yaml
rename to resources/rulesets/cloud-readiness/65-java-corba.windup.yaml
index bc1de65..4bbcb12 100644
--- a/resources/rulesets/cloud-readiness/02-java-corba.windup.yaml
+++ b/resources/rulesets/cloud-readiness/65-java-corba.windup.yaml
@@ -7,9 +7,9 @@
   - konveyor.io/target=cloud-readiness
   - corba
   links: []
-  message: "\n Common Object Request Broker Architecture (CORBA) found in the application.
+  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.\n "
+    modern technology.
   ruleID: java-corba-00000
   when:
     or:
diff --git a/resources/rulesets/cloud-readiness/03-java-rmi.windup.yaml b/resources/rulesets/cloud-readiness/66-java-rmi.windup.yaml
similarity index 63%
rename from resources/rulesets/cloud-readiness/03-java-rmi.windup.yaml
rename to resources/rulesets/cloud-readiness/66-java-rmi.windup.yaml
index bbfc294..bfd0763 100644
--- a/resources/rulesets/cloud-readiness/03-java-rmi.windup.yaml
+++ b/resources/rulesets/cloud-readiness/66-java-rmi.windup.yaml
@@ -11,12 +11,17 @@
   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 "
+  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
diff --git a/resources/rulesets/cloud-readiness/157-java-rpc.windup.yaml b/resources/rulesets/cloud-readiness/67-java-rpc.windup.yaml
similarity index 69%
rename from resources/rulesets/cloud-readiness/157-java-rpc.windup.yaml
rename to resources/rulesets/cloud-readiness/67-java-rpc.windup.yaml
index 2645a06..d32d75a 100644
--- a/resources/rulesets/cloud-readiness/157-java-rpc.windup.yaml
+++ b/resources/rulesets/cloud-readiness/67-java-rpc.windup.yaml
@@ -10,10 +10,10 @@
   links:
   - title: JAX-RPC not supported in JBoss EAP 7
     url: https://access.redhat.com/solutions/4030521
-  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 "
+  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.
   ruleID: java-rpc-00000
   when:
     or:
diff --git a/resources/rulesets/cloud-readiness/05-jca.windup.yaml b/resources/rulesets/cloud-readiness/68-jca.windup.yaml
similarity index 56%
rename from resources/rulesets/cloud-readiness/05-jca.windup.yaml
rename to resources/rulesets/cloud-readiness/68-jca.windup.yaml
index d6cfdd0..4552a3c 100644
--- a/resources/rulesets/cloud-readiness/05-jca.windup.yaml
+++ b/resources/rulesets/cloud-readiness/68-jca.windup.yaml
@@ -12,12 +12,12 @@
     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 "
+  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:
diff --git a/resources/rulesets/cloud-readiness/06-jni-native-code.windup.yaml b/resources/rulesets/cloud-readiness/69-jni-native-code.windup.yaml
similarity index 76%
rename from resources/rulesets/cloud-readiness/06-jni-native-code.windup.yaml
rename to resources/rulesets/cloud-readiness/69-jni-native-code.windup.yaml
index d65a4dc..c6b1f4a 100644
--- a/resources/rulesets/cloud-readiness/06-jni-native-code.windup.yaml
+++ b/resources/rulesets/cloud-readiness/69-jni-native-code.windup.yaml
@@ -13,12 +13,15 @@
   - 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 "
+  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:
@@ -61,11 +64,14 @@
   - konveyor.io/source
   - jni
   links: []
-  message: "\n Native Processes might not run in a cloud or container environment.\n\n
-    Recommendations\n\n * Review the purpose of the native process in your application.\n
-    * Check whether the native process is compatible with a cloud environment.\n *
-    Replace, remove, or rewrite the native process or application using a cloud-compatible
-    equivalent.\n "
+  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:
diff --git a/resources/rulesets/cloud-readiness/70-local-storage.windup.yaml b/resources/rulesets/cloud-readiness/70-local-storage.windup.yaml
new file mode 100644
index 0000000..ff5068d
--- /dev/null
+++ b/resources/rulesets/cloud-readiness/70-local-storage.windup.yaml
@@ -0,0 +1,231 @@
+- 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: |-
+    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
+  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 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: |-
+    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-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: |-
+    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
+  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
+  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/resources/rulesets/cloud-readiness/08-localhost.windup.yaml b/resources/rulesets/cloud-readiness/71-localhost.windup.yaml
similarity index 100%
rename from resources/rulesets/cloud-readiness/08-localhost.windup.yaml
rename to resources/rulesets/cloud-readiness/71-localhost.windup.yaml
diff --git a/resources/rulesets/cloud-readiness/161-logging.windup.yaml b/resources/rulesets/cloud-readiness/72-logging.windup.yaml
similarity index 57%
rename from resources/rulesets/cloud-readiness/161-logging.windup.yaml
rename to resources/rulesets/cloud-readiness/72-logging.windup.yaml
index d612e5e..f2e0619 100644
--- a/resources/rulesets/cloud-readiness/161-logging.windup.yaml
+++ b/resources/rulesets/cloud-readiness/72-logging.windup.yaml
@@ -8,10 +8,14 @@
   - 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 "
+  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
@@ -22,7 +26,7 @@
         pattern: ((Daily)?Rolling)?FileAppender
     - java.referenced:
         location: IMPORT
-        pattern: org.apache*log4j*FileAppender*
+        pattern: org.apache.*log4j.*FileAppender*
     - java.referenced:
         location: IMPORT
         pattern: java.util.logging.FileHandler*
@@ -42,15 +46,18 @@
   - 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 "
+  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
+      location: IMPORT
       pattern: java.util.logging.SocketHandler*
diff --git a/resources/rulesets/cloud-readiness/162-mail.windup.yaml b/resources/rulesets/cloud-readiness/73-mail.windup.yaml
similarity index 62%
rename from resources/rulesets/cloud-readiness/162-mail.windup.yaml
rename to resources/rulesets/cloud-readiness/73-mail.windup.yaml
index ca0be6e..51d3a8e 100644
--- a/resources/rulesets/cloud-readiness/162-mail.windup.yaml
+++ b/resources/rulesets/cloud-readiness/73-mail.windup.yaml
@@ -14,13 +14,14 @@
     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 "
+  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:
diff --git a/resources/rulesets/cloud-readiness/163-session.windup.yaml b/resources/rulesets/cloud-readiness/74-session.windup.yaml
similarity index 64%
rename from resources/rulesets/cloud-readiness/163-session.windup.yaml
rename to resources/rulesets/cloud-readiness/74-session.windup.yaml
index 26f8401..925ab1f 100644
--- a/resources/rulesets/cloud-readiness/163-session.windup.yaml
+++ b/resources/rulesets/cloud-readiness/74-session.windup.yaml
@@ -20,17 +20,20 @@
     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 "
+  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:
@@ -55,12 +58,16 @@
     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 "
+  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:
diff --git a/resources/rulesets/cloud-readiness/12-socket-communication.windup.yaml b/resources/rulesets/cloud-readiness/75-socket-communication.windup.yaml
similarity index 55%
rename from resources/rulesets/cloud-readiness/12-socket-communication.windup.yaml
rename to resources/rulesets/cloud-readiness/75-socket-communication.windup.yaml
index 583f7f9..650cf64 100644
--- a/resources/rulesets/cloud-readiness/12-socket-communication.windup.yaml
+++ b/resources/rulesets/cloud-readiness/75-socket-communication.windup.yaml
@@ -8,25 +8,26 @@
   - 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 "
+  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
+        location: IMPORT
         pattern: java.net.(Socket|MulticastSocket|DatagramSocket|InetSocketAddress)*
     - java.referenced:
-        location: PACKAGE
+        location: IMPORT
         pattern: java.net.ServerSocket*
     - java.referenced:
-        location: PACKAGE
+        location: IMPORT
         pattern: java.nio.channels.AsynchronousServerSocketChannel*
     - java.referenced:
-        location: PACKAGE
+        location: IMPORT
         pattern: java.nio.channels.ServerSocketChannel*
 - category: optional
   customVariables:
@@ -41,13 +42,14 @@
   - 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 "
+  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
+      location: IMPORT
       pattern: java.nio.channels.(NetworkChannel|MulticastChannel|DatagramChannel|AsynchronousSocketChannel|SocketChannel)*
diff --git a/resources/rulesets/eap6/51-weblogic-jms.windup.yaml b/resources/rulesets/eap6/51-weblogic-jms.windup.yaml
deleted file mode 100644
index 9e19b9c..0000000
--- a/resources/rulesets/eap6/51-weblogic-jms.windup.yaml
+++ /dev/null
@@ -1,185 +0,0 @@
-- customVariables: []
-  description: Oracle JMS
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Oracle 9i JMS Documentation
-    url: http://docs.oracle.com/cd/B10501_01/appdev.920/a96609/toc.htm
-  - title: Java EE JMS Documentation
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  ruleID: weblogic-jms-00000
-  tag:
-  - jms
-  - weblogic
-  - Oracle JMS
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: oracle.jms*
-- category: mandatory
-  customVariables: []
-  description: Oracle JMS Session
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Session
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncen
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Queue Browser
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncey
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Message Producer
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnceo
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Message Consumer
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnceo
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Connections
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncem
-  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:
-      pattern: oracle.jms.AQjmsConnection
-- category: mandatory
-  customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: oracle.jms.AQjms(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: Oracle JMS messages reference should be replaced with the Java EE standard API
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Message API
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bnces
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Destinations
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncel
-  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:
-      pattern: oracle.jms.AQjmsDestination
-- category: mandatory
-  customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: oracle.jms.AQjms(?P<type>(Topic|Queue)?)?ConnectionFactory
-  description: Oracle JMS Connection Factory
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - jms
-  - weblogic
-  links:
-  - title: Java EE JMS Connection factories
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html#bncek
-  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:
-      pattern: oracle.jms.AQjms(Topic|Queue)?ConnectionFactory
diff --git a/resources/rulesets/eap6/52-weblogic-services.windup.yaml b/resources/rulesets/eap6/52-weblogic-services.windup.yaml
deleted file mode 100644
index 539fc59..0000000
--- a/resources/rulesets/eap6/52-weblogic-services.windup.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: WebLogic Startup Service
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - startup
-  links:
-  - title: EJB3.1 Singleton Bean
-    url: http://docs.oracle.com/javaee/6/api/javax/ejb/Singleton.html
-  - title: EJB3.1 Startup Bean
-    url: http://docs.oracle.com/javaee/6/api/javax/ejb/Startup.html
-  message: Replace this class with a class using the EJB 3.1 `@Singleton` and `@Startup`
-    annotations.
-  ruleID: weblogic-services-01000
-  when:
-    java.referenced:
-      location: IMPLEMENTS_TYPE
-      pattern: weblogic.common.T3StartupDef
-- category: mandatory
-  customVariables: []
-  description: WebLogic T3ServicesDef usage
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - webservice
-  links:
-  - title: Java EE Tutorial - @Singleton Session Bean
-    url: http://docs.oracle.com/javaee/6/tutorial/doc/gipvi.html
-  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:
-      pattern: weblogic.common.T3ServicesDef
-- category: mandatory
-  customVariables:
-  - name: logger
-    nameOfCaptureGroup: logger
-    pattern: weblogic.(?P<logger>(i18n.)?logging.[^N])?.*
-  description: WebLogic proprietary logging classes
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - logging
-  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: "\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:
-      location: PACKAGE
-      pattern: weblogic.(i18n.)?logging.[^N]*
diff --git a/resources/rulesets/eap6/53-weblogic-webapp.windup.yaml b/resources/rulesets/eap6/53-weblogic-webapp.windup.yaml
deleted file mode 100644
index 54dfd5c..0000000
--- a/resources/rulesets/eap6/53-weblogic-webapp.windup.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: WebLogic Virtual directory mapping
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - file-system
-  links:
-  - title: Detailed description of how to migrate virtual directories.
-    url: https://access.redhat.com/articles/1332613
-  message: Virtual directories supported in WebLogic are not supported in JBoss EAP.
-  ruleID: weblogic-webapp-01000
-  when:
-    builtin.xml:
-      filepaths:
-      - weblogic.xml
-      namespaces:
-        wl: http://xmlns.oracle.com/weblogic/weblogic-web-app
-      xpath: //wl:virtual-directory-mapping
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary servlet annotations
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - servlet
-  links:
-  - title: WebLogic proprietary servlet annotations
-    url: https://access.redhat.com/articles/1249423
-  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:
-      location: ANNOTATION
-      pattern: weblogic.servlet.annotation.WLServlet
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary servlet annotations
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - servlet
-  links:
-  - title: WebLogic proprietary servlet annotations
-    url: https://access.redhat.com/articles/1249423
-  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:
-      location: ANNOTATION
-      pattern: weblogic.servlet.annotation.WLInitParam
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary servlet annotations
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - servlet
-  links:
-  - title: WebLogic proprietary servlet annotations
-    url: https://access.redhat.com/articles/1249423
-  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:
-      location: ANNOTATION
-      pattern: weblogic.servlet.annotation.WLFilter
-- category: mandatory
-  customVariables: []
-  description: WebLogic ApplicationLifecycleEvent
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - lifecycle
-  links:
-  - title: Migrate WebLogic ApplicationLifecycleEvent to standard EJB with JBoss EAP
-    url: https://access.redhat.com/articles/1326703
-  - title: Java EE ServletContextEvent JavaDoc
-    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: "\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.\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.\n \n "
-  ruleID: weblogic-webapp-05000
-  when:
-    or:
-    - java.referenced:
-        location: IMPLEMENTS_TYPE
-        pattern: weblogic.application.ApplicationLifecycleEvent
-    - java.referenced:
-        location: INHERITANCE
-        pattern: weblogic.application.ApplicationLifecycleEvent
-    - java.referenced:
-        location: IMPORT
-        pattern: weblogic.application.ApplicationLifecycleEvent
-- category: mandatory
-  customVariables: []
-  description: WebLogic ApplicationLifecycleListener
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - lifecycle
-  links:
-  - title: Migrate Oracle WebLogic Server ApplicationLifecycleListener Code to Red
-      Hat JBoss EAP 6+
-    url: https://access.redhat.com/articles/1326703
-  - title: Java EE ServletContextEvent JavaDoc
-    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: "\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.\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.\n \n "
-  ruleID: weblogic-webapp-06000
-  when:
-    or:
-    - java.referenced:
-        location: IMPLEMENTS_TYPE
-        pattern: weblogic.application.ApplicationLifecycleListener
-    - java.referenced:
-        location: INHERITANCE
-        pattern: weblogic.application.ApplicationLifecycleListener
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary security API
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - security
-  links: []
-  message: The usage of the WebLogic proprietary security API should be replaced by
-    standard Java EE mechanisms or the ones provided by JBoss EAP.
-  ruleID: weblogic-webapp-07000
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: weblogic.security*
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary security reference to weblogic.security.Security
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - security
-  links:
-  - title: Security Context - JBoss EAP 6
-    url: https://access.redhat.com/webassets/avalon/d/JBoss_Enterprise_Application_Platform-6-API_Documentation-en-US/files/javadoc/org/jboss/security/SecurityContextAssociation.html
-  - title: Security context retrieval in POJOs
-    url: https://access.redhat.com/solutions/55114
-  message: 'Migrate to JBoss EAP 6: `org.jboss.security.SecurityContextAssociation`.'
-  ruleID: weblogic-webapp-08000
-  when:
-    java.referenced:
-      pattern: weblogic.security.Security
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary ServletAuthentication annotation
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - web-app
-  - weblogic
-  - security
-  links:
-  - title: Migrate Oracle WebLogic programmatic login to JBoss EAP 6
-    url: https://access.redhat.com/articles/1329213
-  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:
-      pattern: weblogic.servlet.security.ServletAuthentication
diff --git a/resources/rulesets/eap6/54-weblogic-webservices.windup.yaml b/resources/rulesets/eap6/54-weblogic-webservices.windup.yaml
deleted file mode 100644
index 77c9319..0000000
--- a/resources/rulesets/eap6/54-weblogic-webservices.windup.yaml
+++ /dev/null
@@ -1,170 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary web service implementation class
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  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: "\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:
-      location: INHERITANCE
-      pattern: weblogic.wsee.jaxrpc.ServiceImpl
-- category: mandatory
-  customVariables: []
-  description: WebLogic asynchronous web service client
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  - client
-  links:
-  - title: WebLogic Asynchronous Execution Documentation
-    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: "\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
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  - security
-  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: "\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:
-      location: METHOD_CALL
-      pattern: weblogic.wsee.connection.transport.http.HttpTransportInfo.setUsername*
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary web services API - weblogic.wsee.context.WebServiceContext
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  - context
-  links:
-  - title: javax.xml.WebServiceContext Documentation
-    url: http://docs.oracle.com/javaee/6/api/javax/xml/ws/WebServiceContext.html
-  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.\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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  - context
-  links: []
-  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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  - client
-  links:
-  - title: Oracle ClientGen Ant Task Reference
-    url: https://docs.oracle.com/cd/E13222_01/wls/docs90/webserv/anttasks.html#1039270
-  - title: EAP 6 development guide - Develop a JAX-WS client
-    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
-  - title: JAX-WS - wsgen
-    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: "\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:
-    - java.referenced:
-        location: PACKAGE
-        pattern: weblogic.wsee.tools.clientgen*
-    - java.referenced:
-        location: PACKAGE
-        pattern: weblogic.webservice*
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary web service annotation @Transactional
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - webservice
-  - weblogic
-  links:
-  - title: WebLogic-specific Annotations - Transactional
-    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: "\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:
-      location: ANNOTATION
-      pattern: weblogic.jws.Transactional
diff --git a/resources/rulesets/eap6/55-weblogic-xml-descriptors.windup.yaml b/resources/rulesets/eap6/55-weblogic-xml-descriptors.windup.yaml
deleted file mode 100644
index 58b1a05..0000000
--- a/resources/rulesets/eap6/55-weblogic-xml-descriptors.windup.yaml
+++ /dev/null
@@ -1,406 +0,0 @@
-- customVariables: []
-  description: WebLogic EAR application descriptor (weblogic-application.xml)
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links:
-  - title: 'Migrate Oracle WebLogic configuration files to JBoss EAP 6 or 7 '
-    url: https://access.redhat.com/articles/1326803
-  - title: Migrate Oracle WebLogic server descriptors (weblogic-application.xml) to
-      JBoss EAP 6 or 7
-    url: https://access.redhat.com/articles/1328043
-  ruleID: weblogic-xml-descriptor-01000
-  tag:
-  - webservice
-  - weblogic
-  - WebLogic EAR application descriptor (weblogic-application.xml)
-  when:
-    builtin.xml:
-      namespaces: {}
-      xpath: /*[local-name()='weblogic-application']
-- customVariables: []
-  description: WebLogic Entity EJB configuration
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links:
-  - title: Migrate Oracle WebLogic Server Configuration Files and Descriptors to JBoss
-      EAP 6 or 7
-    url: https://access.redhat.com/articles/1326803
-  message: WebLogic Entity EJB Configuration are used for RDBMS based persistence
-    services.
-  ruleID: weblogic-xml-descriptor-02000
-  tag:
-  - database
-  - ejb
-  - configuration
-  - weblogic
-  - WebLogic Entity EJB configuration
-  when:
-    builtin.xml:
-      namespaces: {}
-      xpath: /*[local-name()='weblogic-rdbms-jar']
-- category: mandatory
-  customVariables: []
-  description: WebLogic EJB XML (weblogic-ejb-jar.xml) delay-updates-until-end-of-tx
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  - performance
-  - ejb
-  - database
-  links:
-  - 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: "\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:
-      namespaces: {}
-      xpath: //*[local-name()='delay-updates-until-end-of-tx']/text()
-- category: mandatory
-  customVariables: []
-  description: WebLogic EJB XML (weblogic-ejb-jar.xml)
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  - ejb
-  - configuration
-  links:
-  - title: Migrate the weblogic-ejb-jar.xml
-    url: https://access.redhat.com/articles/1326823
-  message: 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.
-  ruleID: weblogic-xml-descriptor-04000
-  when:
-    or:
-    - builtin.xml:
-        namespaces: {}
-        xpath: /weblogic-ejb-jar
-    - builtin.xml:
-        namespaces:
-          wl9: http://www.bea.com/ns/weblogic/90
-        xpath: /wl9:weblogic-ejb-jar
-    - builtin.xml:
-        namespaces:
-          wl10: http://www.bea.com/ns/weblogic/10.0
-        xpath: /wl10:weblogic-ejb-jar
-    - builtin.xml:
-        namespaces:
-          wls: http://xmlns.oracle.com/weblogic/weblogic-ejb-jar
-        xpath: /wls:weblogic-ejb-jar
-- category: mandatory
-  customVariables: []
-  description: WebLogic Stateful Session Bean (SFSB)
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  - ejb
-  - configuration
-  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)`
-  ruleID: weblogic-xml-descriptor-06001
-  when:
-    builtin.xml:
-      namespaces:
-        wl9: http://www.bea.com/ns/weblogic/90
-      xpath: //*[local-name() = 'allow-concurrent-calls' and translate(text(),'TRUE','true')
-        = 'true' ]
-- customVariables: []
-  description: WebLogic SOAP client mapping
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-07000
-  tag:
-  - soap
-  - weblogic
-  - WebLogic SOAP client mapping
-  when:
-    builtin.xml:
-      namespaces:
-        wl10: http://www.bea.com/ns/weblogic/weblogic-wsee-standaloneclient
-      xpath: /weblogic-wsee-standaloneclient |/wl10:weblogic-wsee-standaloneclient
-- customVariables: []
-  description: WebLogic Java to WSDL Mapping
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-08000
-  tag:
-  - wsdl
-  - weblogic
-  - WebLogic Java to WSDL Mapping
-  when:
-    builtin.xml:
-      namespaces:
-        jee: http://java.sun.com/xml/ns/j2ee
-      xpath: /java-wsdl-mapping
-- customVariables: []
-  description: WebLogic web service policy
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-09000
-  tag:
-  - webservice
-  - weblogic
-  - WebLogic web service policy
-  when:
-    builtin.xml:
-      namespaces:
-        wl: http://www.bea.com/ns/weblogic/webservice-policy-ref
-        wl9: http://www.bea.com/ns/weblogic/90
-      xpath: /webservice-policy-ref | /wl:webservice-policy-ref | /wl9:webservice-policy-ref
-- category: optional
-  customVariables: []
-  description: Webservice Type
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  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.\n "
-  ruleID: weblogic-xml-descriptor-10000
-  when:
-    and:
-    - as: webservices
-      builtin.xml:
-        namespaces:
-          wl: http://www.bea.com/ns/weblogic/weblogic-webservices
-          wl9: http://www.bea.com/ns/weblogic/90
-        xpath: /weblogic-webservices | /wl:weblogic-webservices | /wl9:weblogic-webservices
-    - as: webservices-types
-      builtin.xml:
-        namespaces:
-          wl: http://www.bea.com/ns/weblogic/weblogic-webservices
-          wl9: http://www.bea.com/ns/weblogic/90
-        xpath: //webservice-type | //wl:webservice-type | //wl9:webservice-type
-      from: webservices
-- customVariables: []
-  description: WebLogic JMS descriptor
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links:
-  - title: EAP 6 JMS Server configuration
-    url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html-single/Administration_and_Configuration_Guide/index.html#sect-Configuration1
-  ruleID: weblogic-xml-descriptor-11000
-  tag:
-  - jms
-  - configuration
-  - weblogic
-  - WebLogic JMS descriptor
-  when:
-    builtin.xml:
-      namespaces: {}
-      xpath: /*[local-name()='weblogic-jms']
-- customVariables: []
-  description: WebLogic web application descriptor (weblogic.xml)
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links:
-  - title: Migrate Oracle WebLogic configuration files to JBoss EAP
-    url: https://access.redhat.com/articles/1326803
-  - title: Map weblogic.xml configurations to JBoss EAP
-    url: https://access.redhat.com/articles/1327803
-  - title: Administration and Configuration Guide for JBoss Enterprise Application
-      Platform 6
-    url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/6.4/html-single/administration_and_configuration_guide/index
-  ruleID: weblogic-xml-descriptor-12000
-  tag:
-  - web-app
-  - weblogic
-  - WebLogic web application descriptor (weblogic.xml)
-  when:
-    builtin.xml:
-      namespaces:
-        bea: http://www.bea.com/ns/weblogic/90
-        wls: http://www.bea.com/ns/weblogic/weblogic-web-app
-        wlso: http://xmlns.oracle.com/weblogic/weblogic-web-app
-      xpath: /bea:weblogic-web-app | /wlso:weblogic-web-app | /wls:weblogic-web-app
-        | /weblogic-web-app
-- customVariables: []
-  description: WebLogic web service type mapping
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-14000
-  tag:
-  - webservice
-  - weblogic
-  - WebLogic web service type mapping
-  when:
-    builtin.xml:
-      namespaces:
-        wsdd: http://www.bea.com/servers/wls70
-      xpath: /wsdd:type-mapping
-- customVariables: []
-  description: WebLogic services configuration
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  message: WebLogic specific configuration of web services runtime parameters
-  ruleID: weblogic-xml-descriptor-15000
-  tag:
-  - webservice
-  - configuration
-  - weblogic
-  - WebLogic services configuration
-  when:
-    builtin.xml:
-      namespaces:
-        wlw: http://www.bea.com/2003/03/wlw/config/
-      xpath: /wlw:wlw-config
-- customVariables: []
-  description: WebLogic specific webservice ant tasks
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-16000
-  tag:
-  - webservice
-  - weblogic
-  - WebLogic specific webservice ant tasks
-  when:
-    as: default
-    builtin.xml:
-      namespaces: {}
-      xpath: /project/taskdef[@classname='weblogic.ant.taskdefs.webservices.servicegen.ServiceGenTask']
-        | /project/taskdef[@classname='weblogic.ant.taskdefs.webservices.javaschema.JavaSchema']
-        | /project/taskdef[@classname='weblogic.ant.taskdefs.webservices.autotype.JavaSource2DD']
-        | /project/taskdef[@classname='weblogic.ant.taskdefs.webservices.clientgen.ClientGenTask']
-- customVariables: []
-  description: WebLogic annotation manifest
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links: []
-  ruleID: weblogic-xml-descriptor-17000
-  tag:
-  - configuration
-  - weblogic
-  - WebLogic annotation manifest
-  when:
-    builtin.xml:
-      namespaces:
-        wl: http://www.bea.com/2004/03/wlw/external-config/
-      xpath: /wl:annotation-manifest | /annotation-manifest
-- customVariables: []
-  description: WebLogic plan.xml deployment descriptor
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  links:
-  - title: Replace the WebLogic plan.xml deployment descriptor configuration
-    url: https://access.redhat.com/articles/1329173
-  ruleID: weblogic-xml-descriptor-18000
-  tag:
-  - configuration
-  - weblogic
-  - WebLogic plan.xml deployment descriptor
-  when:
-    builtin.xml:
-      namespaces:
-        wls: http://xmlns.oracle.com/weblogic/deployment-plan
-      xpath: /wls:deployment-plan
-- category: mandatory
-  customVariables: []
-  description: WebLogic EJB XML (weblogic-ejb-jar.xml) trans-timeout-seconds
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - descriptor
-  - ejb
-  - database
-  links:
-  - title: WebLogic Server Deployment Elements
-    url: https://docs.oracle.com/middleware/1221/wls/WLMDB/summary.htm#r35c1-t4
-  - title: JBoss EAP 6 - Session Bean Transaction Timeout
-    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. \n\n In JBoss EAP 6+, you can achieve the
-    same behavior by using the `TransactionTimeout` annotation."
-  ruleID: weblogic-xml-descriptor-19000
-  when:
-    builtin.xml:
-      namespaces: {}
-      xpath: //*[local-name()='trans-timeout-seconds']/text()
diff --git a/resources/rulesets/eap6/56-weblogic.windup.yaml b/resources/rulesets/eap6/56-weblogic.windup.yaml
deleted file mode 100644
index 0915d4e..0000000
--- a/resources/rulesets/eap6/56-weblogic.windup.yaml
+++ /dev/null
@@ -1,375 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: WebLogic scheduled job
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - scheduler
-  - ejb
-  - timer
-  links:
-  - title: Java EE 6 - Using TimerService
-    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: "\n \n WebLogic scheduled jobs should be migrated to use the standard EJB
-    `javax.ejb.TimerService`.\n \n "
-  ruleID: weblogic-01000
-  tag:
-  - scheduler
-  - ejb
-  - timer
-  - weblogic
-  - WebLogic scheduled job
-  when:
-    java.referenced:
-      location: IMPLEMENTS_TYPE
-      pattern: weblogic.time.common.Triggerable
-- category: mandatory
-  customVariables: []
-  description: WebLogic StringUtils usage
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  links:
-  - title: Apache Commons Lang
-    url: https://commons.apache.org/proper/commons-lang/
-  message: Replace with the `StringUtils` class from Apache Commons.
-  ruleID: weblogic-02000
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: weblogic.utils.StringUtils*
-- category: mandatory
-  customVariables: []
-  description: WebLogic specific Apache XML package
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  links: []
-  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:
-      location: PACKAGE
-      pattern: weblogic.apache.xml*
-- category: mandatory
-  customVariables:
-  - name: classname
-    nameOfCaptureGroup: classname
-    pattern: weblogic.transaction.(?P<classname>(Client)*TransactionManager)
-  description: WebLogic TransactionManager usage
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - transactions
-  links:
-  - title: JBoss EAP 6.4 - Java Transaction API (JTA)
-    url: https://access.redhat.com/documentation/en-us/JBoss_Enterprise_Application_Platform/6.4/html/Development_Guide/chap-Java_Transaction_API_JTA.html
-  - title: Java Enterprise Edition 7 - TransactionManager
-    url: http://docs.oracle.com/javaee/7/api/javax/transaction/TransactionManager.html
-  message: Replace with the Java EE standard [javax.transaction.TransactionManager](http://docs.oracle.com/javaee/7/api/javax/transaction/TransactionManager.html)
-  ruleID: weblogic-04000
-  when:
-    java.referenced:
-      pattern: weblogic.transaction.(Client)*TransactionManager
-- category: mandatory
-  customVariables: []
-  description: WebLogic TransactionManager usage of resume method
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - transactions
-  links: []
-  message: Replace with the Java EE standard method `javax.transaction.TransactionManager.resume(Transaction
-    tx)`.
-  ruleID: weblogic-05000
-  when:
-    or:
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.TransactionManager.resume*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.TransactionManager.forceResume*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.ClientTransactionManager.resume*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.ClientTransactionManager.forceResume*
-- category: mandatory
-  customVariables: []
-  description: WebLogic TransactionManager usage of suspend method
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - transactions
-  links: []
-  message: Replace with the Java EE standard `javax.transaction.TransactionManager.suspend()`
-  ruleID: weblogic-06000
-  when:
-    or:
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.TransactionManager.suspend*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.TransactionManager.forceSuspend*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.ClientTransactionManager.suspend*
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.transaction.ClientTransactionManager.forceSuspend*
-- category: mandatory
-  customVariables: []
-  description: WebLogic TxHelper usage
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - transactions
-  links: []
-  message: Remove the `weblogic.transaction.TxHelper` import statement.
-  ruleID: weblogic-07000
-  when:
-    java.referenced:
-      location: IMPORT
-      pattern: weblogic.transaction.TxHelper
-- customVariables:
-  - name: classname
-    nameOfCaptureGroup: classname
-    pattern: weblogic.transaction.(?P<classname>(Client)*TxHelper.)?getTransactionManager\(\)
-  description: WebLogic ClientTxHelper
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - transactions
-  links: []
-  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:
-      location: METHOD_CALL
-      pattern: weblogic.transaction.(Client)*TxHelper.getTransactionManager*
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary Clob JDBC object (OracleThinClob)
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - jdbc
-  links:
-  - title: Oracle JDBC Documentation
-    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: "\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
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - jdbc
-  links:
-  - title: Oracle JDBC Documentation
-    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: "\n This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`\n "
-  ruleID: weblogic-10000
-  when:
-    java.referenced:
-      location: METHOD_CALL
-      pattern: weblogic.jdbc.vendor.oracle.OracleThinClob.getCharacterOutputStream*
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary logger (NonCatalogLogger)
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - logging
-  links:
-  - title: JDK Logging Documentation
-    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: "\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:
-    - java.referenced:
-        location: METHOD_CALL
-        pattern: weblogic.i18n.logging.NonCatalogLogger*
-    - java.referenced:
-        location: CONSTRUCTOR_CALL
-        pattern: weblogic.i18n.logging.NonCatalogLogger*
-- category: mandatory
-  customVariables: []
-  description: WebLogic Oracle FCF JDBC property
-  effort: 1
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - jdbc
-  links:
-  - title: Implement Oracle Fast Connection Failover (FCF) in EAP 6
-    url: https://access.redhat.com/articles/1329233
-  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:\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:
-      namespaces: {}
-      xpath: /jdbc-data-source/jdbc-driver-params/property/name[text()='FastConnectionFailoverEnabled']
-- category: mandatory
-  customVariables: []
-  description: WebLogic side-by-side redeployment configuration
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  links:
-  - title: Replace WebLogic side-by-side production redeployment in EAP 6
-    url: https://access.redhat.com/articles/1329253
-  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:
-      filePattern: MANIFEST\.MF
-      pattern: 'Weblogic-Application-Version:'
-- category: mandatory
-  customVariables: []
-  description: WebLogic Oracle Wallet
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  links:
-  - title: Replace WebLogic Oracle Wallets When Migrating to EAP 6
-    url: https://access.redhat.com/articles/1329073
-  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:
-      filePattern: .*
-      pattern: oracle.net.wallet_location
-- category: mandatory
-  customVariables: []
-  description: WebLogic InitialContextFactory
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - configuration
-  links:
-  - title: Calling JMS resources and EJB in EAP 6 from Weblogic
-    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: "\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();`.\n \n "
-  ruleID: weblogic-016000
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|xml)
-      pattern: weblogic.jndi.WLInitialContextFactory
-- category: mandatory
-  customVariables: []
-  description: WebLogic proprietary T3 JNDI binding
-  effort: 3
-  labels:
-  - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - weblogic
-  - configuration
-  links:
-  - title: Oracle WebLogic RMI with T3
-    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: "\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:
-      filePattern: .*\.(java|properties|xml)
-      pattern: t3s?://
diff --git a/resources/rulesets/eap6/59-websphere-jms.windup.yaml b/resources/rulesets/eap6/59-websphere-jms.windup.yaml
deleted file mode 100644
index 9b14137..0000000
--- a/resources/rulesets/eap6/59-websphere-jms.windup.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- 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>[^.]+)
-  description: IBM JMS Client
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE 6 JMS Tutorial
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  - title: HornetQ User Manual (from JBoss EAP 5)
-    url: https://access.redhat.com/documentation/en-us/jboss_enterprise_application_platform/5/html-single/hornetq_user_guide/
-  - title: HornetQ Core Client API Javadoc
-    url: https://access.redhat.com/webassets/avalon/d/JBoss_Enterprise_Application_Platform-6-API_Documentation-en-US/files/javadoc/org/hornetq/api/core/client/package-summary.html
-  message: "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
-    \                   "
-  ruleID: websphere-jms-00000
-  tag:
-  - jms
-  - websphere
-  - IBM JMS Client
-  when:
-    java.referenced:
-      location: PACKAGE
-      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
-  description: IBM ConnectionFactory references
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE JMS Documentation
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  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:
-      pattern: com.ibm*.jms.(Jms|MQeJNDI|MQe|MQ)?*ConnectionFactory
-- category: mandatory
-  customVariables:
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?JmsMsg(?P<type>(Producer|Consumer))
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?JmsMsg(?P<type>(Producer|Consumer))
-  description: IBM JMS topic/queue message
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE JMS Documentation
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  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 specific implementation of JMS Queue needs to be migrated to the standard Java EE 6 JMS interface
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE 6 JMS Tutorial
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  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:
-      pattern: com.ibm.mqe.jms.{type}Queue
-- category: mandatory
-  customVariables:
-  - 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
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: IBM JMS destination message
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links: []
-  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>[^.]+)
-  description: IBM JMS interface
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links: []
-  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:
-      location: PACKAGE
-      pattern: com.ibm.*jms.(Jms|MQe|MQ)*
diff --git a/resources/rulesets/eap6/60-websphere-mq.windup.yaml b/resources/rulesets/eap6/60-websphere-mq.windup.yaml
deleted file mode 100644
index 91cc693..0000000
--- a/resources/rulesets/eap6/60-websphere-mq.windup.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- customVariables:
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\..*)?\.(mq|wmq).*.)?(?P<type>[^.]+)
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.(mq|wmq).*.)?(?P<type>[^.]+)
-  description: IBM MQ client API
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE 6 JMS Tutorial
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  - title: WebSphere MQ JavaDoc
-    url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/overview-summary.html
-  message: "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
-    \                   "
-  ruleID: websphere-mq-00000
-  tag:
-  - jms
-  - websphere
-  - IBM MQ client API
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: com.ibm.*(mq|wmq)*
-- category: mandatory
-  customVariables: []
-  description: IBM MQ Configuration
-  effort: 3
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  - configuration
-  links:
-  - title: Migration Guide - HornetQ
-    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: "The 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
-    \                   "
-  ruleID: websphere-mq-01000
-  tag:
-  - IBM MQ Configuration
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|xml)
-      pattern: com.ibm.mq.jms.context.WMQInitialContextFactory
-- category: mandatory
-  customVariables: []
-  description: IBM MQ Configuration
-  effort: 3
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  - configuration
-  links:
-  - title: Configure Messaging with HornetQ
-    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: "\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\n scripting feature.\n "
-  ruleID: websphere-mq-02000
-  tag:
-  - IBM MQ Configuration
-  when:
-    builtin.filecontent:
-      filePattern: .*\.scp
-      pattern: .*
diff --git a/resources/rulesets/eap6/61-websphere-mqe.windup.yaml b/resources/rulesets/eap6/61-websphere-mqe.windup.yaml
deleted file mode 100644
index cf09373..0000000
--- a/resources/rulesets/eap6/61-websphere-mqe.windup.yaml
+++ /dev/null
@@ -1,127 +0,0 @@
-- customVariables:
-  - name: package
-    nameOfCaptureGroup: package
-    pattern: (?P<package>com.ibm(\..*)?\.(mqe).*.)?(?P<type>[^.]+)
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.(mqe).*.)?(?P<type>[^.]+)
-  description: IBM MQe client API
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  links:
-  - title: Java EE 6 JMS Tutorial
-    url: https://docs.oracle.com/javaee/6/tutorial/doc/bnceh.html
-  - title: WebSphere MQe JavaDoc
-    url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/overview-summary.html
-  ruleID: websphere-mqe-00000
-  tag:
-  - jms
-  - websphere
-  - IBM MQe client API
-  when:
-    java.referenced:
-      location: PACKAGE
-      pattern: com.ibm.*(mqe)*
-- category: mandatory
-  customVariables: []
-  description: IBM MQe adapters can be deployed for queue managers in JBoss EAP.
-  effort: 3
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  links:
-  - title: 'JBoss EAP 6 Administration and Configuration Guide: Deploy the WebSphere
-      MQ Resource Adapter'
-    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: "\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:
-      location: INHERITANCE
-      pattern: com.ibm.mqe.adapters.MQe{type}Adapter
-- category: mandatory
-  customVariables: []
-  description: Classes under 'com.ibm.mqe.administration' can be configured with the JBoss Admin CLI in JBoss EAP 6
-  effort: 3
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  links:
-  - title: JBoss Admin CLI Guide for JMS
-    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\n JBoss EAP 6, the JMS
-    destinations can be configured with the JBoss Admin CLI.\n "
-  ruleID: websphere-mqe-02000
-  when:
-    java.referenced:
-      location: INHERITANCE
-      pattern: com.ibm.mqe.administration.MQe{type}AdminMsg
-- category: mandatory
-  customVariables: []
-  description: IBM MQe com.ibm.mqe.jms.MQeJMSAuthenticator
-  effort: 5
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  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: "\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
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - jms
-  - websphere
-  - messaging
-  links: []
-  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:
-      pattern: com.ibm.mqe.jms.MQeJMSMsgFieldNames
diff --git a/resources/rulesets/eap6/62-websphere-other.windup.yaml b/resources/rulesets/eap6/62-websphere-other.windup.yaml
deleted file mode 100644
index b2594a9..0000000
--- a/resources/rulesets/eap6/62-websphere-other.windup.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: WebSphere Work Manager
-  effort: 5
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - websphere
-  - asynchronous
-  links:
-  - title: Configure the Java Connector Architecture (JCA) Subsystem
-    url: 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
-  - title: Description of WebSphere Asynchronous Work
-    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: "\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:
-      location: INHERITANCE
-      pattern: com.ibm.websphere.asynchbeans.Work
-- category: mandatory
-  customVariables: []
-  description: WebSphere Startup Service
-  effort: 4
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - konveyor.io/target=java-ee6+
-  - konveyor.io/target=java-ee
-  - websphere
-  - startup
-  links:
-  - title: EJB 3.1 Singleton Bean
-    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: "\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:
-      location: PACKAGE
-      pattern: com.ibm.websphere.startupservice.*StartUp*
diff --git a/resources/rulesets/eap6/63-websphere-xml.windup.yaml b/resources/rulesets/eap6/63-websphere-xml.windup.yaml
deleted file mode 100644
index e96e0a6..0000000
--- a/resources/rulesets/eap6/63-websphere-xml.windup.yaml
+++ /dev/null
@@ -1,185 +0,0 @@
-- customVariables: []
-  description: IBM Process Server Rules 6.0
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links: []
-  message: WBI is a WebSphere proprietary business integration solution. This needs
-    to be migrated to JBoss Drools or JBPM/BRMS.
-  ruleID: websphere-xml-01000
-  tag:
-  - ibm-wbi
-  - rules
-  - websphere
-  - IBM Process Server Rules 6.0
-  when:
-    builtin.xml:
-      namespaces:
-        rl: http://www.ibm.com/xmlns/prod/websphere/wbi/br/6.0.0
-      xpath: /rl:RuleSet
-- category: mandatory
-  customVariables: []
-  description: WebSphere EAR Application Binding
-  effort: 0
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links:
-  - title: Migrate IBM WebSphere Application Server Web Application Extension or Binding
-      Files
-    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 WebSphere application binding is an IBM proprietary method for binding
-    user roles for authorization and needs to be migrated to JAAS or KeyCloak.
-  ruleID: websphere-xml-02000
-  tag:
-  - security
-  - websphere
-  - WebSphere EAR Application Binding
-  when:
-    builtin.xml:
-      namespaces:
-        applicationbnd: applicationbnd.xmi
-      xpath: /applicationbnd:ApplicationBinding
-- category: mandatory
-  customVariables: []
-  description: WebSphere JSP engine configuration (ibm-web-ext)
-  effort: 1
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links: []
-  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:
-    - as: default
-      builtin.xml:
-        namespaces:
-          webappext: webappext.xmi
-        xpath: /webappext:WebAppExtension
-      from: files
-    - as: default
-      builtin.xml:
-        namespaces:
-          ext: http://websphere.ibm.com/xml/ns/javaee
-        xpath: /ext:web-ext
-    - as: files
-      builtin.file:
-        pattern: ibm-web-ext\.xml|xmi
-- category: mandatory
-  customVariables: []
-  description: WebSphere web application binding (ibm-web-bnd)
-  effort: 3
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links:
-  - title: Configure the 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
-  - title: Migrate IBM WebSphere Application Server Web Application Extension or Binding
-      Files
-    url: https://access.redhat.com/articles/1330673
-  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:
-    - builtin.xml:
-        namespaces:
-          ext: http://websphere.ibm.com/xml/ns/javaee
-        xpath: /ext:web-bnd
-    - builtin.xml:
-        namespaces:
-          webappbnd: webappbnd.xmi
-        xpath: /webappbnd:WebAppBinding
-- customVariables: []
-  description: WebSphere web service client extension descriptor (ibm-webservicesclient-ext)
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links:
-  - title: JAX-WS Web Services
-    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: "\n                    \n                    Client IBM specific deployment
-    descriptor 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                    "
-  ruleID: websphere-xml-07000
-  tag:
-  - webservice
-  - websphere
-  - WebSphere web service client extension descriptor (ibm-webservicesclient-ext)
-  when:
-    builtin.xml:
-      namespaces:
-        com.ibm.etools.webservice.wscext: http://www.ibm.com/websphere/appserver/schemas/5.0.2/wscext.xmi
-      xpath: /com.ibm.etools.webservice.wscext:WsClientExtension
-- customVariables: []
-  description: WebSphere web service client binding descriptor (ibm-webservicesclient-bnd)
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links:
-  - title: JAX-WS Web Services
-    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: "\n                    \n                    Client IBM specific deployment
-    descriptor 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
-    \                   "
-  ruleID: websphere-xml-08000
-  tag:
-  - webservice
-  - websphere
-  - WebSphere web service client binding descriptor (ibm-webservicesclient-bnd)
-  when:
-    builtin.xml:
-      namespaces:
-        com.ibm.etools.webservice.wscbnd: http://www.ibm.com/websphere/appserver/schemas/5.0.2/wscbnd.xmi
-      xpath: /com.ibm.etools.webservice.wscbnd:ClientBinding
-- customVariables: []
-  description: WebSphere deployment descriptor (deployment.xml)
-  labels:
-  - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
-  - konveyor.io/target=eap
-  - websphere
-  links:
-  - title: IBM WebSphere configuration document descriptions
-    url: https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/rcfg_rconfdoc_descriptions.html
-  - title: IBM WebSphere configuration documents
-    url: https://www.ibm.com/support/knowledgecenter/SSAW57_9.0.5/com.ibm.websphere.nd.multiplatform.doc/ae/ccfg_confdoc.html
-  message: "\n                        This file is an IBM WebSphere proprietary deployment
-    descriptor that is typically generated when development of the EAR was done using
-    IBM products.\n                        The 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                    "
-  ruleID: websphere-xml-09000
-  tag:
-  - websphere
-  - WebSphere deployment descriptor (deployment.xml)
-  when:
-    builtin.xml:
-      namespaces:
-        appdeployment: http://www.ibm.com/websphere/appserver/schemas/5.0/appdeployment.xmi
-      xpath: /appdeployment:Deployment
diff --git a/resources/rulesets/eap6/26-commonj.windup.yaml b/resources/rulesets/eap6/77-commonj.windup.yaml
similarity index 93%
rename from resources/rulesets/eap6/26-commonj.windup.yaml
rename to resources/rulesets/eap6/77-commonj.windup.yaml
index 4a7d41d..7259753 100644
--- a/resources/rulesets/eap6/26-commonj.windup.yaml
+++ b/resources/rulesets/eap6/77-commonj.windup.yaml
@@ -37,9 +37,9 @@
     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.\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.\n "
+  message: |-
+    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.
   ruleID: commonj-02000
   when:
     java.referenced:
@@ -57,7 +57,7 @@
   - konveyor.io/target=java-ee
   - commonj
   links: []
-  message: "\n Commonj Timer Interface is similar to the EJB 3.1 javax.ejb.Timer Interface.\n "
+  message: Commonj Timer Interface is similar to the EJB 3.1 javax.ejb.Timer Interface.
   ruleID: commonj-03000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/27-xml-glassfish.windup.yaml b/resources/rulesets/eap6/78-xml-glassfish.windup.yaml
similarity index 68%
rename from resources/rulesets/eap6/27-xml-glassfish.windup.yaml
rename to resources/rulesets/eap6/78-xml-glassfish.windup.yaml
index aca0294..5fa39ca 100644
--- a/resources/rulesets/eap6/27-xml-glassfish.windup.yaml
+++ b/resources/rulesets/eap6/78-xml-glassfish.windup.yaml
@@ -1,3 +1,22 @@
+- customVariables: []
+  description: Glassfish Web Descriptor
+  labels:
+  - konveyor.io/source=glassfish
+  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap
+  - web-app
+  - glassfish
+  - configuration
+  links: []
+  ruleID: xml-glassfish-01000
+  tag:
+  - configuration
+  - Glassfish Web Descriptor
+  when:
+    as: default
+    builtin.xmlPublicID:
+      namespaces: {}
+      regex: ""
 - customVariables: []
   description: Glassfish EJB Descriptor
   labels:
diff --git a/resources/rulesets/eap6/28-java-ee-jaxrpc.windup.yaml b/resources/rulesets/eap6/79-java-ee-jaxrpc.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/28-java-ee-jaxrpc.windup.yaml
rename to resources/rulesets/eap6/79-java-ee-jaxrpc.windup.yaml
diff --git a/resources/rulesets/eap6/29-seam-java.windup.yaml b/resources/rulesets/eap6/80-seam-java.windup.yaml
similarity index 93%
rename from resources/rulesets/eap6/29-seam-java.windup.yaml
rename to resources/rulesets/eap6/80-seam-java.windup.yaml
index 5a298a7..a805b3d 100644
--- a/resources/rulesets/eap6/29-seam-java.windup.yaml
+++ b/resources/rulesets/eap6/80-seam-java.windup.yaml
@@ -70,8 +70,8 @@
   links:
   - title: Java EE API - Conversation
     url: http://docs.oracle.com/javaee/7/api/javax/enterprise/context/Conversation.html
-  message: "\n You can use Java EE `javax.enterprise.context.Conversation` interface
-    like:\n \n ```java\n @Inject Conversation conversation;\n ```\n "
+  message: "You can use Java EE `javax.enterprise.context.Conversation` interface
+    like:\n \n ```java\n @Inject Conversation conversation;\n ```"
   ruleID: seam-java-00010
   when:
     java.referenced:
@@ -156,9 +156,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.\n See
-    linked documentation link for CDI alternatives. For example, `@Scope(ScopeType.SESSION)`
-    should be `@javax.enterprise.context.SessionScoped`. \n "
+  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`.
   ruleID: seam-java-00050
   when:
     java.referenced:
@@ -240,10 +240,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: "\n CDI does not support bijection and does a static injection in comparison
+  message: "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 "
+    cycle.\n \n Refactor such Seam API usage with `@javax.enterprise.inject.Produces`."
   ruleID: seam-java-00070
   when:
     java.referenced:
@@ -274,11 +274,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: "\n Seam Factory annotation was used for binding non Seam component methods
+  message: "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\n `@Factory(scope = ScopeType.APPLICATION)` use:\n \n ```java\n
-    @Produces @ApplicationScoped ...\n ```\n "
+    @Produces @ApplicationScoped ...\n ```"
   ruleID: seam-java-00071
   when:
     java.referenced:
@@ -414,11 +414,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: "\n If you need to keep programmatic lookup use `javax.enterprise.inject.Instance`
+  message: "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 "
+    BeanManager manager;\n ```"
   ruleID: seam-java-00110
   when:
     java.referenced:
@@ -680,11 +680,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: "\n The `@RequestParameter` annotation triggers injection of an HTTP request
+  message: "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. "
+    which can be used instead."
   ruleID: seam-java-00210
   when:
     java.referenced:
@@ -711,7 +711,7 @@
     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: "\n Seam 2 provides a built-in logger implementation. It is a thin wrapper
+  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). \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
@@ -720,7 +720,7 @@
     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 "
+    transient Logger logger;\n ```"
   ruleID: seam-java-00220
   when:
     java.referenced:
@@ -749,7 +749,7 @@
     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. \n This approach should be used
-    as a replacement for the `@DataModel*` functionality. \n "
+    as a replacement for the `@DataModel*` functionality."
   ruleID: seam-java-00230
   when:
     java.referenced:
@@ -775,14 +775,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: "\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 "
+  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.\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"
   ruleID: seam-java-00240
   when:
     or:
@@ -812,13 +812,10 @@
     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: "\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.\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 "
+  message: |-
+    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.
   ruleID: seam-java-00250
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/30-seam-ui.windup.yaml b/resources/rulesets/eap6/81-seam-ui.windup.yaml
similarity index 82%
rename from resources/rulesets/eap6/30-seam-ui.windup.yaml
rename to resources/rulesets/eap6/81-seam-ui.windup.yaml
index aac912a..f7df733 100644
--- a/resources/rulesets/eap6/30-seam-ui.windup.yaml
+++ b/resources/rulesets/eap6/81-seam-ui.windup.yaml
@@ -18,14 +18,6 @@
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate-eap5-component-upgrade-reference
   - title: How to use JSF 1.2 with EAP 7?
     url: https://access.redhat.com/solutions/2773121
-  message: "\n                        This JSF template includes references to the
-    Seam 2.x tag library.\n                        Seam 2.2 and earlier is not supported
-    on JBoss EAP 6 and above.\n\n                        There are two options available:\n\n
-    \                       1. Continue using Seam 2.x. 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
-    \                   "
   ruleID: seam-ui-jsf-00001
   tag:
   - seam
@@ -51,15 +43,6 @@
   links:
   - title: JBoss EAP 5 Component Upgrade Reference
     url: https://access.redhat.com/documentation/en-us/red_hat_jboss_enterprise_application_platform/7.0/html-single/migration_guide/#migrate-eap5-component-upgrade-reference
-  message: "\n                        This JSF template includes references to the
-    Seam 2.3 library.\n                        Seam 2.3 is supported on JBoss EAP
-    6, however it is no longer supported\n                        on JBoss EAP 7 and
-    above.\n\n                        There are two options available:\n\n                        1.
-    Continue using Seam 2.3. 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                        The
-    provided links describe the issue in more detail.\n                    "
   ruleID: seam-ui-jsf-00002
   tag:
   - seam
@@ -87,9 +70,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: "\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.\n "
+  message: |-
+    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.
   ruleID: seam-ui-jsf-00001-01
   when:
     or:
@@ -119,9 +102,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: "\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 "
+  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.
   ruleID: seam-ui-jsf-01000
   when:
     or:
@@ -151,7 +134,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: "\n There is no direct mapping for `<s:conversationId>` in JSF UI controls.\n "
+  message: There is no direct mapping for `<s:conversationId>` in JSF UI controls.
   ruleID: seam-ui-jsf-01001
   when:
     or:
@@ -181,8 +164,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: "\n There is no direct mapping for `<s:conversationPropagation>` in JSF
-    UI controls\n "
+  message: There is no direct mapping for `<s:conversationPropagation>` in JSF UI
+    controls
   ruleID: seam-ui-jsf-01002
   when:
     or:
@@ -212,7 +195,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: "\n There is no direct mapping for `<s:taskId>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:taskId>` in JSF UI controls
   ruleID: seam-ui-jsf-01003
   when:
     or:
@@ -242,7 +225,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: "\n There is no direct mapping for `<s:defaultAction>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:defaultAction>` in JSF UI controls
   ruleID: seam-ui-jsf-01004
   when:
     or:
@@ -272,10 +255,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: "\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 "
+  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`.
   ruleID: seam-ui-jsf-01005
   when:
     or:
@@ -305,7 +289,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: "\n Seam UI's `<s:convertEntity>` should be replaced by `<f:converter converterId=\"[yourConverterClass]\">`.\n "
+  message: Seam UI's `<s:convertEntity>` should be replaced by `<f:converter converterId="[yourConverterClass]">`.
   ruleID: seam-ui-jsf-01006
   when:
     or:
@@ -335,7 +319,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: "\n There is no direct mapping for `<s:enumItem>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:enumItem>` in JSF UI controls
   ruleID: seam-ui-jsf-01007
   when:
     or:
@@ -365,7 +349,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: "\n There is no direct mapping for `<s:token>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:token>` in JSF UI controls
   ruleID: seam-ui-jsf-01008
   when:
     or:
@@ -395,7 +379,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: "\n There is no direct mapping for `<s:formattedText>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:formattedText>` in JSF UI controls
   ruleID: seam-ui-jsf-01009
   when:
     or:
@@ -425,7 +409,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: "\n There is no direct mapping for `<s:cache>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:cache>` in JSF UI controls
   ruleID: seam-ui-jsf-01010
   when:
     or:
@@ -455,7 +439,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: "\n There is no direct mapping for `<s:resource>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:resource>` in JSF UI controls
   ruleID: seam-ui-jsf-01011
   when:
     or:
@@ -485,7 +469,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: "\n There is no direct mapping for `<s:download>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:download>` in JSF UI controls
   ruleID: seam-ui-jsf-01012
   when:
     or:
@@ -515,7 +499,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: "\n There is no direct mapping for `<s:remote>` in JSF UI controls\n "
+  message: There is no direct mapping for `<s:remote>` in JSF UI controls
   ruleID: seam-ui-jsf-01013
   when:
     or:
@@ -545,7 +529,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: "\n Seam UI's `<s:selectItems>` should be replaced by `<h:selectItems>`.\n "
+  message: Seam UI's `<s:selectItems>` should be replaced by `<h:selectItems>`.
   ruleID: seam-ui-jsf-01014
   when:
     or:
@@ -575,7 +559,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: "\n Seam UI's `<s:validate>` should be replaced by `<f:validateBean>`.\n "
+  message: Seam UI's `<s:validate>` should be replaced by `<f:validateBean>`.
   ruleID: seam-ui-jsf-01015
   when:
     or:
@@ -605,7 +589,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: "\n Seam UI's `<s:fragment>` should be replaced by `<ui:fragment>`.\n "
+  message: Seam UI's `<s:fragment>` should be replaced by `<ui:fragment>`.
   ruleID: seam-ui-jsf-01016
   when:
     or:
@@ -637,8 +621,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: "\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 "
+  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.
   ruleID: seam-ui-jsf-01017
   when:
     or:
@@ -670,8 +654,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: "\n There is no direct mapping for `<s:convertAtomicBoolean>` in JSF UI
-    controls. Create a custom converter for a replacement.\n "
+  message: There is no direct mapping for `<s:convertAtomicBoolean>` in JSF UI controls.
+    Create a custom converter for a replacement.
   ruleID: seam-ui-jsf-01018
   when:
     or:
@@ -703,8 +687,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: "\n There is no direct mapping for `<s:convertAtomicInteger>` in JSF UI
-    controls. Create a custom converter for a replacement.\n "
+  message: There is no direct mapping for `<s:convertAtomicInteger>` in JSF UI controls.
+    Create a custom converter for a replacement.
   ruleID: seam-ui-jsf-01019
   when:
     or:
@@ -736,8 +720,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: "\n There is no direct mapping for `<s:convertAtomicLong>` in JSF UI controls.
-    Create a custom converter for a replacement.\n "
+  message: There is no direct mapping for `<s:convertAtomicLong>` in JSF UI controls.
+    Create a custom converter for a replacement.
   ruleID: seam-ui-jsf-01020
   when:
     or:
@@ -767,9 +751,14 @@
   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: "\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 "
+  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>`.
   ruleID: seam-ui-jsf-01021
   when:
     or:
@@ -799,9 +788,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: "\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 "
+  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>`.
   ruleID: seam-ui-jsf-01022
   when:
     or:
@@ -831,11 +820,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: "\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.\n "
+  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)
+     [input.xhtml](https://raw.githubusercontent.com/seam/migration/develop/open18_java_ee_6/src/main/webapp/resources/components/input.xhtml) file.
   ruleID: seam-ui-jsf-01023
   when:
     or:
@@ -865,9 +852,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: "\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 "
+  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.
   ruleID: seam-ui-jsf-01024
   when:
     or:
@@ -897,9 +884,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: "\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 "
+  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.
   ruleID: seam-ui-jsf-01025
   when:
     or:
@@ -929,8 +916,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: "\n There is no direct mapping for `<s:label>` in JSF UI controls, but
-    `<h:outputLabel>` is similar.\n "
+  message: There is no direct mapping for `<s:label>` in JSF UI controls, but `<h:outputLabel>`
+    is similar.
   ruleID: seam-ui-jsf-01026
   when:
     or:
@@ -960,8 +947,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: "\n Use `<h:message for=\"name\" errorClass=\"invalid\">` or [Richfaces](http://richfaces.jboss.org/)
-    `<rich:message>`.\n "
+  message: Use `<h:message for="name" errorClass="invalid">` or [Richfaces](http://richfaces.jboss.org/)
+    `<rich:message>`.
   ruleID: seam-ui-jsf-01027
   when:
     or:
@@ -991,9 +978,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: "\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 "
+  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>`
   ruleID: seam-ui-jsf-01028
   when:
     or:
@@ -1023,8 +1010,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: "\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 "
+  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.
   ruleID: seam-ui-jsf-01029
   when:
     or:
diff --git a/resources/rulesets/eap6/31-xml-webservices.windup.yaml b/resources/rulesets/eap6/82-xml-webservices.windup.yaml
similarity index 99%
rename from resources/rulesets/eap6/31-xml-webservices.windup.yaml
rename to resources/rulesets/eap6/82-xml-webservices.windup.yaml
index 283570c..8cd7d38 100644
--- a/resources/rulesets/eap6/31-xml-webservices.windup.yaml
+++ b/resources/rulesets/eap6/82-xml-webservices.windup.yaml
@@ -102,6 +102,8 @@
   - webservice
   links: []
   ruleID: xml-webservices-06000
+  tag:
+  - JBoss EAP
   when:
     and:
     - as: webservices
@@ -130,6 +132,8 @@
   - webservice
   links: []
   ruleID: xml-webservices-06001
+  tag:
+  - JBoss EAP
   when:
     and:
     - as: webservices
diff --git a/resources/rulesets/eap6/32-eap4-xml-config.windup.yaml b/resources/rulesets/eap6/83-eap4-xml-config.windup.yaml
similarity index 63%
rename from resources/rulesets/eap6/32-eap4-xml-config.windup.yaml
rename to resources/rulesets/eap6/83-eap4-xml-config.windup.yaml
index f9a2190..d2b8073 100644
--- a/resources/rulesets/eap6/32-eap4-xml-config.windup.yaml
+++ b/resources/rulesets/eap6/83-eap4-xml-config.windup.yaml
@@ -16,14 +16,22 @@
     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: "\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 "
+  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.
   ruleID: eap4-eap6-25000
   when:
     or:
@@ -52,15 +60,26 @@
   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: "\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 "
+  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;
+     ```
   ruleID: eap4-eap6-26000
   when:
     or:
@@ -88,15 +107,26 @@
   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: "\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 "
+  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;
+     ```
   ruleID: eap4-eap6-27000
   when:
     or:
@@ -129,13 +159,18 @@
     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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-28000
   when:
     builtin.xml:
@@ -160,12 +195,17 @@
   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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-29000
   when:
     builtin.xml:
@@ -192,19 +232,30 @@
     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: "\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 "
+  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")
+     ```
   ruleID: eap4-eap6-30000
   when:
     builtin.xml:
@@ -229,11 +280,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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-31000
   when:
     builtin.xml:
@@ -258,12 +312,20 @@
   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: "\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 "
+  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.
   ruleID: eap4-eap6-32000
   when:
     builtin.xml:
@@ -290,10 +352,13 @@
     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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-33000
   when:
     builtin.xml:
@@ -318,11 +383,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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-34000
   when:
     builtin.xml:
@@ -347,10 +415,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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-35000
   when:
     builtin.xml:
@@ -375,14 +447,17 @@
   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: "\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 "
+  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)
+     ```
   ruleID: eap4-eap6-36000
   when:
     builtin.xml:
@@ -409,17 +484,24 @@
     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: "\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\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 "
+  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 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.
   ruleID: eap4-eap6-37000
   when:
     builtin.xml:
@@ -450,10 +532,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: "\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 "
+  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.
   ruleID: eap4-eap6-38000
   when:
     builtin.xml:
@@ -484,10 +566,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: "\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 "
+  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.
   ruleID: eap4-eap6-39000
   when:
     builtin.xml:
@@ -518,11 +600,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: "\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 "
+  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.
   ruleID: eap4-eap6-40000
   when:
     builtin.xml:
@@ -553,11 +635,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: "\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 "
+  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.
   ruleID: eap4-eap6-41000
   when:
     builtin.xml:
@@ -588,11 +670,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: "\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 "
+  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.
   ruleID: eap4-eap6-42000
   when:
     builtin.xml:
diff --git a/resources/rulesets/eap6/33-jboss-eap5-java.windup.yaml b/resources/rulesets/eap6/84-jboss-eap5-java.windup.yaml
similarity index 82%
rename from resources/rulesets/eap6/33-jboss-eap5-java.windup.yaml
rename to resources/rulesets/eap6/84-jboss-eap5-java.windup.yaml
index 6792c61..c7ac5fb 100644
--- a/resources/rulesets/eap6/33-jboss-eap5-java.windup.yaml
+++ b/resources/rulesets/eap6/84-jboss-eap5-java.windup.yaml
@@ -34,9 +34,10 @@
     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: "\n \n `QueueConnectionFactory` was used to obtain connection to JMS queues.\n\n
-    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.\n
-    \n "
+  message: |-
+    `QueueConnectionFactory` was used to obtain connection to JMS queues.
+
+     Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.
   ruleID: jboss-eap5-java-02000
   when:
     or:
@@ -70,9 +71,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: "\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 "
+  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
   ruleID: jboss-eap5-java-04000
   when:
     java.referenced:
@@ -103,10 +104,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: "\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 "
+  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.
   ruleID: jboss-eap5-java-05000
   when:
     java.referenced:
@@ -129,9 +130,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: "\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 "
+  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`.
   ruleID: jboss-eap5-java-06000
   when:
     java.referenced:
@@ -154,9 +156,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: "\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 "
+  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.
   ruleID: jboss-eap5-java-07000
   when:
     java.referenced:
@@ -178,8 +181,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.annotation` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.annotation` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08000
   when:
     java.referenced:
@@ -201,8 +205,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.binding` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.binding` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08100
   when:
     java.referenced:
@@ -224,8 +229,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.monitoring` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.monitoring` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08200
   when:
     java.referenced:
@@ -247,8 +253,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.tools.ant` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.tools.ant` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08300
   when:
     java.referenced:
@@ -270,8 +277,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.tools.cmd` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.tools.cmd` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08400
   when:
     java.referenced:
@@ -291,8 +299,9 @@
   - ejb
   - jbossws
   links: []
-  message: "\n This package has been relocated to `org.jboss.ws.api.tools` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.tools` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08500
   when:
     java.referenced:
@@ -314,8 +323,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
-    as specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.util.ServiceLoader` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08600
   when:
     java.referenced:
@@ -336,8 +346,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.handler` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.handler` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08700
   when:
     java.referenced:
@@ -359,8 +370,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.addressing` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.addressing` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08800
   when:
     java.referenced:
@@ -382,8 +394,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-08900
   when:
     java.referenced:
@@ -402,8 +415,9 @@
   - ejb
   - jbossws
   links: []
-  message: "\n This package has been relocated to `org.jboss.ws.common` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.common` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-09000
   when:
     java.referenced:
@@ -425,8 +439,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
-    as specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig` as specified in the
+     migration guide.
   ruleID: jboss-eap5-java-09100
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/34-jboss-eap5-xml.windup.yaml b/resources/rulesets/eap6/85-jboss-eap5-xml.windup.yaml
similarity index 92%
rename from resources/rulesets/eap6/34-jboss-eap5-xml.windup.yaml
rename to resources/rulesets/eap6/85-jboss-eap5-xml.windup.yaml
index 7d89109..5d077b0 100644
--- a/resources/rulesets/eap6/34-jboss-eap5-xml.windup.yaml
+++ b/resources/rulesets/eap6/85-jboss-eap5-xml.windup.yaml
@@ -118,6 +118,27 @@
         from: xmlfiles1
         namespaces: {}
         xpath: /page
+- customVariables: []
+  description: JBoss 5.x EAR descriptor
+  labels:
+  - konveyor.io/source=eap5
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap6
+  - konveyor.io/target=eap
+  - jboss-eap5
+  - ejb
+  - seam
+  links:
+  - title: JBoss DTD's
+    url: http://www.jboss.org/j2ee/dtd/
+  ruleID: jboss-eap5-xml-02000
+  tag:
+  - jboss-eap5
+  - JBoss 5.x EAR descriptor
+  when:
+    builtin.xmlPublicID:
+      namespaces: {}
+      regex: ""
 - customVariables: []
   description: JBoss EAR descriptor
   labels:
@@ -294,8 +315,9 @@
   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: "\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 "
+  message: |-
+    `java:/jaas/` is a JBoss EAP `security-domain` URI.
+     Remove the `java:/jaas/` prefix for `security-domain` elements in AS 7 / EAP 6.
   ruleID: jboss-eap5-xml-14000
   when:
     builtin.xml:
@@ -319,10 +341,9 @@
     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.\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 "
+  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.
   ruleID: jboss-eap5-xml-16000
   tag:
   - security
diff --git a/resources/rulesets/eap6/35-resteasy.windup.yaml b/resources/rulesets/eap6/86-resteasy.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/35-resteasy.windup.yaml
rename to resources/rulesets/eap6/86-resteasy.windup.yaml
diff --git a/resources/rulesets/eap6/87-xml-jonas.windup.yaml b/resources/rulesets/eap6/87-xml-jonas.windup.yaml
new file mode 100644
index 0000000..af49de1
--- /dev/null
+++ b/resources/rulesets/eap6/87-xml-jonas.windup.yaml
@@ -0,0 +1,20 @@
+- customVariables: []
+  description: JOnAS Web Descriptor
+  labels:
+  - konveyor.io/source=jonas
+  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap
+  - jonas
+  - web-app
+  - configuration
+  links: []
+  ruleID: xml-jonas-01000
+  tag:
+  - configuration
+  - jonas
+  - JOnAS Web Descriptor
+  when:
+    as: default
+    builtin.xmlPublicID:
+      namespaces: {}
+      regex: ""
diff --git a/resources/rulesets/eap6/37-jotm.rhamt.yaml b/resources/rulesets/eap6/88-jotm.rhamt.yaml
similarity index 51%
rename from resources/rulesets/eap6/37-jotm.rhamt.yaml
rename to resources/rulesets/eap6/88-jotm.rhamt.yaml
index 9f0ce90..dd5c8dc 100644
--- a/resources/rulesets/eap6/37-jotm.rhamt.yaml
+++ b/resources/rulesets/eap6/88-jotm.rhamt.yaml
@@ -13,13 +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: "\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 "
+  message: "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)."
   ruleID: jotm-00001
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/38-jrun-catchall.windup.yaml b/resources/rulesets/eap6/89-jrun-catchall.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/38-jrun-catchall.windup.yaml
rename to resources/rulesets/eap6/89-jrun-catchall.windup.yaml
diff --git a/resources/rulesets/eap6/39-xml-jrun.windup.yaml b/resources/rulesets/eap6/90-xml-jrun.windup.yaml
similarity index 79%
rename from resources/rulesets/eap6/39-xml-jrun.windup.yaml
rename to resources/rulesets/eap6/90-xml-jrun.windup.yaml
index 3de054e..754b44d 100644
--- a/resources/rulesets/eap6/39-xml-jrun.windup.yaml
+++ b/resources/rulesets/eap6/90-xml-jrun.windup.yaml
@@ -18,6 +18,12 @@
     - builtin.xml:
         namespaces: {}
         xpath: /jrun-web-app
+    - builtin.xmlPublicID:
+        namespaces: {}
+        regex: ""
+    - builtin.xmlPublicID:
+        namespaces: {}
+        regex: ""
 - customVariables: []
   description: JRun ejb-jar configuration
   labels:
@@ -39,3 +45,6 @@
       builtin.xml:
         namespaces: {}
         xpath: /*[local-name()='jrun-ejb-jar']
+    - builtin.xmlPublicID:
+        namespaces: {}
+        regex: ""
diff --git a/resources/rulesets/eap6/40-jsp.windup.yaml b/resources/rulesets/eap6/91-jsp.windup.yaml
similarity index 75%
rename from resources/rulesets/eap6/40-jsp.windup.yaml
rename to resources/rulesets/eap6/91-jsp.windup.yaml
index 0365b55..1cd0ba4 100644
--- a/resources/rulesets/eap6/40-jsp.windup.yaml
+++ b/resources/rulesets/eap6/91-jsp.windup.yaml
@@ -9,8 +9,8 @@
   - konveyor.io/target=java-ee
   - konveyor.io/source
   links: []
-  message: "\n Empty import definition in .jsp or .jspf files would fail in compilation
-    time and needs to be removed.\n "
+  message: Empty import definition in .jsp or .jspf files would fail in compilation
+    time and needs to be removed.
   ruleID: jsp-01000
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/eap6/41-log4j.windup.yaml b/resources/rulesets/eap6/92-log4j.windup.yaml
similarity index 94%
rename from resources/rulesets/eap6/41-log4j.windup.yaml
rename to resources/rulesets/eap6/92-log4j.windup.yaml
index 645254d..2f8e578 100644
--- a/resources/rulesets/eap6/41-log4j.windup.yaml
+++ b/resources/rulesets/eap6/92-log4j.windup.yaml
@@ -48,9 +48,8 @@
   links:
   - title: EAP 6 deadlocks when using ConsoleHandler and java.io.PrintStream
     url: https://access.redhat.com/solutions/375273
-  message: |2-
-
-     Using ConsoleAppender configured in log4j.{{suffix}} can cause a deadlock on JBoss EAP 6.
+  message: |-
+    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:
diff --git a/resources/rulesets/eap6/42-xml-orion.windup.yaml b/resources/rulesets/eap6/93-xml-orion.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/42-xml-orion.windup.yaml
rename to resources/rulesets/eap6/93-xml-orion.windup.yaml
diff --git a/resources/rulesets/eap6/43-xml-resin.windup.yaml b/resources/rulesets/eap6/94-xml-resin.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/43-xml-resin.windup.yaml
rename to resources/rulesets/eap6/94-xml-resin.windup.yaml
diff --git a/resources/rulesets/eap6/44-environment-dependent.windup.yaml b/resources/rulesets/eap6/95-environment-dependent.windup.yaml
similarity index 68%
rename from resources/rulesets/eap6/44-environment-dependent.windup.yaml
rename to resources/rulesets/eap6/95-environment-dependent.windup.yaml
index 783ff23..7685d7e 100644
--- a/resources/rulesets/eap6/44-environment-dependent.windup.yaml
+++ b/resources/rulesets/eap6/95-environment-dependent.windup.yaml
@@ -17,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: "\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.\n\n Please review the class-loading mechanisms and ensure
-    that the dynamically loaded class is available in JBoss EAP.\n \n "
+  message: |-
+    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.
   ruleID: environment-dependent-calls-01000
   when:
     java.referenced:
@@ -39,11 +39,21 @@
   - konveyor.io/source
   - jndi
   links: []
-  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 "
+  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");
+     ```
   ruleID: environment-dependent-calls-02000
   when:
     as: default
@@ -63,12 +73,13 @@
   - konveyor.io/source
   - jndi
   links: []
-  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 "
+  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() );
+     ```
   ruleID: environment-dependent-calls-03000
   when:
     as: default
@@ -115,9 +126,9 @@
   - konveyor.io/source
   - jmx
   links: []
-  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 "
+  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.
   ruleID: environment-dependent-calls-04000
   when:
     as: default
@@ -140,9 +151,9 @@
   - konveyor.io/source
   - jmx
   links: []
-  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 "
+  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.
   ruleID: environment-dependent-calls-04001
   when:
     as: default
@@ -162,10 +173,10 @@
   - konveyor.io/source
   - jmx
   links: []
-  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 "
+  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.
   ruleID: environment-dependent-calls-05000
   when:
     as: default
diff --git a/resources/rulesets/eap6/45-generic-catchall.windup.yaml b/resources/rulesets/eap6/96-generic-catchall.windup.yaml
similarity index 91%
rename from resources/rulesets/eap6/45-generic-catchall.windup.yaml
rename to resources/rulesets/eap6/96-generic-catchall.windup.yaml
index 36c2ff5..6fff26f 100644
--- a/resources/rulesets/eap6/45-generic-catchall.windup.yaml
+++ b/resources/rulesets/eap6/96-generic-catchall.windup.yaml
@@ -13,9 +13,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: generic-catchall-00000
   when:
     java.referenced:
@@ -33,9 +33,9 @@
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: generic-catchall-00001
   when:
     java.referenced:
@@ -60,8 +60,9 @@
   - catchall
   - mule
   links: []
-  message: "\n Mule API `org.mule.{{packageRemainder}}.{{type}}` was used.\n You should
-    convert these types to Apache Camel.\n "
+  message: |-
+    Mule API `org.mule.{{packageRemainder}}.{{type}}` was used.
+     You should convert these types to Apache Camel.
   ruleID: generic-catchall-00002
   when:
     java.referenced:
@@ -153,8 +154,9 @@
   - catchall
   - tibco
   links: []
-  message: "\n Tibco `com.tibco.{{packageRemainder}}.{{type}}` reference found.\n
-    No specific details available.\n "
+  message: |-
+    Tibco `com.tibco.{{packageRemainder}}.{{type}}` reference found.
+     No specific details available.
   ruleID: generic-catchall-00300
   when:
     java.referenced:
@@ -240,15 +242,15 @@
       pattern: org.apache.(activeio|activemq)*
 - category: potential
   customVariables:
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: org.(?P<subpackage>(jboss|jbpm).)?(?P<packageRemainder>([a-z]+\.)*)?(?P<type>[^.()]+)
   - 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
   effort: 0
   labels:
diff --git a/resources/rulesets/eap6/36-xml-jonas.windup.yaml b/resources/rulesets/eap6/97-ignore-references.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/36-xml-jonas.windup.yaml
rename to resources/rulesets/eap6/97-ignore-references.windup.yaml
diff --git a/resources/rulesets/eap7/66-base64.windup.yaml b/resources/rulesets/eap7/100-base64.windup.yaml
similarity index 56%
rename from resources/rulesets/eap7/66-base64.windup.yaml
rename to resources/rulesets/eap7/100-base64.windup.yaml
index fcdf5de..89fd9c6 100644
--- a/resources/rulesets/eap7/66-base64.windup.yaml
+++ b/resources/rulesets/eap7/100-base64.windup.yaml
@@ -12,10 +12,12 @@
   links:
   - title: Can application use the JBoss EAP org.jboss.util.Base64 built in class?
     url: https://access.redhat.com/solutions/403703
-  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 "
+  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/).
   ruleID: base64-01000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/67-jaxrpc.windup.yaml b/resources/rulesets/eap7/101-jaxrpc.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/67-jaxrpc.windup.yaml
rename to resources/rulesets/eap7/101-jaxrpc.windup.yaml
diff --git a/resources/rulesets/eap7/68-jboss-eap5-7-java.windup.yaml b/resources/rulesets/eap7/102-jboss-eap5-7-java.windup.yaml
similarity index 80%
rename from resources/rulesets/eap7/68-jboss-eap5-7-java.windup.yaml
rename to resources/rulesets/eap7/102-jboss-eap5-7-java.windup.yaml
index 249e429..252c084 100644
--- a/resources/rulesets/eap7/68-jboss-eap5-7-java.windup.yaml
+++ b/resources/rulesets/eap7/102-jboss-eap5-7-java.windup.yaml
@@ -18,9 +18,10 @@
     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: "\n \n `QueueConnectionFactory` was used to obtain connection to JMS queues.\n\n
-    Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.\n
-    \n "
+  message: |-
+    `QueueConnectionFactory` was used to obtain connection to JMS queues.
+
+     Replace the lookup string `QueueConnectionFactory` with `ConnectionFactory`.
   ruleID: jboss-eap5-7-java-02000
   when:
     or:
@@ -54,9 +55,11 @@
     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: "\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 "
+  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.
   ruleID: jboss-eap5-7-java-03000
   when:
     java.referenced:
@@ -86,14 +89,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: "\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 "
+  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.
   ruleID: jboss-eap5-7-java-05000
   when:
     or:
@@ -123,9 +126,10 @@
     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: "\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 "
+  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.
   ruleID: jboss-eap5-7-java-06000
   when:
     or:
@@ -153,9 +157,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: "\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 "
+  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.
   ruleID: jboss-eap5-7-java-07000
   when:
     java.referenced:
@@ -178,8 +183,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.annotation` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.annotation` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08000
   when:
     java.referenced:
@@ -202,8 +208,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.binding` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.binding` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08100
   when:
     java.referenced:
@@ -226,8 +233,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.monitoring` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.monitoring` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08200
   when:
     java.referenced:
@@ -250,8 +258,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.tools.ant` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.tools.ant` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08300
   when:
     java.referenced:
@@ -274,8 +283,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.tools.cmd` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.tools.cmd` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08400
   when:
     java.referenced:
@@ -296,8 +306,9 @@
   - ejb
   - jbossws
   links: []
-  message: "\n This package has been relocated to `org.jboss.ws.api.tools` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.tools` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08500
   when:
     java.referenced:
@@ -320,8 +331,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.util.ServiceLoader`
-    as specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.util.ServiceLoader` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08600
   when:
     java.referenced:
@@ -343,8 +355,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.handler` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.handler` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08700
   when:
     java.referenced:
@@ -367,8 +380,9 @@
   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: "\n This package has been relocated to `org.jboss.ws.api.addressing` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.api.addressing` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08800
   when:
     java.referenced:
@@ -391,8 +405,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as
-    specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.util.DOMUtils` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-08900
   when:
     java.referenced:
@@ -412,8 +427,9 @@
   - ejb
   - jbossws
   links: []
-  message: "\n This package has been relocated to `org.jboss.ws.common` as specified
-    in the\n migration guide.\n "
+  message: |-
+    This package has been relocated to `org.jboss.ws.common` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-09000
   when:
     java.referenced:
@@ -436,8 +452,9 @@
   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: "\n This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig`
-    as specified in the\n migration guide.\n "
+  message: |-
+    This class has been relocated to `org.jboss.ws.api.annotation.EndpointConfig` as specified in the
+     migration guide.
   ruleID: jboss-eap5-7-java-09100
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/69-jboss-eap5-7-xml.windup.yaml b/resources/rulesets/eap7/103-jboss-eap5-7-xml.windup.yaml
similarity index 81%
rename from resources/rulesets/eap7/69-jboss-eap5-7-xml.windup.yaml
rename to resources/rulesets/eap7/103-jboss-eap5-7-xml.windup.yaml
index 74d2ee8..afbd1ef 100644
--- a/resources/rulesets/eap7/69-jboss-eap5-7-xml.windup.yaml
+++ b/resources/rulesets/eap7/103-jboss-eap5-7-xml.windup.yaml
@@ -27,6 +27,32 @@
     builtin.xml:
       namespaces: {}
       xpath: //mbean[@code='org.jboss.cache.TreeCache']
+- customVariables: []
+  description: JBoss 5.x EAR descriptor (jboss-app.xml)
+  labels:
+  - konveyor.io/source=eap5
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - jboss-eap5
+  - ejb
+  - seam
+  links:
+  - title: JBoss DTD's
+    url: http://www.jboss.org/j2ee/dtd/
+  - title: Java EE 7 application descriptor
+    url: http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/application_7.xsd
+  message: "\n                        A JBoss specific EAR descriptor (`jboss-app.xml`)
+    allows extensions to Java EE EAR archives configuration.\n                        You
+    should use now standard `application.xml` descriptor.\n                    "
+  ruleID: jboss-eap5-7-xml-02000
+  tag:
+  - jboss-eap5
+  - JBoss 5.x EAR descriptor (jboss-app.xml)
+  when:
+    builtin.xmlPublicID:
+      namespaces: {}
+      regex: ""
 - category: mandatory
   customVariables: []
   description: JBoss EAP 5 classloader configuration (jboss-classloading.xml)
@@ -112,8 +138,9 @@
     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: "\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 "
+  message: |-
+    `java:/jaas/` is a JBoss EAP `security-domain` URI.
+     Remove the `java:/jaas/` prefix for `security-domain` elements in EAP 7/6.
   ruleID: jboss-eap5-7-xml-14000
   when:
     builtin.xml:
@@ -137,10 +164,9 @@
     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.\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 "
+  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.
   ruleID: jboss-eap5-7-xml-16000
   tag:
   - JBoss security configuration descriptor (login-config.xml)
diff --git a/resources/rulesets/eap7/70-jboss-eap5and6to7-java.windup.yaml b/resources/rulesets/eap7/104-jboss-eap5and6to7-java.windup.yaml
similarity index 97%
rename from resources/rulesets/eap7/70-jboss-eap5and6to7-java.windup.yaml
rename to resources/rulesets/eap7/104-jboss-eap5and6to7-java.windup.yaml
index 0436418..8cf87cf 100644
--- a/resources/rulesets/eap7/70-jboss-eap5and6to7-java.windup.yaml
+++ b/resources/rulesets/eap7/104-jboss-eap5and6to7-java.windup.yaml
@@ -158,9 +158,8 @@
   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: "\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 "
+  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.
   ruleID: jboss-eap5and6to7-java-07000
   when:
     or:
diff --git a/resources/rulesets/eap7/71-jboss-eap5and6to7-xml.windup.yaml b/resources/rulesets/eap7/105-jboss-eap5and6to7-xml.windup.yaml
similarity index 84%
rename from resources/rulesets/eap7/71-jboss-eap5and6to7-xml.windup.yaml
rename to resources/rulesets/eap7/105-jboss-eap5and6to7-xml.windup.yaml
index 5768801..5c293ed 100644
--- a/resources/rulesets/eap7/71-jboss-eap5and6to7-xml.windup.yaml
+++ b/resources/rulesets/eap7/105-jboss-eap5and6to7-xml.windup.yaml
@@ -14,8 +14,8 @@
   - cluster
   - configuration
   links: []
-  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 "
+  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.
   ruleID: jboss-eap5and6to7-xml-37000
   when:
     builtin.xml:
@@ -413,8 +413,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: "\n The EAP 7 Web Session Clustering configuration deprecates `replication-trigger`
-    element in `jboss-web.xml` file descriptor.\n "
+  message: The EAP 7 Web Session Clustering configuration deprecates `replication-trigger`
+    element in `jboss-web.xml` file descriptor.
   ruleID: jboss-eap5and6to7-xml-38000
   when:
     builtin.xml:
@@ -441,8 +441,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: "\n The EAP 7 Web Session Clustering configuration deprecates element `replication-mode`
-    element without replacement in `jboss-web.xml` file descriptor.\n "
+  message: The EAP 7 Web Session Clustering configuration deprecates element `replication-mode`
+    element without replacement in `jboss-web.xml` file descriptor.
   ruleID: jboss-eap5and6to7-xml-38001
   when:
     builtin.xml:
@@ -469,8 +469,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: "\n The EAP 7 Web Session Clustering configuration deprecates `backups`
-    element without replacement in `jboss-web.xml` file descriptor.\n "
+  message: The EAP 7 Web Session Clustering configuration deprecates `backups` element
+    without replacement in `jboss-web.xml` file descriptor.
   ruleID: jboss-eap5and6to7-xml-38002
   when:
     builtin.xml:
@@ -497,12 +497,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: "\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 "
+  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.
   ruleID: jboss-eap5and6to7-xml-38003
   when:
     builtin.xml:
@@ -530,14 +530,13 @@
   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: "\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.\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 "
+  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 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.
   ruleID: jboss-eap5and6to7-xml-38004
   when:
     builtin.xml:
@@ -564,10 +563,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: "\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 "
+  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.
   ruleID: jboss-eap5and6to7-xml-38005
   when:
     builtin.xml:
@@ -594,10 +593,9 @@
   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: "\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 "
+  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.
   ruleID: jboss-eap5and6to7-xml-38006
   when:
     builtin.xml:
@@ -625,10 +623,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: "\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 "
+  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.
   ruleID: jboss-eap5and6to7-xml-38007
   when:
     builtin.xml:
@@ -655,15 +655,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: "\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.\n\n
-    * `use-session-passivation` enabled the passivation, but now passivation is enabled
-    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.\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`.\n "
+  message: |-
+    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`.
   ruleID: jboss-eap5and6to7-xml-39000
   when:
     builtin.xml:
@@ -690,14 +689,13 @@
   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: "\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/>`.\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/>`,\n
-    then the oldest session known to the session manager will passivate to make room
-    for the new session.\n "
+  message: |-
+    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.
   ruleID: jboss-eap5and6to7-xml-40000
   when:
     builtin.xml:
diff --git a/resources/rulesets/eap7/72-resteasy.windup.yaml b/resources/rulesets/eap7/106-resteasy.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/72-resteasy.windup.yaml
rename to resources/rulesets/eap7/106-resteasy.windup.yaml
diff --git a/resources/rulesets/eap7/73-eap6-xml.windup.yaml b/resources/rulesets/eap7/107-eap6-xml.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/73-eap6-xml.windup.yaml
rename to resources/rulesets/eap7/107-eap6-xml.windup.yaml
diff --git a/resources/rulesets/eap7/108-eap6.windup.yaml b/resources/rulesets/eap7/108-eap6.windup.yaml
new file mode 100644
index 0000000..8144afc
--- /dev/null
+++ b/resources/rulesets/eap7/108-eap6.windup.yaml
@@ -0,0 +1,166 @@
+- category: mandatory
+  customVariables: []
+  description: Remote JNDI Provider URL has changed in EAP 7
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - jndi
+  - configuration
+  - ejb
+  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 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
+     ```
+  ruleID: eap6-08000
+  when:
+    builtin.filecontent:
+      filePattern: .*\.(java|properties|xml)
+      pattern: remote://.*:\d*
+- category: mandatory
+  customVariables: []
+  description: jboss-ejb-client.properties - Default Remote Connection Port changes
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - jndi
+  - configuration
+  - ejb
+  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
+     ```
+  ruleID: eap6-08001
+  when:
+    builtin.filecontent:
+      filePattern: jboss-ejb-client\.properties
+      pattern: remote.connection..*.port(.*(?!8080)\d{4})
+- category: mandatory
+  customVariables: []
+  description: Java - Default Remote Connection Port has changed in EAP 7
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - jndi
+  - configuration
+  - ejb
+  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");
+     ```
+  ruleID: eap6-08002
+  when:
+    builtin.filecontent:
+      filePattern: .*\.java
+      pattern: remote.connection..*.port(.*(?!8080)\d{4})
+- category: mandatory
+  customVariables: []
+  description: JSF FaceletContext.FACELET_CONTEXT_KEY changed value
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - jsf
+  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.
+  ruleID: eap6-11000
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: com.sun.faces.facelets.FACELET_CONTEXT
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: FaceletContext.FACELET_CONTEXT_KEY
+- category: mandatory
+  customVariables: []
+  description: HTTPS URL hostname check against a service’s Common Name (CN) changed
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7+
+  - konveyor.io/target=eap
+  - certificate
+  - https
+  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
+    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.
+  ruleID: eap6-12000
+  when:
+    builtin.filecontent:
+      filePattern: .*\.(java|properties|xml|cmd|sh|bat)
+      pattern: org.jboss.security.ignoreHttpsHost
diff --git a/resources/rulesets/eap7/75-hibernate4-xml.windup.yaml b/resources/rulesets/eap7/109-hibernate4-xml.windup.yaml
similarity index 81%
rename from resources/rulesets/eap7/75-hibernate4-xml.windup.yaml
rename to resources/rulesets/eap7/109-hibernate4-xml.windup.yaml
index 2e04d51..16d24c7 100644
--- a/resources/rulesets/eap7/75-hibernate4-xml.windup.yaml
+++ b/resources/rulesets/eap7/109-hibernate4-xml.windup.yaml
@@ -19,20 +19,16 @@
     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: "\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.\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.\n "
+  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`, 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.
   ruleID: hibernate4-xml-00001
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/eap7/76-hibernate4.windup.yaml b/resources/rulesets/eap7/110-hibernate4.windup.yaml
similarity index 94%
rename from resources/rulesets/eap7/76-hibernate4.windup.yaml
rename to resources/rulesets/eap7/110-hibernate4.windup.yaml
index 688c315..f5af9d7 100644
--- a/resources/rulesets/eap7/76-hibernate4.windup.yaml
+++ b/resources/rulesets/eap7/110-hibernate4.windup.yaml
@@ -462,15 +462,16 @@
     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: "\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.\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 "
+  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:
+
+     * 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)()`
   ruleID: hibernate4-00018
   when:
     java.referenced:
@@ -661,8 +662,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: "\n All functionality from `org.hibernate.cfg.AnnotationConfiguration`
-    has been moved to `org.hibernate.cfg.Configuration`.\n "
+  message: All functionality from `org.hibernate.cfg.AnnotationConfiguration` has
+    been moved to `org.hibernate.cfg.Configuration`.
   ruleID: hibernate4-00027
   when:
     java.referenced:
@@ -791,10 +792,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_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.\n Check if you implement method `integrate(Configuration
-    configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry
-    serviceRegistry)` which is no longer there.\n "
+  message: |-
+    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.
   ruleID: hibernate4-00033
   when:
     java.referenced:
@@ -985,19 +985,13 @@
   - configuration
   - Hibernate
   links: []
-  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 "
+  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`).
   ruleID: hibernate4-00039
   when:
     or:
diff --git a/resources/rulesets/eap7/77-hsearch.windup.yaml b/resources/rulesets/eap7/111-hsearch.windup.yaml
similarity index 95%
rename from resources/rulesets/eap7/77-hsearch.windup.yaml
rename to resources/rulesets/eap7/111-hsearch.windup.yaml
index 485c766..5521249 100644
--- a/resources/rulesets/eap7/77-hsearch.windup.yaml
+++ b/resources/rulesets/eap7/111-hsearch.windup.yaml
@@ -502,10 +502,9 @@
     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.\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. "
+  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 keys are determined automatically based on the filter parameters so it is no longer required to provide a key object.
   ruleID: hsearch-00109
   when:
     java.referenced:
@@ -682,11 +681,15 @@
     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: "\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 "
+  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)
+     ```
   ruleID: hsearch-00115
   when:
     java.referenced:
@@ -716,27 +719,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: "\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\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\n encoding. You can keep the old string-based
-    index format by explicitly specifying a string encoding field bridge. In the case
-    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 "
+  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 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.
   ruleID: hsearch-00116
   when:
     or:
@@ -770,11 +773,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: 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
-    index, the type of the marker must be compatible with all other values that are
-    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. "
+  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.
   ruleID: hsearch-00117
   when:
     java.referenced:
@@ -799,7 +801,7 @@
   - title: Miscellaneous 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
   - title: Lucene native faceting
-    url: http://in.relation.to/2015/05/11/hibernate-search-530-beta-1-with-native-lucene-faceting
+    url: https://in.relation.to/2015/05/11/hibernate-search-530-beta-1-with-native-lucene-faceting/
   - title: Query faceting
     url: http://docs.jboss.org/hibernate/search/5.5/reference/en-US/html_single/#query-faceting
   message: Significant improvements were made to the faceting engine. Most of the
@@ -920,12 +922,18 @@
     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: "\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.\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 "
+  message: |-
+    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)))
+    ```
   ruleID: hsearch-00210
   when:
     java.referenced:
@@ -1133,9 +1141,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:
diff --git a/resources/rulesets/eap7/78-jax-ws.windup.yaml b/resources/rulesets/eap7/112-jax-ws.windup.yaml
similarity index 89%
rename from resources/rulesets/eap7/78-jax-ws.windup.yaml
rename to resources/rulesets/eap7/112-jax-ws.windup.yaml
index 72a6ce8..f13143f 100644
--- a/resources/rulesets/eap7/78-jax-ws.windup.yaml
+++ b/resources/rulesets/eap7/112-jax-ws.windup.yaml
@@ -8,13 +8,12 @@
   - konveyor.io/source
   - jax-ws
   links: []
-  message: "\n \n EAP 7 uses JAX-WS 2.2 style constructors with the `javax.xml.ws.WebServiceFeature`
+  message: "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). \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;)\n
-    \n "
+    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;)"
   ruleID: jax-ws-00000
   when:
     or:
diff --git a/resources/rulesets/eap7/79-resteasy.windup.yaml b/resources/rulesets/eap7/113-resteasy.windup.yaml
similarity index 96%
rename from resources/rulesets/eap7/79-resteasy.windup.yaml
rename to resources/rulesets/eap7/113-resteasy.windup.yaml
index cac443b..86f6e8a 100644
--- a/resources/rulesets/eap7/79-resteasy.windup.yaml
+++ b/resources/rulesets/eap7/113-resteasy.windup.yaml
@@ -18,9 +18,9 @@
   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.\n Use `org.jboss.resteasy.client.jaxrs.cache`
-    package instead of `org.jboss.resteasy.client.cache`.\n "
+  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`.
   ruleID: resteasy-eap6-000001
   when:
     java.referenced:
@@ -42,17 +42,27 @@
   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: "\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.\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 "
+  message: |-
+    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");
+     ```
   ruleID: resteasy-eap6-000002
   when:
     java.referenced:
@@ -121,10 +131,12 @@
   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: "\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 "
+  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.
   ruleID: resteasy-eap6-000005
   when:
     java.referenced:
@@ -1165,7 +1177,7 @@
     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 "
+    in that file and your application."
   ruleID: resteasy-eap6-000140
   when:
     java.referenced:
@@ -1191,7 +1203,7 @@
     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.\n "
+    string."
   ruleID: resteasy-eap6-000141
   when:
     or:
@@ -1229,7 +1241,7 @@
     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 "
+    behavior."
   ruleID: resteasy-eap6-000142
   when:
     or:
diff --git a/resources/rulesets/eap7/80-ws-security.windup.yaml b/resources/rulesets/eap7/114-ws-security.windup.yaml
similarity index 75%
rename from resources/rulesets/eap7/80-ws-security.windup.yaml
rename to resources/rulesets/eap7/114-ws-security.windup.yaml
index a93ca92..e4dd855 100644
--- a/resources/rulesets/eap7/80-ws-security.windup.yaml
+++ b/resources/rulesets/eap7/114-ws-security.windup.yaml
@@ -12,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: "\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 "
+  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.
   ruleID: ws-security-00000
   when:
     java.referenced:
@@ -37,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: "\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 "
+  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.
   ruleID: ws-security-00001
   when:
     java.referenced:
@@ -59,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: "\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 "
+  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.
   ruleID: ws-security-00002
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/81-hibernate50-51.windup.yaml b/resources/rulesets/eap7/115-hibernate50-51.windup.yaml
similarity index 72%
rename from resources/rulesets/eap7/81-hibernate50-51.windup.yaml
rename to resources/rulesets/eap7/115-hibernate50-51.windup.yaml
index 0aea64c..c629be8 100644
--- a/resources/rulesets/eap7/81-hibernate50-51.windup.yaml
+++ b/resources/rulesets/eap7/115-hibernate50-51.windup.yaml
@@ -16,11 +16,10 @@
   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: "\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.\n "
+  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` instance by specifying the `hibernate.create_empty_composites.enabled` opt-in setting.
   ruleID: hibernate50-51-00000
   when:
     java.referenced:
@@ -44,10 +43,13 @@
   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: "\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 "
+  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.
   ruleID: hibernate50-51-00100
   when:
     or:
diff --git a/resources/rulesets/eap7/82-hibernate51-53.windup.yaml b/resources/rulesets/eap7/116-hibernate51-53.windup.yaml
similarity index 95%
rename from resources/rulesets/eap7/82-hibernate51-53.windup.yaml
rename to resources/rulesets/eap7/116-hibernate51-53.windup.yaml
index f82cac2..edd83d5 100644
--- a/resources/rulesets/eap7/82-hibernate51-53.windup.yaml
+++ b/resources/rulesets/eap7/116-hibernate51-53.windup.yaml
@@ -41,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:
@@ -89,8 +89,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/#exception_handling_changes_between_51_53
-  message: |2-
-     If the `SessionFactory` is built via Hibernate’s native bootstrapping and `org.hibernate.HibernateException` or a subclass is referenced by the application
+  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`.
   ruleID: hibernate51-53-00300
   when:
@@ -229,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: "\n Depending on the type of region, the appropriate method should be used
+  message: "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\n * For a natural ID region,
     `org.hibernate.engine.spi.SessionFactoryImplementor.getMetamodel().entityPersister(
-    entityName ).getNaturalIdCacheAccessStrategy()` should be used instead\n "
+    entityName ).getNaturalIdCacheAccessStrategy()` should be used instead"
   ruleID: hibernate51-53-00404
   when:
     java.referenced:
@@ -308,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: "\n `org.hibernate.engine.spi.SessionFactoryImplementor.getCache().getCacheRegionNames()`
+  message: '`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.\n "
+    regionName)` should be used to look up each region.'
   ruleID: hibernate51-53-00407
   when:
     java.referenced:
@@ -365,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: "\n One potential upgrade concern is any custom `org.hibernate.cache.spi.QueryCacheFactory`
+  message: "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 "
+    \n Details can be found in HHH-11356 JIRA issue (link below)."
   ruleID: hibernate51-53-00600
   when:
     java.referenced:
@@ -401,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: "\n A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`
+  message: "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. \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 "
+    anyway. \n Details can be found in HHH-11356 JIRA issue (link below)."
   ruleID: hibernate51-53-00700
   when:
     java.referenced:
@@ -425,12 +425,12 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: "\n A change to be aware of is accessing cache entries via `NaturalIdCacheStatistics.getEntries()`.
+  message: "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 "
+    be found in HHH-11356 JIRA issue (link below)."
   ruleID: hibernate51-53-00701
   when:
     java.referenced:
@@ -450,12 +450,12 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: "\n A change to be aware of is accessing cache entries via `SecondLevelCacheStatistics.getEntries()`.
+  message: "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 "
+    be found in HHH-11356 JIRA issue (link below)."
   ruleID: hibernate51-53-00702
   when:
     java.referenced:
@@ -482,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: "\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 "
+  message: "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."
   ruleID: hibernate51-53-00800
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/83-picketlink25.windup.yaml b/resources/rulesets/eap7/117-picketlink25.windup.yaml
similarity index 69%
rename from resources/rulesets/eap7/83-picketlink25.windup.yaml
rename to resources/rulesets/eap7/117-picketlink25.windup.yaml
index 334ce2f..159a5da 100644
--- a/resources/rulesets/eap7/83-picketlink25.windup.yaml
+++ b/resources/rulesets/eap7/117-picketlink25.windup.yaml
@@ -11,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: "\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 "
+  message: "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."
   ruleID: picketlink25-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/84-resteasy30-36.windup.yaml b/resources/rulesets/eap7/118-resteasy30-36.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/84-resteasy30-36.windup.yaml
rename to resources/rulesets/eap7/118-resteasy30-36.windup.yaml
diff --git a/resources/rulesets/eap7/85-deprecated-singletonpolicy.rhamt.yaml b/resources/rulesets/eap7/119-deprecated-singletonpolicy.rhamt.yaml
similarity index 100%
rename from resources/rulesets/eap7/85-deprecated-singletonpolicy.rhamt.yaml
rename to resources/rulesets/eap7/119-deprecated-singletonpolicy.rhamt.yaml
diff --git a/resources/rulesets/eap7/86-maven-artemis-jms-client.rhamt.yaml b/resources/rulesets/eap7/120-maven-artemis-jms-client.rhamt.yaml
similarity index 100%
rename from resources/rulesets/eap7/86-maven-artemis-jms-client.rhamt.yaml
rename to resources/rulesets/eap7/120-maven-artemis-jms-client.rhamt.yaml
diff --git a/resources/rulesets/eap7/87-maven-javax-to-jakarta.rhamt.yaml b/resources/rulesets/eap7/121-maven-javax-to-jakarta.rhamt.yaml
similarity index 100%
rename from resources/rulesets/eap7/87-maven-javax-to-jakarta.rhamt.yaml
rename to resources/rulesets/eap7/121-maven-javax-to-jakarta.rhamt.yaml
diff --git a/resources/rulesets/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml b/resources/rulesets/eap7/122-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
similarity index 100%
rename from resources/rulesets/eap7/88-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
rename to resources/rulesets/eap7/122-maven-jboss-rmi-api_1.0_spec.rhamt.yaml
diff --git a/resources/rulesets/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml b/resources/rulesets/eap7/123-move-to-microprofile-rest-client-1.3.rhamt.yaml
similarity index 100%
rename from resources/rulesets/eap7/89-move-to-microprofile-rest-client-1.3.rhamt.yaml
rename to resources/rulesets/eap7/123-move-to-microprofile-rest-client-1.3.rhamt.yaml
diff --git a/resources/rulesets/eap7/90-singleton-sessionbean.rhamt.yaml b/resources/rulesets/eap7/124-singleton-sessionbean.rhamt.yaml
similarity index 58%
rename from resources/rulesets/eap7/90-singleton-sessionbean.rhamt.yaml
rename to resources/rulesets/eap7/124-singleton-sessionbean.rhamt.yaml
index ecec539..a293cf6 100644
--- a/resources/rulesets/eap7/90-singleton-sessionbean.rhamt.yaml
+++ b/resources/rulesets/eap7/124-singleton-sessionbean.rhamt.yaml
@@ -7,13 +7,13 @@
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  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`
+  message: "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 "
+    ejbRemove(); \n \n void ejbActivate(); \n \n void ejbPassivate(); \n ```"
   ruleID: singleton-sessionbean-00001
   when:
     or:
diff --git a/resources/rulesets/eap7/91-microprofile_removed_from_eap.mta.yaml b/resources/rulesets/eap7/125-microprofile_removed_from_eap.mta.yaml
similarity index 100%
rename from resources/rulesets/eap7/91-microprofile_removed_from_eap.mta.yaml
rename to resources/rulesets/eap7/125-microprofile_removed_from_eap.mta.yaml
diff --git a/resources/rulesets/eap7/126-elytron.windup.yaml b/resources/rulesets/eap7/126-elytron.windup.yaml
new file mode 100644
index 0000000..e203de4
--- /dev/null
+++ b/resources/rulesets/eap7/126-elytron.windup.yaml
@@ -0,0 +1,40 @@
+- category: potential
+  customVariables: []
+  description: Migrate a Naming Client Configuration to Elytron
+  effort: 3
+  labels:
+  - konveyor.io/source=eap7.1-
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7.1+
+  - konveyor.io/target=eap
+  - eap7
+  links:
+  - title: Migrate a Naming Client Configuration to Elytron
+    url: https://access.redhat.com/documentation/es-es/red_hat_jboss_enterprise_application_platform/7.2/html/migration_guide/migrating_to_elytron#migrate_naming_client_configuration_to_elytron
+  message: Migrate a client application that performs a remote JNDI lookup using an
+    `org.jboss.naming.remote.client.InitialContext` class, which is backed by an `org.jboss.naming.remote.client.InitialContextFactory`
+    class, to Elytron.
+  ruleID: elytron-eap71-00000
+  when:
+    builtin.filecontent:
+      filePattern: ""
+      pattern: '"org.jboss.naming.remote.client.InitialContextFactory"'
+- category: potential
+  customVariables: []
+  description: Migrate an EJB Client to Elytron
+  effort: 3
+  labels:
+  - konveyor.io/source=eap7.1-
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap7.1+
+  - konveyor.io/target=eap
+  - eap7
+  links:
+  - title: Migrate an EJB Client to Elytron
+    url: https://access.redhat.com/documentation/es-es/red_hat_jboss_enterprise_application_platform/7.2/html/migration_guide/migrating_to_elytron#migrate_security_ejb_client_to_elytron
+  message: Remote EJB client must be configured following one of the two options defined
+    in the link below.
+  ruleID: elytron-eap71-00010
+  when:
+    builtin.file:
+      pattern: jboss-ejb-client\.properties
diff --git a/resources/rulesets/eap7/92-embedded-framework-libraries.windup.yaml b/resources/rulesets/eap7/127-embedded-framework-libraries.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/92-embedded-framework-libraries.windup.yaml
rename to resources/rulesets/eap7/127-embedded-framework-libraries.windup.yaml
diff --git a/resources/rulesets/eap6/46-ignore-references.windup.yaml b/resources/rulesets/eap7/128-java-wsdl-mapping.yaml
similarity index 100%
rename from resources/rulesets/eap6/46-ignore-references.windup.yaml
rename to resources/rulesets/eap7/128-java-wsdl-mapping.yaml
diff --git a/resources/rulesets/eap6/48-weblogic-catchall.windup.yaml b/resources/rulesets/eap7/129-weblogic-catchall.windup.yaml
similarity index 75%
rename from resources/rulesets/eap6/48-weblogic-catchall.windup.yaml
rename to resources/rulesets/eap7/129-weblogic-catchall.windup.yaml
index 68b22e2..65011c8 100644
--- a/resources/rulesets/eap6/48-weblogic-catchall.windup.yaml
+++ b/resources/rulesets/eap7/129-weblogic-catchall.windup.yaml
@@ -1,23 +1,23 @@
 - category: potential
   customVariables:
-  - name: prefix
-    nameOfCaptureGroup: prefix
-    pattern: (?P<prefix>(com\.weblogic[^.]*\.)|(com\.bea[^.]*\.)|(bea\.)|(weblogic\.))?(?P<remainder>.*)
   - 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
   effort: 0
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: weblogic-catchall-01000
   when:
     java.referenced:
@@ -32,15 +32,15 @@
   effort: 0
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: weblogic-catchall-02000
   when:
     java.referenced:
@@ -58,14 +58,14 @@
   effort: 0
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: "\n This is an Oracle proprietary type (`com.tangosol{{subpackage}}.{{type}}`)
+  message: 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.\n "
+    about this type.
   ruleID: weblogic-catchall-03000
   when:
     java.referenced:
@@ -86,14 +86,14 @@
   effort: 0
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  message: "\n This is an Oracle proprietary type (`{{com}}oracle{{subpackage}}.{{type}}`)
+  message: 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.\n "
+    about this type.
   ruleID: weblogic-catchall-06000
   when:
     java.referenced:
@@ -108,13 +108,15 @@
   effort: 0
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  message: |-
+    This is an Oracle proprietary JDBC type (`oracle.sql.{{remainder}}`).
+
+     It should be replaced by standard Java EE JCA, datasource and JDBC types.
   ruleID: weblogic-catchall-06500
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/49-weblogic-ejb.windup.yaml b/resources/rulesets/eap7/130-weblogic-ejb.windup.yaml
similarity index 86%
rename from resources/rulesets/eap6/49-weblogic-ejb.windup.yaml
rename to resources/rulesets/eap7/130-weblogic-ejb.windup.yaml
index ae4fafa..f96129a 100644
--- a/resources/rulesets/eap6/49-weblogic-ejb.windup.yaml
+++ b/resources/rulesets/eap7/130-weblogic-ejb.windup.yaml
@@ -7,13 +7,13 @@
   effort: 1
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap7+
   - konveyor.io/target=eap
   - ejb
   - weblogic
   links: []
-  message: "\n This application contains WebLogic EJBs probably generated by the WebLogic
-    Server EJB tools.\n "
+  message: This application contains WebLogic EJBs probably generated by the WebLogic
+    Server EJB tools.
   ruleID: weblogic-ejb-01000
   when:
     java.referenced:
@@ -25,7 +25,7 @@
   effort: 3
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap7+
   - konveyor.io/target=eap
   - ejb
   - weblogic
@@ -38,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: "\n This application contains WebLogic proprietary `weblogic.javaee.TransactionTimeoutSeconds`
-    annotation.\n "
+  message: This application contains WebLogic proprietary `weblogic.javaee.TransactionTimeoutSeconds`
+    annotation.
   ruleID: weblogic-ejb-02000
   when:
     java.referenced:
@@ -51,7 +51,7 @@
   effort: 3
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap7+
   - konveyor.io/target=eap
   - ejb
   - weblogic
@@ -60,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: "\n This application contains WebLogic proprietary `weblogic.ejbgen.MessageDriven`
-    annotation.\n "
+  message: This application contains WebLogic proprietary `weblogic.ejbgen.MessageDriven`
+    annotation.
   ruleID: weblogic-ejb-03000
   when:
     java.referenced:
@@ -76,7 +76,7 @@
   effort: 3
   labels:
   - konveyor.io/source=weblogic
-  - konveyor.io/target=eap6+
+  - konveyor.io/target=eap7+
   - konveyor.io/target=eap
   - ejb
   - weblogic
@@ -91,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: "\n This class extends `weblogic.ejb.{{type}}` that needs to be removed.\n "
+  message: This class extends `weblogic.ejb.{{type}}` that needs to be removed.
   ruleID: weblogic-ejb-04000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/47-java-wsdl-mapping.yaml b/resources/rulesets/eap7/131-weblogic-ignore-references.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/47-java-wsdl-mapping.yaml
rename to resources/rulesets/eap7/131-weblogic-ignore-references.windup.yaml
diff --git a/resources/rulesets/eap7/94-weblogic-jms.windup.yaml b/resources/rulesets/eap7/132-weblogic-jms.windup.yaml
similarity index 67%
rename from resources/rulesets/eap7/94-weblogic-jms.windup.yaml
rename to resources/rulesets/eap7/132-weblogic-jms.windup.yaml
index b9a0c98..b816ec9 100644
--- a/resources/rulesets/eap7/94-weblogic-jms.windup.yaml
+++ b/resources/rulesets/eap7/132-weblogic-jms.windup.yaml
@@ -3,6 +3,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
@@ -27,16 +28,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Session
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEN
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-01000
   when:
     java.referenced:
@@ -48,14 +52,18 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Queue Browser
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEY
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-02000
   when:
     java.referenced:
@@ -67,14 +75,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Message Producer
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEO
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-03000
   when:
     java.referenced:
@@ -86,14 +99,18 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Message Consumer
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEP
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-04000
   when:
     java.referenced:
@@ -105,14 +122,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Connections
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEM
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-05000
   when:
     java.referenced:
@@ -122,20 +144,25 @@
   - name: type
     nameOfCaptureGroup: type
     pattern: oracle.jms.AQjms(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
-  description: Oracle JMS messages references should be replaced with the Java EE standard API
+  description: Oracle JMS {type}Message
   effort: 1
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Message API
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCES
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-06000
   when:
     java.referenced:
@@ -147,15 +174,20 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Destinations
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEL
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-07000
   when:
     java.referenced:
@@ -170,15 +202,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - jms
   - weblogic
   links:
   - title: Java EE 7 - JMS Connection factories
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEK
-  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 "
+  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`.
   ruleID: weblogic-jms-eap7-08000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/95-weblogic-services.windup.yaml b/resources/rulesets/eap7/133-weblogic-services.windup.yaml
similarity index 72%
rename from resources/rulesets/eap7/95-weblogic-services.windup.yaml
rename to resources/rulesets/eap7/133-weblogic-services.windup.yaml
index 613b5d9..d86bc34 100644
--- a/resources/rulesets/eap7/95-weblogic-services.windup.yaml
+++ b/resources/rulesets/eap7/133-weblogic-services.windup.yaml
@@ -5,6 +5,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - startup
@@ -27,16 +28,17 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - webservice
   links:
   - title: Java EE Tutorial - @Singleton Session Bean
     url: https://docs.oracle.com/javaee/7/tutorial/ejb-intro002.htm#GIPIM
-  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 "
+  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.
   ruleID: weblogic-services-eap7-02000
   when:
     java.referenced:
@@ -51,15 +53,17 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - logging
   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: "\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 "
+  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.
   ruleID: weblogic-services-eap7-03000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/96-weblogic-webapp.windup.yaml b/resources/rulesets/eap7/134-weblogic-webapp.windup.yaml
similarity index 71%
rename from resources/rulesets/eap7/96-weblogic-webapp.windup.yaml
rename to resources/rulesets/eap7/134-weblogic-webapp.windup.yaml
index c030605..0f55c3d 100644
--- a/resources/rulesets/eap7/96-weblogic-webapp.windup.yaml
+++ b/resources/rulesets/eap7/134-weblogic-webapp.windup.yaml
@@ -5,6 +5,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -28,6 +29,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -35,10 +37,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  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 "
+  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.
   ruleID: weblogic-webapp-eap7-02000
   when:
     java.referenced:
@@ -51,6 +53,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -58,10 +61,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  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 "
+  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.
   ruleID: weblogic-webapp-eap7-03000
   when:
     java.referenced:
@@ -74,6 +77,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -81,10 +85,10 @@
   links:
   - title: Migrate WebLogic Proprietary Servlet Annotations
     url: https://access.redhat.com/articles/1249423
-  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 "
+  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.
   ruleID: weblogic-webapp-eap7-04000
   when:
     java.referenced:
@@ -97,6 +101,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -108,13 +113,10 @@
     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: "\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.\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.\n \n "
+  message: |-
+    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.
   ruleID: weblogic-webapp-eap7-05000
   when:
     or:
@@ -134,6 +136,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -146,11 +149,10 @@
     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: "\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.\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.\n \n "
+  message: |-
+    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.
   ruleID: weblogic-webapp-eap7-06000
   when:
     or:
@@ -167,6 +169,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -186,6 +189,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -207,6 +211,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - web-app
   - weblogic
@@ -214,12 +219,10 @@
   links:
   - title: Migrate Oracle WebLogic programmatic login to JBoss EAP 7
     url: https://access.redhat.com/articles/1329213
-  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 "
+  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.
   ruleID: weblogic-webapp-eap7-09000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/97-weblogic-webservices.windup.yaml b/resources/rulesets/eap7/135-weblogic-webservices.windup.yaml
similarity index 63%
rename from resources/rulesets/eap7/97-weblogic-webservices.windup.yaml
rename to resources/rulesets/eap7/135-weblogic-webservices.windup.yaml
index 6513009..f36ec18 100644
--- a/resources/rulesets/eap7/97-weblogic-webservices.windup.yaml
+++ b/resources/rulesets/eap7/135-weblogic-webservices.windup.yaml
@@ -5,18 +5,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
   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: "\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 "
+  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.
   ruleID: weblogic-webservices-eap7-01000
   when:
     java.referenced:
@@ -29,6 +30,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
@@ -38,10 +40,10 @@
     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: "\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 "
+  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).
   ruleID: weblogic-webservices-eap7-02000
   when:
     java.referenced:
@@ -53,6 +55,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
@@ -60,14 +63,19 @@
   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: "\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 "
+  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");
+     ```
   ruleID: weblogic-webservices-eap7-03000
   when:
     java.referenced:
@@ -80,6 +88,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
@@ -87,10 +96,15 @@
   links:
   - title: javax.xml.WebServiceContext Documentation
     url: http://docs.oracle.com/javaee/7/api/javax/xml/ws/WebServiceContext.html
-  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.\n\n Example code:\n\n ```java\n @Resource\n
-    private WebServiceContext webServiceContext;\n ```\n \n "
+  message: |-
+    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;
+     ```
   ruleID: weblogic-webservices-eap7-04000
   when:
     java.referenced:
@@ -102,13 +116,14 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
   - context
   links: []
-  message: "\n This exception (`weblogic.wsee.context.ContextNotFoundException`) is
-    WebLogic specific and can be removed.\n "
+  message: This exception (`weblogic.wsee.context.ContextNotFoundException`) is WebLogic
+    specific and can be removed.
   ruleID: weblogic-webservices-eap7-05000
   when:
     java.referenced:
@@ -120,6 +135,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
@@ -133,10 +149,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: "\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 "
+  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.
   ruleID: weblogic-webservices-eap7-06000
   when:
     or:
@@ -153,6 +169,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - webservice
   - weblogic
@@ -161,8 +178,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: "\n \n Replace WebLogic proprietary web-service annotation `@Transactional`
-    by the standard Java EE annotation `@TransactionAttribute`.\n \n "
+  message: Replace WebLogic proprietary web-service annotation `@Transactional` by
+    the standard Java EE annotation `@TransactionAttribute`.
   ruleID: weblogic-webservices-07000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/98-weblogic-xml-descriptors.windup.yaml b/resources/rulesets/eap7/136-weblogic-xml-descriptors.windup.yaml
similarity index 87%
rename from resources/rulesets/eap7/98-weblogic-xml-descriptors.windup.yaml
rename to resources/rulesets/eap7/136-weblogic-xml-descriptors.windup.yaml
index 08d4cfe..47760b6 100644
--- a/resources/rulesets/eap7/98-weblogic-xml-descriptors.windup.yaml
+++ b/resources/rulesets/eap7/136-weblogic-xml-descriptors.windup.yaml
@@ -3,6 +3,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -32,6 +33,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -60,6 +62,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -71,14 +74,10 @@
   - 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: "\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 "
+  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.
   ruleID: weblogic-xml-descriptor-eap7-03000
   when:
     builtin.xml:
@@ -91,6 +90,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -126,6 +126,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -149,6 +150,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -169,6 +171,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -189,6 +192,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -212,14 +216,15 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - 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.\n "
+    product documentation for more information.
   ruleID: weblogic-xml-descriptor-eap7-10000
   when:
     and:
@@ -241,6 +246,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -269,6 +275,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -300,11 +307,31 @@
         wlso: http://xmlns.oracle.com/weblogic/weblogic-web-app
       xpath: /bea:weblogic-web-app | /wlso:weblogic-web-app | /wls:weblogic-web-app
         | /weblogic-web-app
+- customVariables: []
+  description: WebLogic RMI XML version 1.x
+  labels:
+  - konveyor.io/source=weblogic
+  - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
+  - konveyor.io/target=eap
+  - weblogic
+  - descriptor
+  - configuration
+  links: []
+  ruleID: weblogic-xml-descriptor-eap7-13000
+  tag:
+  - weblogic
+  - WebLogic RMI XML version 1.x
+  when:
+    builtin.xmlPublicID:
+      namespaces: {}
+      regex: ""
 - customVariables: []
   description: WebLogic web service type mapping
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -325,6 +352,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -347,6 +375,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -370,6 +399,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -393,6 +423,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -420,6 +451,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - descriptor
@@ -433,10 +465,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: "\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 "
+  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. \n\n In JBoss EAP 6+, you can achieve the
+    same behavior by using the `TransactionTimeout` annotation."
   ruleID: weblogic-xml-descriptor-19000
   when:
     builtin.xml:
diff --git a/resources/rulesets/eap7/99-weblogic.windup.yaml b/resources/rulesets/eap7/137-weblogic.windup.yaml
similarity index 70%
rename from resources/rulesets/eap7/99-weblogic.windup.yaml
rename to resources/rulesets/eap7/137-weblogic.windup.yaml
index 914dc23..e0e5adb 100644
--- a/resources/rulesets/eap7/99-weblogic.windup.yaml
+++ b/resources/rulesets/eap7/137-weblogic.windup.yaml
@@ -5,6 +5,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - scheduler
@@ -13,8 +14,7 @@
   links:
   - title: Java EE 7 - Using TimerService
     url: https://docs.oracle.com/javaee/7/tutorial/ejb-basicexamples004.htm
-  message: "\n \n WebLogic scheduled jobs should be migrated to use the standard EJB
-    `javax.ejb.TimerService`.\n \n "
+  message: WebLogic scheduled jobs should be migrated to use the standard EJB `javax.ejb.TimerService`.
   ruleID: weblogic-eap7-01000
   tag:
   - scheduler
@@ -33,6 +33,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   links:
@@ -42,7 +43,7 @@
   ruleID: weblogic-eap7-02000
   when:
     java.referenced:
-      location: PACKAGE
+      location: IMPORT
       pattern: weblogic.utils.StringUtils*
 - category: mandatory
   customVariables: []
@@ -51,11 +52,12 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   links: []
-  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 "
+  message: Code using this package should be replaced with code using the org.apache.xml
+    package from [Apache Xerces](http://xerces.apache.org/).
   ruleID: weblogic-eap7-03000
   when:
     java.referenced:
@@ -71,6 +73,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - transactions
@@ -91,6 +94,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - transactions
@@ -119,6 +123,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - transactions
@@ -146,6 +151,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - transactions
@@ -165,14 +171,19 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - transactions
   links: []
-  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 "
+  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");
+     ```
   ruleID: weblogic-eap7-08000
   when:
     java.referenced:
@@ -185,6 +196,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - jdbc
@@ -193,8 +205,8 @@
     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: "\n This Oracle and WebLogic proprietary code (`OracleThinClob`) should
-    be replaced with the use of the java.sql.Clob interface.\n "
+  message: This Oracle and WebLogic proprietary code (`OracleThinClob`) should be
+    replaced with the use of the java.sql.Clob interface.
   ruleID: weblogic-eap7-09000
   when:
     java.referenced:
@@ -206,6 +218,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - jdbc
@@ -214,7 +227,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: "\n This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`\n "
+  message: This code is specific to WebLogic and should be replaced with `java.sql.Clob.setCharacterStream(1)`
   ruleID: weblogic-eap7-10000
   when:
     java.referenced:
@@ -227,6 +240,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - logging
@@ -235,10 +249,14 @@
     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: "\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 "
+  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");
+     ```
   ruleID: weblogic-eap7-11000
   when:
     or:
@@ -255,18 +273,20 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - jdbc
   links:
   - title: Implement Oracle Fast Connection Failover (FCF) in EAP
     url: https://access.redhat.com/articles/1329233
-  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:\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 "
+  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, 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>
+     ```
   ruleID: weblogic-eap7-12000
   when:
     builtin.xml:
@@ -279,21 +299,17 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   links:
   - title: Replace WebLogic side-by-side production redeployment in EAP 6
     url: https://access.redhat.com/articles/1329253
-  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 "
+  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.
   ruleID: weblogic-eap7-13000
   when:
     builtin.filecontent:
@@ -306,15 +322,16 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   links:
   - title: Replace WebLogic Oracle Wallets When Migrating to EAP 6
     url: https://access.redhat.com/articles/1329073
-  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 "
+  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.
   ruleID: weblogic-eap7-15000
   when:
     builtin.filecontent:
@@ -327,6 +344,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - configuration
@@ -335,11 +353,10 @@
     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: "\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();`.\n \n "
+  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`. Then the context could be instanticated as follows: `InitialContext ctx = new InitialContext();`.
   ruleID: weblogic-eap7-016000
   when:
     builtin.filecontent:
@@ -352,6 +369,7 @@
   labels:
   - konveyor.io/source=weblogic
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - weblogic
   - configuration
@@ -360,12 +378,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: "\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 "
+  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.
   ruleID: weblogic-eap7-017000
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/eap6/57-websphere-catchall.windup.yaml b/resources/rulesets/eap7/138-websphere-catchall.windup.yaml
similarity index 73%
rename from resources/rulesets/eap6/57-websphere-catchall.windup.yaml
rename to resources/rulesets/eap7/138-websphere-catchall.windup.yaml
index 33c1680..8d318f8 100644
--- a/resources/rulesets/eap6/57-websphere-catchall.windup.yaml
+++ b/resources/rulesets/eap7/138-websphere-catchall.windup.yaml
@@ -7,13 +7,13 @@
   effort: 1
   labels:
   - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   links: []
-  message: "\n This is a reference to the IBM DB2 driver type (`com.ibm.db2.jcc.{{type}}`).
+  message: 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.\n "
+    configured properly.
   ruleID: websphere-catchall-db2-00000
   when:
     java.referenced:
@@ -31,14 +31,14 @@
   effort: 0
   labels:
   - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: websphere-catchall-00000
   when:
     java.referenced:
@@ -56,14 +56,14 @@
   effort: 0
   labels:
   - konveyor.io/source=websphere
-  - konveyor.io/target=eap6
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - catchall
   links: []
-  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 "
+  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.
   ruleID: websphere-catchall-00001
   when:
     java.referenced:
diff --git a/resources/rulesets/eap6/50-weblogic-ignore-references.windup.yaml b/resources/rulesets/eap7/139-websphere-ignore-references.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/50-weblogic-ignore-references.windup.yaml
rename to resources/rulesets/eap7/139-websphere-ignore-references.windup.yaml
diff --git a/resources/rulesets/eap7/100-websphere-jms.windup.yaml b/resources/rulesets/eap7/140-websphere-jms.windup.yaml
similarity index 81%
rename from resources/rulesets/eap7/100-websphere-jms.windup.yaml
rename to resources/rulesets/eap7/140-websphere-jms.windup.yaml
index 1a07a73..7598dc5 100644
--- a/resources/rulesets/eap7/100-websphere-jms.windup.yaml
+++ b/resources/rulesets/eap7/140-websphere-jms.windup.yaml
@@ -21,6 +21,10 @@
     url: http://activemq.apache.org/artemis/docs/1.5.0/messaging-concepts.html
   - title: ActiveMQ Artemis Core Client API Javadoc
     url: http://activemq.apache.org/artemis/docs/javadocs/javadoc-1.5.0/org/apache/activemq/artemis/api/core/client/package-summary.html
+  message: "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                    "
   ruleID: websphere-jms-eap7-00000
   tag:
   - jms
@@ -32,16 +36,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
-  description: IBM ConnectionFactory references should be replaced with the Java EE standard API
+  - 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
   effort: 1
   labels:
   - konveyor.io/source=websphere
@@ -54,9 +58,9 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  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 "
+  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`.
   ruleID: websphere-jms-eap7-01000
   when:
     java.referenced:
@@ -82,9 +86,9 @@
   links:
   - title: Java EE JMS Documentation
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  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 "
+  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}}`.
   ruleID: websphere-jms-eap7-02000
   when:
     java.referenced:
@@ -104,23 +108,24 @@
   links:
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  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 "
+  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`.
   ruleID: websphere-jms-eap7-02500
   when:
     java.referenced:
       pattern: com.ibm.mqe.jms.{type}Queue
 - category: mandatory
   customVariables:
+  - 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
-  - name: type
-    nameOfCaptureGroup: type
-    pattern: (?P<package>com.ibm(\..*)?\.jms.)?(?P<prefix>(JMS|MQe|MQ))?(?P<type>(Text|Stream|Object|Map|Bytes)?)?Message
   description: IBM JMS destination message
   effort: 1
   labels:
@@ -132,9 +137,9 @@
   - jms
   - websphere
   links: []
-  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 "
+  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`.
   ruleID: websphere-jms-eap7-03000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/101-websphere-mq.windup.yaml b/resources/rulesets/eap7/141-websphere-mq.windup.yaml
similarity index 82%
rename from resources/rulesets/eap7/101-websphere-mq.windup.yaml
rename to resources/rulesets/eap7/141-websphere-mq.windup.yaml
index ab89dad..895b028 100644
--- a/resources/rulesets/eap7/101-websphere-mq.windup.yaml
+++ b/resources/rulesets/eap7/141-websphere-mq.windup.yaml
@@ -18,8 +18,10 @@
   links:
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  - title: WebSphere MQ JavaDoc
-    url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/overview-summary.html
+  message: "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 6 JMS API, or with ActiveMQ Artemis client
+    API.\n                    "
   ruleID: websphere-mq-eap7-00000
   tag:
   - jms
@@ -78,10 +80,11 @@
     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: "\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\n scripting feature.\n "
+  message: |-
+    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.
   ruleID: websphere-mq-eap7-02000
   tag:
   - IBM MQ Configuration
diff --git a/resources/rulesets/eap7/102-websphere-mqe.windup.yaml b/resources/rulesets/eap7/142-websphere-mqe.windup.yaml
similarity index 70%
rename from resources/rulesets/eap7/102-websphere-mqe.windup.yaml
rename to resources/rulesets/eap7/142-websphere-mqe.windup.yaml
index 5d52ad1..35d66c0 100644
--- a/resources/rulesets/eap7/102-websphere-mqe.windup.yaml
+++ b/resources/rulesets/eap7/142-websphere-mqe.windup.yaml
@@ -9,6 +9,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/target=java-ee7+
   - konveyor.io/target=java-ee
@@ -18,8 +19,6 @@
   links:
   - title: Java EE 7 JMS Tutorial
     url: https://docs.oracle.com/javaee/7/tutorial/jms-concepts003.htm#BNCEH
-  - title: WebSphere MQe JavaDoc
-    url: http://www-01.ibm.com/support/knowledgecenter/SSVHEW_6.2.0/com.ibm.mqe.javadoc/java/overview-summary.html
   ruleID: websphere-mqe-eap7-00000
   tag:
   - jms
@@ -36,6 +35,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/target=java-ee7+
   - konveyor.io/target=java-ee
@@ -45,10 +45,9 @@
   links:
   - title: 'JBoss EAP 7 Configuring Messaging: Deploy a WebSphere MQ Resource Adapter'
     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: "\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 "
+  message: |-
+    IBM MQe {{type}} adapter provides plug-in communications adapters or data storage adapters for queue managers. These can
+     be deployed to JBoss EAP.
   ruleID: websphere-mqe-eap7-01000
   when:
     java.referenced:
@@ -61,6 +60,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/target=java-ee7+
   - konveyor.io/target=java-ee
@@ -70,11 +70,9 @@
   links:
   - title: JBoss EAP 7 - Configuring Messaging Destinations
     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\n JBoss EAP 7, the JMS
-    destinations can be configured with the JBoss Admin CLI.\n "
+  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.
   ruleID: websphere-mqe-eap7-02000
   when:
     java.referenced:
@@ -87,6 +85,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/target=java-ee7+
   - konveyor.io/target=java-ee
@@ -96,8 +95,9 @@
   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: "\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 "
+  message: |-
+    `MQeJMSAuthenticator` is a WebSphere proprietary JMS authentication API.
+     To migrate to JBoss EAP 7, replace with Java EE 6 JAAS for JMS authentication.
   ruleID: websphere-mqe-eap7-03000
   when:
     java.referenced:
@@ -109,6 +109,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - konveyor.io/target=java-ee7+
   - konveyor.io/target=java-ee
@@ -116,11 +117,12 @@
   - messaging
   - websphere
   links: []
-  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 "
+  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.
   ruleID: websphere-mqe-eap7-04000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/103-websphere-other.windup.yaml b/resources/rulesets/eap7/143-websphere-other.windup.yaml
similarity index 68%
rename from resources/rulesets/eap7/103-websphere-other.windup.yaml
rename to resources/rulesets/eap7/143-websphere-other.windup.yaml
index c6539b5..f76ee1c 100644
--- a/resources/rulesets/eap7/103-websphere-other.windup.yaml
+++ b/resources/rulesets/eap7/143-websphere-other.windup.yaml
@@ -17,10 +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: "\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 "
+  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).
   ruleID: websphere-other-eap7-01000
   when:
     java.referenced:
@@ -43,12 +43,12 @@
     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: "\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 "
+  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.
   ruleID: websphere-other-eap7-02000
   when:
     java.referenced:
-      location: PACKAGE
+      location: IMPORT
       pattern: com.ibm.websphere.startupservice.*StartUp*
diff --git a/resources/rulesets/eap7/104-websphere-xml.windup.yaml b/resources/rulesets/eap7/144-websphere-xml.windup.yaml
similarity index 91%
rename from resources/rulesets/eap7/104-websphere-xml.windup.yaml
rename to resources/rulesets/eap7/144-websphere-xml.windup.yaml
index e65a867..e2be51b 100644
--- a/resources/rulesets/eap7/104-websphere-xml.windup.yaml
+++ b/resources/rulesets/eap7/144-websphere-xml.windup.yaml
@@ -3,6 +3,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
@@ -27,6 +28,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
@@ -55,13 +57,15 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
   links: []
-  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 "
+  message: |-
+    This file contains WebSphere proprietary JSP engine configuration.
+
+     To migrate to EAP 7, configure it accordingly using the CLI or the web console.
   ruleID: eap7-websphere-xml-03500
   when:
     or:
@@ -85,6 +89,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
@@ -96,9 +101,10 @@
   - title: Migrate IBM WebSphere Application Server Web Application Extension or Binding
       Files
     url: https://access.redhat.com/articles/1330673
-  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 "
+  message: |-
+    This file contains WebSphere proprietary binding configuration.
+
+     To migrate to EAP 7+, configure EAP 7+ accordingly using the CLI interface or web console.
   ruleID: eap7-websphere-xml-06000
   when:
     or:
@@ -115,6 +121,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
@@ -138,6 +145,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
@@ -159,6 +167,7 @@
   labels:
   - konveyor.io/source=websphere
   - konveyor.io/target=eap7
+  - konveyor.io/target=eap8
   - konveyor.io/target=eap
   - websphere
   - configuration
diff --git a/resources/rulesets/eap7/74-eap6.windup.yaml b/resources/rulesets/eap7/74-eap6.windup.yaml
deleted file mode 100644
index 366641b..0000000
--- a/resources/rulesets/eap7/74-eap6.windup.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Remote JNDI Provider URL has changed in EAP 7
-  effort: 1
-  labels:
-  - konveyor.io/source=eap6
-  - konveyor.io/source=eap
-  - konveyor.io/target=eap7+
-  - konveyor.io/target=eap
-  - jndi
-  - configuration
-  - ejb
-  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: "\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`.\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\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:
-      filePattern: .*\.(java|properties|xml)
-      pattern: remote://.*:\d*
-- category: mandatory
-  customVariables: []
-  description: JSF FaceletContext.FACELET_CONTEXT_KEY changed value
-  effort: 1
-  labels:
-  - konveyor.io/source=eap6
-  - konveyor.io/source=eap
-  - konveyor.io/target=eap7+
-  - konveyor.io/target=eap
-  - jsf
-  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: "\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:
-    - builtin.filecontent:
-        filePattern: .*\.java
-        pattern: com.sun.faces.facelets.FACELET_CONTEXT
-    - builtin.filecontent:
-        filePattern: .*\.java
-        pattern: FaceletContext.FACELET_CONTEXT_KEY
-- category: mandatory
-  customVariables: []
-  description: HTTPS URL hostname check against a service’s Common Name (CN) changed
-  effort: 1
-  labels:
-  - konveyor.io/source=eap6
-  - konveyor.io/source=eap
-  - konveyor.io/target=eap7+
-  - konveyor.io/target=eap
-  - certificate
-  - https
-  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
-    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. \n "
-  ruleID: eap6-12000
-  when:
-    builtin.filecontent:
-      filePattern: .*\.(java|properties|xml|cmd|sh|bat)
-      pattern: org.jboss.security.ignoreHttpsHost
diff --git a/resources/rulesets/eap7/64-jboss-eap4and5to6and7-java.windup.yaml b/resources/rulesets/eap7/98-jboss-eap4and5to6and7-java.windup.yaml
similarity index 84%
rename from resources/rulesets/eap7/64-jboss-eap4and5to6and7-java.windup.yaml
rename to resources/rulesets/eap7/98-jboss-eap4and5to6and7-java.windup.yaml
index 823da82..678634d 100644
--- a/resources/rulesets/eap7/64-jboss-eap4and5to6and7-java.windup.yaml
+++ b/resources/rulesets/eap7/98-jboss-eap4and5to6and7-java.windup.yaml
@@ -14,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: "\n \n Annotation `org.jboss.security.annotation.SecurityDomain` should
-    be replaced by `org.jboss.ejb3.annotation.SecurityDomain`.\n \n "
+  message: Annotation `org.jboss.security.annotation.SecurityDomain` should be replaced
+    by `org.jboss.ejb3.annotation.SecurityDomain`.
   ruleID: jboss-eap4and5to6and7-java-01000
   when:
     java.referenced:
@@ -37,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: "\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.*`)
+  message: "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. \n One will need to find an equivalent replacement: for class `MBeanProxyExt.create()`
-    one can use `JMX.newMBeanProxy()`.\n \n "
+    one can use `JMX.newMBeanProxy()`."
   ruleID: jboss-eap4and5to6and7-java-02000
   when:
     java.referenced:
@@ -64,12 +64,12 @@
   links:
   - title: How to implement MBeans in JBoss EAP 6
     url: https://access.redhat.com/solutions/121823
-  message: "\n \n JMX / MBeans is still fully supported as it is in the JDK specification.
+  message: "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 "
+    MBean."
   ruleID: jboss-eap4and5to6and7-java-03000
   when:
     java.referenced:
diff --git a/resources/rulesets/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml b/resources/rulesets/eap7/99-jboss-eap4and5to6and7-xml.windup.yaml
similarity index 78%
rename from resources/rulesets/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml
rename to resources/rulesets/eap7/99-jboss-eap4and5to6and7-xml.windup.yaml
index c629e39..fd73269 100644
--- a/resources/rulesets/eap7/65-jboss-eap4and5to6and7-xml.windup.yaml
+++ b/resources/rulesets/eap7/99-jboss-eap4and5to6and7-xml.windup.yaml
@@ -20,12 +20,12 @@
     url: https://access.redhat.com/solutions/374333
   - title: jboss:service=Naming in JBoss EAP 6
     url: https://access.redhat.com/solutions/1212103
-  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 "
+  message: "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."
   ruleID: jboss-eap4and5to6and7-xml-01000
   when:
     builtin.file:
@@ -48,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: "\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
+  message: "`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 "
+    does not work since they are not real Mbeans."
   ruleID: jboss-eap4and5to6and7-xml-02000
   when:
     builtin.xml:
@@ -76,9 +76,9 @@
   links:
   - title: How to compress remote EJB communication in JBoss EAP 6
     url: https://access.redhat.com/solutions/322953
-  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 "
+  message: "`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`"
   ruleID: jboss-eap4and5to6and7-xml-03000
   when:
     or:
@@ -109,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: "\n \n In JBoss EAP 6+, Security is configured in the `<security-domain>`
-    element in the server configuration file.\n \n "
+  message: In JBoss EAP 6+, Security is configured in the `<security-domain>` element
+    in the server configuration file.
   ruleID: jboss-eap4and5to6and7-xml-04000
   when:
     builtin.xml:
@@ -137,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: "\n \n The `class-loading` and `loader-repository` configuration in `jboss.xml`,
+  message: "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. \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 "
+    classloader / module dependencies if needed."
   ruleID: jboss-eap4and5to6and7-xml-05000
   when:
     builtin.xml:
@@ -164,11 +164,10 @@
   - konveyor.io/target=eap7
   - konveyor.io/target=eap
   links: []
-  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 "
+  message: "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."
   ruleID: jboss-eap4and5to6and7-xml-06000
   when:
     builtin.xml:
@@ -192,9 +191,8 @@
     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: "\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 "
+  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.
   ruleID: jboss-eap4and5to6and7-xml-07000
   when:
     builtin.xml:
diff --git a/resources/rulesets/eap8/117-jakarta-json-binding.windup.yaml b/resources/rulesets/eap8/117-jakarta-json-binding.windup.yaml
deleted file mode 100644
index 8f68e08..0000000
--- a/resources/rulesets/eap8/117-jakarta-json-binding.windup.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-- category: potential
-  customVariables: []
-  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: "\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.\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)`.\n "
-  ruleID: jakarta-json-binding-00010
-  when:
-    java.referenced:
-      location: ANNOTATION
-      pattern: jakarta.json.bind.annotation.JsonbCreator
diff --git a/resources/rulesets/eap8/105-eap8-faces.windup.yaml b/resources/rulesets/eap8/145-eap8-faces.windup.yaml
similarity index 91%
rename from resources/rulesets/eap8/105-eap8-faces.windup.yaml
rename to resources/rulesets/eap8/145-eap8-faces.windup.yaml
index 8054b00..19b052d 100644
--- a/resources/rulesets/eap8/105-eap8-faces.windup.yaml
+++ b/resources/rulesets/eap8/145-eap8-faces.windup.yaml
@@ -212,7 +212,7 @@
         pattern: javax.faces.view.facelets.FaceletsResourceResolver
     - java.referenced:
         pattern: javax.faces.view.facelets.ResourceResolver
-- category: mandatory
+- category: potential
   customVariables: []
   description: JSP support has been removed in Jakarta EE 10
   effort: 5
@@ -230,15 +230,23 @@
     url: https://github.com/jakartaee/faces/issues/1581
   - title: Faces and JSPs
     url: https://access.redhat.com/articles/6980265#faces_jsp
-  message: 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.
+  message: As of Jakarta EE 10, Jakarta Faces does no longer support JSP as a faces
+    view technology. JSP usage within Jakarta Faces must be removed/substituted. Facelets
+    will remain as the only default view language, and views can also now be created
+    solely using java.
   ruleID: eap8-faces-00009
   when:
-    or:
-    - builtin.filecontent:
-        filePattern: .*\.jsp
-        pattern: <jsp
-    - builtin.filecontent:
-        filePattern: .*\.jsp
-        pattern: <%
+    and:
+    - or:
+      - builtin.filecontent:
+          filePattern: .*\.jsp
+          pattern: <jsp
+      - builtin.filecontent:
+          filePattern: .*\.jsp
+          pattern: <%
+      - java.dependency:
+          lowerbound: 0.0.0
+          nameregex: org\.jboss\.spec\.javax\.faces\..*
+      - java.dependency:
+          lowerbound: 0.0.0
+          nameregex: com\.sun\.faces\..*
diff --git a/resources/rulesets/eap8/106-eap8-resteasy.windup.yaml b/resources/rulesets/eap8/146-eap8-resteasy.windup.yaml
similarity index 98%
rename from resources/rulesets/eap8/106-eap8-resteasy.windup.yaml
rename to resources/rulesets/eap8/146-eap8-resteasy.windup.yaml
index 015f287..dcf9115 100644
--- a/resources/rulesets/eap8/106-eap8-resteasy.windup.yaml
+++ b/resources/rulesets/eap8/146-eap8-resteasy.windup.yaml
@@ -228,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` \n "
+    and `org.jboss.resteasy.resteasy-core-spi`
   ruleID: eap8-resteasy-00011
   when:
     or:
diff --git a/resources/rulesets/eap8/107-eap8-xml-binding.windup.yaml b/resources/rulesets/eap8/147-eap8-xml-binding.windup.yaml
similarity index 100%
rename from resources/rulesets/eap8/107-eap8-xml-binding.windup.yaml
rename to resources/rulesets/eap8/147-eap8-xml-binding.windup.yaml
diff --git a/resources/rulesets/eap8/108-eap8.ejb.windup.yaml b/resources/rulesets/eap8/148-eap8.ejb.windup.yaml
similarity index 100%
rename from resources/rulesets/eap8/108-eap8.ejb.windup.yaml
rename to resources/rulesets/eap8/148-eap8.ejb.windup.yaml
diff --git a/resources/rulesets/eap8/149-deprecated-initialcontextfactory-is-removed.windup.yaml b/resources/rulesets/eap8/149-deprecated-initialcontextfactory-is-removed.windup.yaml
new file mode 100644
index 0000000..2ee8bd2
--- /dev/null
+++ b/resources/rulesets/eap8/149-deprecated-initialcontextfactory-is-removed.windup.yaml
@@ -0,0 +1,25 @@
+- category: mandatory
+  customVariables: []
+  description: Class org.jboss.naming.remote.client.InitialContextFactory has been
+    removed
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  - JakartaEE
+  links: []
+  message: Replace this class with `org.wildfly.naming.client.WildFlyInitialContextFactory`.
+  ruleID: deprecated-initialcontextfactory-is-removed-00001
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.java
+        pattern: '"org.jboss.naming.remote.client.InitialContextFactory"'
+    - builtin.filecontent:
+        filePattern: .*\.wsdl
+        pattern: org.jboss.naming.remote.client.InitialContextFactory
+    - java.referenced:
+        pattern: org.jboss.naming.remote.client.InitialContextFactory
diff --git a/resources/rulesets/eap8/109-empty-beans-xml.windup.yaml b/resources/rulesets/eap8/150-empty-beans-xml.windup.yaml
similarity index 83%
rename from resources/rulesets/eap8/109-empty-beans-xml.windup.yaml
rename to resources/rulesets/eap8/150-empty-beans-xml.windup.yaml
index 5981393..4da8f49 100644
--- a/resources/rulesets/eap8/109-empty-beans-xml.windup.yaml
+++ b/resources/rulesets/eap8/150-empty-beans-xml.windup.yaml
@@ -13,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/resources/rulesets/eap8/110-hibernate-6.2.windup.yaml b/resources/rulesets/eap8/151-hibernate-6.2.windup.yaml
similarity index 93%
rename from resources/rulesets/eap8/110-hibernate-6.2.windup.yaml
rename to resources/rulesets/eap8/151-hibernate-6.2.windup.yaml
index b36f1af..0aeb2df 100644
--- a/resources/rulesets/eap8/110-hibernate-6.2.windup.yaml
+++ b/resources/rulesets/eap8/151-hibernate-6.2.windup.yaml
@@ -7,18 +7,17 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\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 "
+  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.
   ruleID: hibernate-6.2-00010
   when:
     java.referenced:
@@ -33,16 +32,17 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\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.\n Methods `isEventSource` and `asEventSource` can also be used
-    to ease the transition, available on the `SharedSessionContractImplementor` contract.\n "
+  message: |-
+    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.
   ruleID: hibernate-6.2-00020
   when:
     java.referenced:
@@ -57,13 +57,15 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\n The return type of `JdbcType#getJdbcRecommendedJavaTypeMapping()` was
-    changed from `BasicJavaType` to `JavaType`.\n "
+  message: The return type of `JdbcType#getJdbcRecommendedJavaTypeMapping()` was changed
+    from `BasicJavaType` to `JavaType`.
   ruleID: hibernate-6.2-00030
   when:
     java.referenced:
@@ -81,13 +83,15 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\n This class within `org.hibernate.cfg` has been moved; see link for
-    more information.\n "
+  message: This class within `org.hibernate.cfg` has been moved; see link for more
+    information.
   ruleID: hibernate-6.2-00040
   when:
     java.referenced:
@@ -104,13 +108,15 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\n This class within `org.hibernate.loader` has been moved; see link for
-    more information.\n "
+  message: This class within `org.hibernate.loader` has been moved; see link for more
+    information.
   ruleID: hibernate-6.2-00050
   when:
     java.referenced:
diff --git a/resources/rulesets/eap8/111-hibernate-search-6.1.windup.yaml b/resources/rulesets/eap8/152-hibernate-search-6.1.windup.yaml
similarity index 90%
rename from resources/rulesets/eap8/111-hibernate-search-6.1.windup.yaml
rename to resources/rulesets/eap8/152-hibernate-search-6.1.windup.yaml
index 8ead40f..4815507 100644
--- a/resources/rulesets/eap8/111-hibernate-search-6.1.windup.yaml
+++ b/resources/rulesets/eap8/152-hibernate-search-6.1.windup.yaml
@@ -8,6 +8,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -42,14 +44,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n `org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource` has
-    been moved to `org.hibernate.search.engine.cfg.ConfigurationPropertySource`.\n "
+  message: '`org.hibernate.search.engine.cfg.spi.ConfigurationPropertySource` has
+    been moved to `org.hibernate.search.engine.cfg.ConfigurationPropertySource`.'
   ruleID: hibernate-search-6.1-00020
   when:
     or:
@@ -65,15 +69,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer`
+  message: '`org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurer`
     moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurer`
-    and is now an API.\n "
+    and is now an API.'
   ruleID: hibernate-search-6.1-00030
   when:
     or:
@@ -89,15 +95,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n `org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext`
+  message: '`org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchHttpClientConfigurationContext`
     moved to `org.hibernate.search.backend.elasticsearch.client.ElasticsearchHttpClientConfigurationContext`
-    and is now an API.\n "
+    and is now an API.'
   ruleID: hibernate-search-6.1-00040
   when:
     or:
@@ -112,6 +120,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -135,6 +145,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -157,6 +169,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -179,6 +193,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -202,6 +218,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -225,6 +243,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -248,6 +268,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -270,6 +292,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -292,6 +316,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -314,6 +340,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -336,6 +364,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -358,6 +388,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -380,6 +412,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -402,6 +436,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6.1+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
diff --git a/resources/rulesets/eap8/112-hibernate-search.windup.yaml b/resources/rulesets/eap8/153-hibernate-search.windup.yaml
similarity index 81%
rename from resources/rulesets/eap8/112-hibernate-search.windup.yaml
rename to resources/rulesets/eap8/153-hibernate-search.windup.yaml
index 091b2a5..858a2d1 100644
--- a/resources/rulesets/eap8/112-hibernate-search.windup.yaml
+++ b/resources/rulesets/eap8/153-hibernate-search.windup.yaml
@@ -7,6 +7,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -31,6 +33,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -55,6 +59,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -77,6 +83,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -85,11 +93,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: "\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,\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 "
+  message: |-
+    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.
   ruleID: hibernate-search-00040
   when:
     builtin.filecontent:
@@ -105,15 +113,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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 "
+  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.
   ruleID: hibernate-search-00050
   when:
     builtin.filecontent:
@@ -128,6 +138,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -151,6 +163,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -174,6 +188,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -197,6 +213,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -220,15 +238,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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)\n
-    or `hibernate.search.backend.indexes.<index-name>.dynamic_mapping` (per-index).\n "
+  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).
   ruleID: hibernate-search-00100
   when:
     builtin.filecontent:
@@ -244,6 +264,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -267,16 +289,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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.schema_management.minimal_required_status_wait_timeout`
-    (for global defaults)\n or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status_wait_timeout`
-    (per-index).\n "
+  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).
   ruleID: hibernate-search-00110
   when:
     builtin.filecontent:
@@ -292,6 +315,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -316,6 +341,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -339,6 +366,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -362,6 +391,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -385,6 +416,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -408,6 +441,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -431,6 +466,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -455,6 +492,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -478,16 +517,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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.schema_management.minimal_required_status`
-    (for global defaults)\n or `hibernate.search.backend.indexes.<index-name>.schema_management.minimal_required_status`
-    (per-index).\n "
+  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).
   ruleID: hibernate-search-00210
   when:
     builtin.filecontent:
@@ -503,6 +543,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -525,6 +567,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -547,15 +591,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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)\n
-    or `hibernate.search.backend.indexes.<index-name>.directory.type` (per-index).\n "
+  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).
   ruleID: hibernate-search-00240
   when:
     builtin.filecontent:
@@ -570,15 +616,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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)\n
-    or `hibernate.search.backend.indexes.<index-name>.directory.root` (per-index).\n "
+  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).
   ruleID: hibernate-search-00250
   when:
     builtin.filecontent:
@@ -593,15 +641,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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\n @Indexed(name = ...), or with the programmatic
-    equivalent.\n "
+  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.
   ruleID: hibernate-search-00260
   when:
     builtin.filecontent:
@@ -616,16 +666,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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.io.commit_interval` (for global
-    defaults)\n or `hibernate.search.backend.indexes.<index name>.io.commit_interval`
-    (per-index).\n "
+  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).
   ruleID: hibernate-search-00270
   when:
     builtin.filecontent:
@@ -640,6 +691,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -662,15 +715,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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).\n
-    No equivalent for the per-index configuration. See link for more information.\n "
+  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.
   ruleID: hibernate-search-00290
   when:
     builtin.filecontent:
@@ -685,16 +740,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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.io.writer` or `hibernate.search.backend.io.merge`
-    (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 "
+  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).
   ruleID: hibernate-search-00300
   when:
     builtin.filecontent:
@@ -709,6 +765,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -717,10 +775,9 @@
     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
-    Search 6 equivalent: `hibernate.search.backend.directory.locking.strategy` (for
-    global defaults)\n or `hibernate.search.backend.indexes.<index-name>.directory.locking.strategy`
-    (per-index).\n "
+  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).
   ruleID: hibernate-search-00310
   when:
     builtin.filecontent:
@@ -735,16 +792,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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.indexing.queue_size` (for global
-    defaults)\n or `hibernate.search.backend.indexes.<index-name>.indexing.queue_size`
-    (per-index).\n "
+  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).
   ruleID: hibernate-search-00320
   when:
     builtin.filecontent:
@@ -759,6 +817,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -784,6 +844,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -792,10 +854,9 @@
     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: "\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.\n "
+  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
+     to a strictly positive value (in milliseconds). See links for more information. Custom reader strategies are no longer supported.
   ruleID: hibernate-search-00340
   when:
     builtin.filecontent:
@@ -810,6 +871,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -834,6 +897,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -858,6 +923,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -882,6 +949,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -906,6 +975,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -931,6 +1002,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -956,6 +1029,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -981,6 +1056,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1004,6 +1081,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1029,6 +1108,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1056,6 +1137,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1078,6 +1161,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1100,6 +1185,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1126,6 +1213,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1154,6 +1243,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1182,6 +1273,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1206,6 +1299,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1231,6 +1326,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1255,6 +1352,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1278,6 +1377,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1301,6 +1402,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1326,6 +1429,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1348,6 +1453,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1374,6 +1481,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1397,6 +1506,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1421,6 +1532,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1447,6 +1560,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1475,22 +1590,19 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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.\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.\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).\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.\n "
+  message: |-
+    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.
   ruleID: hibernate-search-00620
   when:
     java.referenced:
@@ -1505,6 +1617,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1513,8 +1627,9 @@
     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: "\n Annotation-based analyzer definitions are no longer supported.\n Instead,
-    implement an analysis configurer: see links for Lucene and Elasticsearch replacements.\n "
+  message: |-
+    Annotation-based analyzer definitions are no longer supported.
+     Instead, implement an analysis configurer: see links for Lucene and Elasticsearch replacements.
   ruleID: hibernate-search-00630
   when:
     or:
@@ -1533,18 +1648,18 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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.\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.\n See link for more information.\n "
+  message: |-
+    `@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.
   ruleID: hibernate-search-00640
   when:
     java.referenced:
@@ -1559,15 +1674,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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 "
+  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.
   ruleID: hibernate-search-00650
   when:
     java.referenced:
@@ -1582,12 +1699,14 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links: []
-  message: "\n This annotation was deprecated and non-functional in Hibernate Search
-    5. It is no longer available in Hibernate Search 6.\n "
+  message: This annotation was deprecated and non-functional in Hibernate Search 5.
+    It is no longer available in Hibernate Search 6.
   ruleID: hibernate-search-00660
   when:
     java.referenced:
@@ -1602,15 +1721,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @CalendarBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#calendarbridge
-  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 "
+  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.
   ruleID: hibernate-search-00670
   when:
     java.referenced:
@@ -1625,14 +1746,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @CharFilterDef'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#charfilterdef
-  message: "\n Annotation-based analyzer definitions are no longer supported. See
-    link for more information.\n "
+  message: Annotation-based analyzer definitions are no longer supported. See link
+    for more information.
   ruleID: hibernate-search-00680
   when:
     java.referenced:
@@ -1647,14 +1770,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Bridges'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#bridges
-  message: "\n The bridge API was completely reworked in Hibernate Search 6. See link
-    for more information.\n "
+  message: The bridge API was completely reworked in Hibernate Search 6. See link
+    for more information.
   ruleID: hibernate-search-00690
   when:
     or:
@@ -1673,6 +1798,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -1680,12 +1807,10 @@
   - 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: "\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).\n Thus, the recommended
-    approach when migrating is to simply remove all @ContainedIn annotations, then
-    deal with the bootstrap errors, if any.\n "
+  message: |-
+    @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.
   ruleID: hibernate-search-00700
   when:
     java.referenced:
@@ -1700,16 +1825,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @DateBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#datebridge
-  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.\n See link
-    for more information.\n "
+  message: |-
+    @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.
   ruleID: hibernate-search-00710
   when:
     java.referenced:
@@ -1724,16 +1850,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @DocumentId'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#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.\n "
+  message: |-
+    `@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.
   ruleID: hibernate-search-00720
   when:
     java.referenced:
@@ -1748,15 +1875,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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 "
+  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.
   ruleID: hibernate-search-00730
   when:
     java.referenced:
@@ -1771,14 +1900,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 6 Reference: @Facet(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#facet
-  message: "\n Facets are now called aggregations, which are a generalization of the
-    concept of faceting. See link for more information.\n "
+  message: Facets are now called aggregations, which are a generalization of the concept
+    of faceting. See link for more information.
   ruleID: hibernate-search-00740
   when:
     or:
@@ -1797,14 +1928,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 6 Reference: @Field(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#field
-  message: "\n The @Field annotation was split into multiple annotations, specific
-    to each field type. See link for more information.\n "
+  message: The @Field annotation was split into multiple annotations, specific to
+    each field type. See link for more information.
   ruleID: hibernate-search-00750
   when:
     or:
@@ -1823,14 +1956,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Bridges'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#bridges
-  message: "\n The bridge API was completely reworked in Hibernate Search 6. See link
-    for more information.\n "
+  message: The bridge API was completely reworked in Hibernate Search 6. See link
+    for more information.
   ruleID: hibernate-search-00760
   when:
     java.referenced:
@@ -1845,14 +1980,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n Full-text filters have no direct equivalent in Hibernate Search 6.
-    See link for more information.\n "
+  message: Full-text filters have no direct equivalent in Hibernate Search 6. See
+    link for more information.
   ruleID: hibernate-search-00770
   when:
     or:
@@ -1871,16 +2008,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Indexed'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#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.\n "
+  message: |-
+    `@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.
   ruleID: hibernate-search-00780
   when:
     java.referenced:
@@ -1895,16 +2033,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @IndexedEmbedded'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#indexedembeded
-  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.\n "
+  message: |-
+    `@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.
   ruleID: hibernate-search-00790
   when:
     java.referenced:
@@ -1919,13 +2058,15 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n `@Key` has no equivalent in Hibernate Search 6.\n "
+  message: '`@Key` has no equivalent in Hibernate Search 6.'
   ruleID: hibernate-search-00800
   when:
     java.referenced:
@@ -1940,14 +2081,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Latitude'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#latitude
-  message: "\n `@Latitude` is still available in Hibernate Search 6, but moved to
-    a different package: `org.hibernate.search.annotations.Latitude`.\n "
+  message: '`@Latitude` is still available in Hibernate Search 6, but moved to a different
+    package: `org.hibernate.search.annotations.Latitude`.'
   ruleID: hibernate-search-00810
   when:
     java.referenced:
@@ -1962,14 +2105,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Longitude'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#longitude
-  message: "\n `@Longitude` is still available in Hibernate Search 6, but moved to
-    a different package: `org.hibernate.search.annotations.Longitude`.\n "
+  message: '`@Longitude` is still available in Hibernate Search 6, but moved to a
+    different package: `org.hibernate.search.annotations.Longitude`.'
   ruleID: hibernate-search-00820
   when:
     java.referenced:
@@ -1984,17 +2129,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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 "
+  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.
   ruleID: hibernate-search-00830
   when:
     java.referenced:
@@ -2009,6 +2154,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -2017,8 +2164,9 @@
     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: "\n Annotation-based analyzer definitions are no longer supported.\n Instead,
-    implement an analysis configurer: see links for Lucene and Elasticsearch\n "
+  message: |-
+    Annotation-based analyzer definitions are no longer supported.
+     Instead, implement an analysis configurer: see links for Lucene and Elasticsearch
   ruleID: hibernate-search-00840
   when:
     or:
@@ -2037,12 +2185,15 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links: []
-  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 "
+  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.
   ruleID: hibernate-search-00850
   when:
     or:
@@ -2061,12 +2212,14 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links: []
-  message: "\n `@ProvidedId` was deprecated in Hibernate Search 5. It no longer exists
-    in Hibernate Search 6.\n "
+  message: '`@ProvidedId` was deprecated in Hibernate Search 5. It no longer exists
+    in Hibernate Search 6.'
   ruleID: hibernate-search-00860
   when:
     java.referenced:
@@ -2081,14 +2234,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @SortableField(s)'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#sortablefield
-  message: "\n @SortableField(s) no longer exists in Hibernate Search 6. Instead,
-    use @*Field.sortable.\n "
+  message: '@SortableField(s) no longer exists in Hibernate Search 6. Instead, use
+    @*Field.sortable.'
   ruleID: hibernate-search-00870
   when:
     or:
@@ -2107,15 +2262,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Spatial'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#spatial
-  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 "
+  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.
   ruleID: hibernate-search-00880
   when:
     or:
@@ -2134,13 +2291,15 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @TikaBridge'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#tikabridge
-  message: "\n @TikaBridge has no equivalent in Hibernate Search 6 yet.\n "
+  message: '@TikaBridge has no equivalent in Hibernate Search 6 yet.'
   ruleID: hibernate-search-00890
   when:
     java.referenced:
@@ -2155,6 +2314,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -2163,8 +2324,9 @@
     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: "\n Annotation-based analyzer definitions are no longer supported.\n See
-    links for more information.\n "
+  message: |-
+    Annotation-based analyzer definitions are no longer supported.
+     See links for more information.
   ruleID: hibernate-search-00900
   when:
     or:
@@ -2183,15 +2345,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: FullTextEntityManager/FullTextSession'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#fulltextsession
-  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 "
+  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`.
   ruleID: hibernate-search-00910
   when:
     or:
@@ -2208,16 +2372,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: FullTextQuery'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searching-fulltextquery
-  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 "
+  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.
   ruleID: hibernate-search-00920
   when:
     or:
@@ -2235,14 +2400,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\n Lucene queries are replaced with Lucene-independent \"search predicates\"
-    in Hibernate Search 6. See link for guide and examples.\n "
+  message: Lucene queries are replaced with Lucene-independent "search predicates"
+    in Hibernate Search 6. See link for guide and examples.
   ruleID: hibernate-search-00930
   when:
     java.referenced:
@@ -2257,6 +2424,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
@@ -2264,8 +2433,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: "\n Lucene sort fields are replaced with Lucene-independent \"search sorts\"
-    in Hibernate Search 6. Follow the link for more info and examples.\n "
+  message: Lucene sort fields are replaced with Lucene-independent "search sorts"
+    in Hibernate Search 6. Follow the link for more info and examples.
   ruleID: hibernate-search-00940
   when:
     or:
@@ -2282,15 +2451,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Projections'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#projections
-  message: "\n The `ProjectionConstants` are no longer available, and Hibernate Search
+  message: 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.\n "
+    for more information and examples.
   ruleID: hibernate-search-00950
   when:
     or:
@@ -2307,23 +2478,25 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: Facets'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searching-facet
-  message: "\n Facets are now called aggregations, which are a generalization of the
-    concept of faceting. See link for more information and examples.\n "
+  message: Facets are now called aggregations, which are a generalization of the concept
+    of faceting. See link for more information and examples.
   ruleID: hibernate-search-00960
   when:
     or:
     - java.referenced:
-        location: PACKAGE
-        pattern: org.hibernate.search.*Facet*
+        location: IMPORT
+        pattern: org.hibernate.search*.Facet*
     - java.referenced:
         location: PACKAGE
-        pattern: org.hibernate.search.*facet*
+        pattern: org.hibernate.search*.facet*
 - category: mandatory
   customVariables: []
   description: ErrorHandler API no longer available
@@ -2333,24 +2506,26 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: ErrorHandler'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#error-handler
-  message: "\n The ErrorHandler interface and API have been replaced with the `FailureHandler`
+  message: 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.\n "
+    information and examples.
   ruleID: hibernate-search-00970
   when:
     or:
     - java.referenced:
-        location: PACKAGE
-        pattern: org.hibernate.search.*ErrorHandl*
+        location: IMPORT
+        pattern: org.hibernate.search*.ErrorHandl*
     - java.referenced:
         location: PACKAGE
-        pattern: org.hibernate.search.*errorhandl*
+        pattern: org.hibernate.search*.errorhandl*
 - category: mandatory
   customVariables: []
   description: The @Factory annotation is not available anymore
@@ -2360,17 +2535,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: @Factory'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#factory
-  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 "
+  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.
   ruleID: hibernate-search-00980
   when:
     java.referenced:
@@ -2385,14 +2560,15 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: 'Hibernate Search 5 to 6 Migration: SearchException'
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#searchexception
-  message: "\n `org.hibernate.search.exception.SearchException` has been moved to
-    `org.hibernate.search.util.common.SearchException`.\n "
+  message: '`org.hibernate.search.exception.SearchException` has been moved to `org.hibernate.search.util.common.SearchException`.'
   ruleID: hibernate-search-00990
   when:
     java.referenced:
@@ -2406,15 +2582,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   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: "\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 "
+  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.
   ruleID: hibernate-search-01000
   when:
     or:
@@ -2433,19 +2611,21 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: Hibernate Search 6 Reference - SearchFactory
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#_searchfactory
-  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.\n Check the link for more information and examples.\n "
+  message: |-
+    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.
   ruleID: hibernate-search-01010
   when:
     java.referenced:
-      pattern: org.hibernate.search.*SearchFactory
+      pattern: org.hibernate.search*.SearchFactory
 - category: mandatory
   customVariables: []
   description: MassIndexer has moved
@@ -2455,15 +2635,17 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: Hibernate Search 6 Reference - MassIndexer
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#massindexer
-  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 "
+  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.
   ruleID: hibernate-search-01020
   when:
     java.referenced:
@@ -2477,14 +2659,16 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
   links:
   - title: Hibernate Search 6 Reference - MassIndexingJob
     url: https://docs.jboss.org/hibernate/search/6.0/migration/html_single/#jsr352
-  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 "
+  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`.'
   ruleID: hibernate-search-01030
   when:
     java.referenced:
@@ -2498,6 +2682,8 @@
   - konveyor.io/target=eap
   - konveyor.io/target=hibernate6+
   - konveyor.io/target=hibernate
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   - eap8
diff --git a/resources/rulesets/eap8/113-hibernate6.windup.yaml b/resources/rulesets/eap8/154-hibernate6.windup.yaml
similarity index 84%
rename from resources/rulesets/eap8/113-hibernate6.windup.yaml
rename to resources/rulesets/eap8/154-hibernate6.windup.yaml
index f53851e..8342b25 100644
--- a/resources/rulesets/eap8/113-hibernate6.windup.yaml
+++ b/resources/rulesets/eap8/154-hibernate6.windup.yaml
@@ -8,22 +8,24 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
   - 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: "\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
+  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. \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. \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 "
+    list of DDL statements for the sequences."
   ruleID: hibernate-00005
   when:
     java.referenced:
@@ -41,6 +43,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -48,9 +52,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: "\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 "
+  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.
   ruleID: hibernate-00010
   when:
     java.referenced:
@@ -67,6 +71,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -74,10 +80,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: "\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 "
+  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.
   ruleID: hibernate6-00020
   when:
     java.referenced:
@@ -92,6 +97,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -114,6 +121,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -134,6 +143,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -154,6 +165,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -174,6 +187,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -194,6 +209,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -216,17 +233,16 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
   - title: Hibernate ORM 6 migration guide - Stream
     url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#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.\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.\n "
+  message: |-
+    `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.
   ruleID: hibernate6-00090
   when:
     or:
@@ -245,6 +261,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -267,6 +285,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -288,6 +308,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -309,6 +331,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -333,6 +357,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -357,6 +383,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -378,6 +406,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -408,6 +438,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -431,6 +463,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -452,6 +486,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -487,6 +523,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -516,6 +554,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -538,6 +578,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -548,7 +590,7 @@
   ruleID: hibernate6-00220
   when:
     java.referenced:
-      location: PACKAGE
+      location: IMPORT
       pattern: org.hibernate.*Jacc*
 - category: mandatory
   customVariables: []
@@ -559,6 +601,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -579,6 +623,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -600,6 +646,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -621,6 +669,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -641,6 +691,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -661,6 +713,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -681,6 +735,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -702,6 +758,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -722,6 +780,8 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   links:
@@ -743,16 +803,17 @@
   - konveyor.io/target=hibernate
   - konveyor.io/target=eap8+
   - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
   - konveyor.io/source
   - hibernate
   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: "\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`.\n\n Note that
-    the new artifact is not included in the EAP 8 distribution and will have to be
-    added manually.\n "
+  message: |-
+    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.
   ruleID: hibernate6-00270
   when:
     or:
@@ -762,3 +823,36 @@
     - builtin.filecontent:
         filePattern: (hibernate\.properties|persistence\.xml|cfg\.xml|application\.properties|application\.yaml)
         pattern: quarkus.hibernate-orm.dialect
+- category: mandatory
+  customVariables: []
+  description: Multitenancy in Hibernate ORM has been simplified
+  effort: 1
+  labels:
+  - konveyor.io/target=hibernate6+
+  - konveyor.io/target=hibernate
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  - konveyor.io/target=quarkus3+
+  - konveyor.io/target=quarkus
+  - konveyor.io/source
+  - hibernate
+  links:
+  - title: Hibernate ORM 6 migration guide - Multitenancy simplification
+    url: https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#multitenancy-simplification
+  message: "Multitenancy in Hibernate ORM has been simplified. Hibernate will now
+    infer whether multitenancy is enabled or not automatically.\n - If a MultiTenantConnectionProvider
+    is configured, Hibernate ORM will assume either database- or schema-based multitenancy
+    (there is no difference between those two as far as Hibernate ORM is concerned).\n
+    - If an entity property is annotated with the new @TenantId annotation, Hibernate
+    ORM will assume discriminator-based multitenancy (which is a new feature).\n \n
+    See links for information on how to migrate."
+  ruleID: hibernate6-00280
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: (hibernate\.properties|persistence\.xml|cfg\.xml|application\.properties|application\.yaml)
+        pattern: hibernate.multiTenancy
+    - java.referenced:
+        pattern: org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider
+    - java.referenced:
+        pattern: org.hibernate.MultiTenancyStrategy
diff --git a/resources/rulesets/eap8/114-jakarta-cdi.windup.yaml b/resources/rulesets/eap8/155-jakarta-cdi.windup.yaml
similarity index 92%
rename from resources/rulesets/eap8/114-jakarta-cdi.windup.yaml
rename to resources/rulesets/eap8/155-jakarta-cdi.windup.yaml
index 28afe12..a3473dd 100644
--- a/resources/rulesets/eap8/114-jakarta-cdi.windup.yaml
+++ b/resources/rulesets/eap8/155-jakarta-cdi.windup.yaml
@@ -8,6 +8,8 @@
   - konveyor.io/source=eap
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - JakartaEE
   - eap8
   links: []
@@ -29,6 +31,8 @@
   - konveyor.io/source=eap
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - JakartaEE
   - eap8
   links:
@@ -52,6 +56,8 @@
   - konveyor.io/source=eap
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - JakartaEE
   - eap8
   links:
@@ -75,6 +81,8 @@
   - konveyor.io/source=eap
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - JakartaEE
   - eap8
   links: []
diff --git a/resources/rulesets/eap8/115-jakarta-el.windup.yaml b/resources/rulesets/eap8/156-jakarta-el.windup.yaml
similarity index 91%
rename from resources/rulesets/eap8/115-jakarta-el.windup.yaml
rename to resources/rulesets/eap8/156-jakarta-el.windup.yaml
index c990214..63999d2 100644
--- a/resources/rulesets/eap8/115-jakarta-el.windup.yaml
+++ b/resources/rulesets/eap8/156-jakarta-el.windup.yaml
@@ -6,6 +6,8 @@
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: The incorrectly spelled `javax.el.MethodExpression.isParmetersProvided()`
@@ -23,6 +25,8 @@
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: The incorrectly spelled `jakarta.el.MethodExpression.isParmetersProvided()`
diff --git a/resources/rulesets/eap8/116-jakarta-faces.windup.yaml b/resources/rulesets/eap8/157-jakarta-faces.windup.yaml
similarity index 76%
rename from resources/rulesets/eap8/116-jakarta-faces.windup.yaml
rename to resources/rulesets/eap8/157-jakarta-faces.windup.yaml
index 3cbdc5c..101c77a 100644
--- a/resources/rulesets/eap8/116-jakarta-faces.windup.yaml
+++ b/resources/rulesets/eap8/157-jakarta-faces.windup.yaml
@@ -8,18 +8,18 @@
   - konveyor.io/source=eap
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - JakartaEE
   - eap8
-  links:
-  - title: 'WELD-001409: Ambiguous dependencies for type FacesContext with qualifiers
-      @Default when migrating to EAP 8'
-    url: https://access.redhat.com/solutions/6982900
+  links: []
   message: The `@Produces` annotation for instantiating `FacesContext` is not necessary
     anymore, as CDI injection for `FacesContext` works out of the box.
   ruleID: jakarta-faces-00001
   when:
     and:
-    - java.referenced:
+    - as: discard
+      java.referenced:
         location: FIELD_DECLARATION
         pattern: jakarta.faces.context.FacesContext
     - java.referenced:
diff --git a/resources/rulesets/eap8/158-jakarta-json-binding.windup.yaml b/resources/rulesets/eap8/158-jakarta-json-binding.windup.yaml
new file mode 100644
index 0000000..b835615
--- /dev/null
+++ b/resources/rulesets/eap8/158-jakarta-json-binding.windup.yaml
@@ -0,0 +1,20 @@
+- category: potential
+  customVariables: []
+  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/target=jws6+
+  - konveyor.io/target=jws
+  - konveyor.io/source
+  links: []
+  message: |-
+    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)`.
+  ruleID: jakarta-json-binding-00010
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: jakarta.json.bind.annotation.JsonbCreator
diff --git a/resources/rulesets/eap8/118-jakarta-soap.windup.yaml b/resources/rulesets/eap8/159-jakarta-soap.windup.yaml
similarity index 90%
rename from resources/rulesets/eap8/118-jakarta-soap.windup.yaml
rename to resources/rulesets/eap8/159-jakarta-soap.windup.yaml
index b437e24..bc13fd5 100644
--- a/resources/rulesets/eap8/118-jakarta-soap.windup.yaml
+++ b/resources/rulesets/eap8/159-jakarta-soap.windup.yaml
@@ -5,6 +5,8 @@
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`javax.xml.soap.SOAPElementFactory.newInstance()` must be replaced with
@@ -21,6 +23,8 @@
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`javax.xml.soap.SOAPElementFactory.create()` must be replaced with `jakarta.xml.soap.SOAPFactory.createElement()`.
diff --git a/resources/rulesets/eap8/119-jakarta-ws-rs.windup.yaml b/resources/rulesets/eap8/160-jakarta-ws-rs.windup.yaml
similarity index 92%
rename from resources/rulesets/eap8/119-jakarta-ws-rs.windup.yaml
rename to resources/rulesets/eap8/160-jakarta-ws-rs.windup.yaml
index 94bbe56..d132de4 100644
--- a/resources/rulesets/eap8/119-jakarta-ws-rs.windup.yaml
+++ b/resources/rulesets/eap8/160-jakarta-ws-rs.windup.yaml
@@ -5,6 +5,8 @@
   labels:
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   - JakartaEE
   - eap8
diff --git a/resources/rulesets/eap8/120-javaee-to-jakarta-namespaces.windup.yaml b/resources/rulesets/eap8/161-javaee-to-jakarta-namespaces.windup.yaml
similarity index 91%
rename from resources/rulesets/eap8/120-javaee-to-jakarta-namespaces.windup.yaml
rename to resources/rulesets/eap8/161-javaee-to-jakarta-namespaces.windup.yaml
index 8928b59..c79802b 100644
--- a/resources/rulesets/eap8/120-javaee-to-jakarta-namespaces.windup.yaml
+++ b/resources/rulesets/eap8/161-javaee-to-jakarta-namespaces.windup.yaml
@@ -8,12 +8,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   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:
@@ -29,12 +31,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   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:
@@ -50,12 +54,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   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:
@@ -70,6 +76,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -90,6 +98,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -109,6 +119,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -129,6 +141,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -149,6 +163,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -169,6 +185,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -189,6 +207,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -209,6 +229,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -229,6 +251,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -249,6 +273,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -269,6 +295,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -289,6 +317,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -309,6 +339,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -329,6 +361,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -349,6 +383,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -369,6 +405,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -389,6 +427,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -409,6 +449,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -429,6 +471,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -449,6 +493,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -469,6 +515,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -489,6 +537,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -508,6 +558,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -527,6 +579,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -547,6 +601,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -567,6 +623,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -587,6 +645,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -607,6 +667,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -627,6 +689,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta XML Schemas
@@ -647,6 +711,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: In the root tag, replace the `version` attribute value `2.1` with `3.0`
@@ -672,6 +738,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: In the root tag, replace the `version` attribute value `7` with `9`
@@ -697,6 +765,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`beans_1_1.xsd`: In the root tag, replace the `version` attribute value
@@ -723,6 +793,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`beans_2_0.xsd`: In the root tag, replace the `version` attribute value
@@ -749,6 +821,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`application_7.xsd`: In the root tag, replace the `version` attribute
@@ -775,6 +849,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`application_8.xsd`: In the root tag, replace the `version` attribute
@@ -801,6 +877,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`application-client_7.xsd`: In the root tag, replace the `version` attribute
@@ -827,6 +905,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`application-client_8.xsd`: In the root tag, replace the `version` attribute
@@ -853,6 +933,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`connector_1_7.xsd`: In the root tag, replace the `version` attribute
@@ -879,6 +961,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`ejb-jar_3_2.xsd`: In the root tag, replace the `version` attribute value
@@ -905,6 +989,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`javaee_web_services_1_4.xsd`: In the root tag, replace the `version`
@@ -931,6 +1017,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-app_3_1`: In the root tag, replace the `version` attribute value
@@ -957,6 +1045,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-app_4_0`: In the root tag, replace the `version` attribute value
@@ -983,6 +1073,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-fragment_3_1`: In the root tag, replace the `version` attribute value
@@ -1009,6 +1101,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-fragment_4_0`: In the root tag, replace the `version` attribute value
@@ -1035,6 +1129,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-facesconfig_2_2`: In the root tag, replace the `version` attribute
@@ -1061,6 +1157,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-facesconfig_2_3`: In the root tag, replace the `version` attribute
@@ -1087,6 +1185,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-facelettaglibrary_2_2`: In the root tag, replace the `version` attribute
@@ -1113,6 +1213,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-facelettaglibrary_2_3`: In the root tag, replace the `version` attribute
@@ -1139,6 +1241,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`web-jsptaglibrary_2_1`: In the root tag, replace the `version` attribute
@@ -1165,6 +1269,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`validation-mapping-2.0`: In the root tag, replace the `version` attribute
@@ -1191,6 +1297,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`validation-configuration-2.0`: In the root tag, replace the `version`
@@ -1217,6 +1325,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`orm_2_1`: In the root tag, replace the `version` attribute value with
@@ -1243,6 +1353,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links: []
   message: '`orm_2_2`: In the root tag, replace the `version` attribute value with
diff --git a/resources/rulesets/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml b/resources/rulesets/eap8/162-javax-to-jakarta-bootstrapping-files.windup.yaml
similarity index 91%
rename from resources/rulesets/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml
rename to resources/rulesets/eap8/162-javax-to-jakarta-bootstrapping-files.windup.yaml
index 1fb5583..5201b1d 100644
--- a/resources/rulesets/eap8/121-javax-to-jakarta-bootstrapping-files.windup.yaml
+++ b/resources/rulesets/eap8/162-javax-to-jakarta-bootstrapping-files.windup.yaml
@@ -8,6 +8,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
diff --git a/resources/rulesets/eap8/122-javax-to-jakarta-dependencies.windup.yaml b/resources/rulesets/eap8/163-javax-to-jakarta-dependencies.windup.yaml
similarity index 92%
rename from resources/rulesets/eap8/122-javax-to-jakarta-dependencies.windup.yaml
rename to resources/rulesets/eap8/163-javax-to-jakarta-dependencies.windup.yaml
index 1bffc58..6399549 100644
--- a/resources/rulesets/eap8/122-javax-to-jakarta-dependencies.windup.yaml
+++ b/resources/rulesets/eap8/163-javax-to-jakarta-dependencies.windup.yaml
@@ -7,6 +7,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -27,6 +29,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -48,6 +52,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -67,6 +73,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -87,6 +95,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -106,6 +116,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -125,6 +137,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
@@ -146,6 +160,8 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - title: Jakarta EE
diff --git a/resources/rulesets/eap8/123-javax-to-jakarta-package.windup.yaml b/resources/rulesets/eap8/164-javax-to-jakarta-package.windup.yaml
similarity index 85%
rename from resources/rulesets/eap8/123-javax-to-jakarta-package.windup.yaml
rename to resources/rulesets/eap8/164-javax-to-jakarta-package.windup.yaml
index bb0ce1e..c9bfe51 100644
--- a/resources/rulesets/eap8/123-javax-to-jakarta-package.windup.yaml
+++ b/resources/rulesets/eap8/164-javax-to-jakarta-package.windup.yaml
@@ -10,9 +10,11 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - 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/resources/rulesets/eap8/124-javax-to-jakarta-properties.windup.yaml b/resources/rulesets/eap8/165-javax-to-jakarta-properties.windup.yaml
similarity index 80%
rename from resources/rulesets/eap8/124-javax-to-jakarta-properties.windup.yaml
rename to resources/rulesets/eap8/165-javax-to-jakarta-properties.windup.yaml
index 8aac466..3640a84 100644
--- a/resources/rulesets/eap8/124-javax-to-jakarta-properties.windup.yaml
+++ b/resources/rulesets/eap8/165-javax-to-jakarta-properties.windup.yaml
@@ -7,11 +7,13 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   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/resources/rulesets/eap8/125-javax-to-jakarta-servlet.windup.yaml b/resources/rulesets/eap8/166-javax-to-jakarta-servlet.windup.yaml
similarity index 71%
rename from resources/rulesets/eap8/125-javax-to-jakarta-servlet.windup.yaml
rename to resources/rulesets/eap8/166-javax-to-jakarta-servlet.windup.yaml
index 253412c..dd01cbe 100644
--- a/resources/rulesets/eap8/125-javax-to-jakarta-servlet.windup.yaml
+++ b/resources/rulesets/eap8/166-javax-to-jakarta-servlet.windup.yaml
@@ -7,19 +7,19 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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\n the interface declaration
-    and ensure that the servlet code properly guards state and other resource access
-    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 "
+  message: |-
+    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.
   ruleID: javax-to-jakarta-servlet-00010
   when:
     java.referenced:
@@ -35,15 +35,17 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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,\n
-    along with the `javax.servlet.http.HttpSession.getSessionContext()` method. Since
-    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 "
+  message: |-
+    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.
   ruleID: javax-to-jakarta-servlet-00020
   when:
     or:
@@ -62,18 +64,18 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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\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.\n - `getRequestURL(HttpServletRequest req)` -- Use `HttpServletRequest.getRequestURL()`.\n "
+  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, 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()`.
   ruleID: javax-to-jakarta-servlet-00030
   when:
     java.referenced:
@@ -87,12 +89,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getServlet in javax.servlet.ServletContext has been removed.\n "
+  message: Method getServlet in javax.servlet.ServletContext has been removed.
   ruleID: javax-to-jakarta-servlet-00040
   when:
     or:
@@ -108,12 +112,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getServlets in javax.servlet.ServletContext has been removed.\n "
+  message: Method getServlets in javax.servlet.ServletContext has been removed.
   ruleID: javax-to-jakarta-servlet-00041
   when:
     or:
@@ -129,12 +135,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getServletNames in javax.servlet.ServletContext has been removed.\n "
+  message: Method getServletNames in javax.servlet.ServletContext has been removed.
   ruleID: javax-to-jakarta-servlet-00042
   when:
     or:
@@ -151,13 +159,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method log(Exception, String) in javax.servlet.ServletContext has been
-    removed. Use log(String, Throwable) instead.\n "
+  message: Method log(Exception, String) in javax.servlet.ServletContext has been
+    removed. Use log(String, Throwable) instead.
   ruleID: javax-to-jakarta-servlet-00043
   when:
     or:
@@ -172,13 +182,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method `getRealPath(String)` in javax.servlet.ServletRequest has been
-    removed. It can be replaced with `ServletContext.getRealPath(String path)`.\n "
+  message: Method `getRealPath(String)` in javax.servlet.ServletRequest has been removed.
+    It can be replaced with `ServletContext.getRealPath(String path)`.
   ruleID: javax-to-jakarta-servlet-00050
   when:
     java.referenced:
@@ -193,13 +205,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method `getRealPath` in javax.servlet.ServletRequestWrapper has been
-    removed. It can be replaced with `ServletContext.getRealPath(String path)`.\n "
+  message: Method `getRealPath` in javax.servlet.ServletRequestWrapper has been removed.
+    It can be replaced with `ServletContext.getRealPath(String path)`.
   ruleID: javax-to-jakarta-servlet-00060
   when:
     java.referenced:
@@ -213,12 +227,14 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getServlet in javax.servlet.UnavailableException has been removed.\n "
+  message: Method getServlet in javax.servlet.UnavailableException has been removed.
   ruleID: javax-to-jakarta-servlet-00070
   when:
     java.referenced:
@@ -234,13 +250,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException
-    has been removed. Use UnavailableException(String) instead.\n "
+  message: Constructor UnavailableException(Servlet, String) in javax.servlet.UnavailableException
+    has been removed. Use UnavailableException(String) instead.
   ruleID: javax-to-jakarta-servlet-00071
   when:
     java.referenced:
@@ -256,13 +274,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException
-    has been removed. Use UnavailableException(String, int) instead.\n "
+  message: Constructor UnavailableException(int, Servlet, String) in javax.servlet.UnavailableException
+    has been removed. Use UnavailableException(String, int) instead.
   ruleID: javax-to-jakarta-servlet-00072
   when:
     java.referenced:
@@ -278,13 +298,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequest
-    has been removed. Use `isRequestedSessionIdFromURL()` instead.\n "
+  message: Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequest
+    has been removed. Use `isRequestedSessionIdFromURL()` instead.
   ruleID: javax-to-jakarta-servlet-00080
   when:
     java.referenced:
@@ -300,13 +322,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequestWrapper
-    has been removed. Use `isRequestedSessionIdFromURL()` instead.\n "
+  message: Method `isRequestedSessionIdFromUrl` in javax.servlet.http.HttpServletRequestWrapper
+    has been removed. Use `isRequestedSessionIdFromURL()` instead.
   ruleID: javax-to-jakarta-servlet-00090
   when:
     java.referenced:
@@ -322,13 +346,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method encodeURL in javax.servlet.http.HttpServletResponse has been
-    removed. Use encodeURL(String) instead.\n "
+  message: Method encodeURL in javax.servlet.http.HttpServletResponse has been removed.
+    Use encodeURL(String) instead.
   ruleID: javax-to-jakarta-servlet-00100
   when:
     java.referenced:
@@ -343,13 +369,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method encodeRedirectUrl(String) in javax.servlet.http.HttpServletResponse
-    has been removed. Use encodeRedirectURL(String) instead.\n "
+  message: Method encodeRedirectUrl(String) in javax.servlet.http.HttpServletResponse
+    has been removed. Use encodeRedirectURL(String) instead.
   ruleID: javax-to-jakarta-servlet-00101
   when:
     java.referenced:
@@ -364,13 +392,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method setStatus(int, String) in javax.servlet.http.HttpServletResponse
-    has been removed. Use sendError(int, String) instead.\n "
+  message: Method setStatus(int, String) in javax.servlet.http.HttpServletResponse
+    has been removed. Use sendError(int, String) instead.
   ruleID: javax-to-jakarta-servlet-00102
   when:
     java.referenced:
@@ -385,13 +415,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has
-    been removed. Use encodeURL instead.\n "
+  message: Method encodeUrl in javax.servlet.http.HttpServletResponseWrapper has been
+    removed. Use encodeURL instead.
   ruleID: javax-to-jakarta-servlet-00110
   when:
     java.referenced:
@@ -406,13 +438,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper
-    has been removed. Use encodeRedirectURL instead.\n "
+  message: Method encodeRedirectUrl in javax.servlet.http.HttpServletResponseWrapper
+    has been removed. Use encodeRedirectURL instead.
   ruleID: javax-to-jakarta-servlet-00111
   when:
     java.referenced:
@@ -427,13 +461,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper
-    has been removed. Use sendError(int, String) instead.\n "
+  message: Method setStatus(int, String) in javax.servlet.http.HttpServletResponseWrapper
+    has been removed. Use sendError(int, String) instead.
   ruleID: javax-to-jakarta-servlet-00112
   when:
     java.referenced:
@@ -447,13 +483,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getValue in javax.servlet.http.HttpSession has been removed.
-    Use getAttribute instead.\n "
+  message: Method getValue in javax.servlet.http.HttpSession has been removed. Use
+    getAttribute instead.
   ruleID: javax-to-jakarta-servlet-00120
   when:
     java.referenced:
@@ -468,13 +506,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method getValueNames in javax.servlet.http.HttpSession has been removed.
-    Use getAttributeNames instead.\n "
+  message: Method getValueNames in javax.servlet.http.HttpSession has been removed.
+    Use getAttributeNames instead.
   ruleID: javax-to-jakarta-servlet-00121
   when:
     java.referenced:
@@ -489,13 +529,15 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method putValue in javax.servlet.http.HttpSession has been removed.
-    Use setAttribute instead.\n "
+  message: Method putValue in javax.servlet.http.HttpSession has been removed. Use
+    setAttribute instead.
   ruleID: javax-to-jakarta-servlet-00122
   when:
     java.referenced:
@@ -510,15 +552,41 @@
   - konveyor.io/target=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
   - konveyor.io/source
   links:
   - 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: "\n Method removeValue in javax.servlet.http.HttpSession has been removed.
-    Use removeAttribute instead.\n "
+  message: Method removeValue in javax.servlet.http.HttpSession has been removed.
+    Use removeAttribute instead.
   ruleID: javax-to-jakarta-servlet-00123
   when:
     java.referenced:
       location: METHOD_CALL
       pattern: javax.servlet.http.HttpSession.removeValue*
+- category: potential
+  customVariables: []
+  description: web.xml element references a javax-prefixed class name
+  effort: 1
+  labels:
+  - konveyor.io/target=jakarta-ee9+
+  - konveyor.io/target=jakarta-ee
+  - konveyor.io/target=eap8
+  - konveyor.io/target=eap
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
+  - konveyor.io/source
+  links:
+  - 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: web.xml element references a javax-prefixed class name
+  ruleID: javax-to-jakarta-servlet-00130
+  when:
+    builtin.xml:
+      filepaths:
+      - web.xml
+      namespaces: {}
+      xpath: //*[contains(text(),'javax')]
diff --git a/resources/rulesets/eap8/126-jboss-dependencies.windup.yaml b/resources/rulesets/eap8/167-jboss-dependencies.windup.yaml
similarity index 80%
rename from resources/rulesets/eap8/126-jboss-dependencies.windup.yaml
rename to resources/rulesets/eap8/167-jboss-dependencies.windup.yaml
index c042817..aa8b4a9 100644
--- a/resources/rulesets/eap8/126-jboss-dependencies.windup.yaml
+++ b/resources/rulesets/eap8/167-jboss-dependencies.windup.yaml
@@ -7,7 +7,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -24,7 +26,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -41,7 +45,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -58,7 +64,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -75,7 +83,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -92,7 +102,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -110,7 +122,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -128,7 +142,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -146,7 +162,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -163,7 +181,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -180,7 +200,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -198,7 +220,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -216,7 +240,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -233,7 +259,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -251,7 +279,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -268,7 +298,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -285,7 +317,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -303,7 +337,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -321,7 +357,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -339,7 +377,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -356,7 +396,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -374,7 +416,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -391,7 +435,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -409,7 +455,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -427,7 +475,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -444,7 +494,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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`"
@@ -462,7 +514,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -479,7 +533,9 @@
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
   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
@@ -489,52 +545,58 @@
       name: org.hibernate.hibernate-jpamodelgen
 - category: mandatory
   customVariables: []
-  description: Replace jbossxts artifact with jbossxts-jakarta
+  description: Replace eap-runtime-artifacts artifact with jboss-eap-ee
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
-  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
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
+  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:
       lowerbound: 0.0.0
-      name: org.jboss.narayana.xts.jbossxts
+      name: org.jboss.bom.eap-runtime-artifacts
 - category: mandatory
   customVariables: []
-  description: Replace eap-runtime-artifacts artifact with jboss-eap-ee
+  description: Replace jsr181-api artifact with jboss-jakarta-xml-ws-api_4.0_spec
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
-  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
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
+  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:
       lowerbound: 0.0.0
-      name: org.jboss.bom.eap-runtime-artifacts
+      name: javax.jws.jsr181-api
 - category: mandatory
   customVariables: []
-  description: Replace jsr181-api artifact with jboss-jakarta-xml-ws-api_4.0_spec
+  description: The EJB Client Legacy BOM is no longer provided with JBoss EAP 8
   effort: 1
   labels:
   - konveyor.io/source=jakarta-ee7+
   - konveyor.io/source=jakarta-ee
   - konveyor.io/target=eap8
   - konveyor.io/target=eap
-  links: []
-  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
+  links:
+  - title: Migrating a JBoss EAP Application's Maven Project to EAP 8
+    url: https://access.redhat.com/articles/6980017
+  message: The current version of the BOM may continue to be used, but it's strongly
+    recommended to stop using the deprecated EJB Client Legacy API.
+  ruleID: jboss-dependencies-00032
   when:
     java.dependency:
       lowerbound: 0.0.0
-      name: javax.jws.jsr181-api
+      name: org.jboss.bom.wildfly-ejb-client-legacy-bom
diff --git a/resources/rulesets/eap8/127-keycloak-openid.windup.yaml b/resources/rulesets/eap8/168-keycloak-openid.windup.yaml
similarity index 100%
rename from resources/rulesets/eap8/127-keycloak-openid.windup.yaml
rename to resources/rulesets/eap8/168-keycloak-openid.windup.yaml
diff --git a/resources/rulesets/eap8/128-legacy-vault.windup.yaml b/resources/rulesets/eap8/169-legacy-vault.windup.yaml
similarity index 74%
rename from resources/rulesets/eap8/128-legacy-vault.windup.yaml
rename to resources/rulesets/eap8/169-legacy-vault.windup.yaml
index d719588..43f2167 100644
--- a/resources/rulesets/eap8/128-legacy-vault.windup.yaml
+++ b/resources/rulesets/eap8/169-legacy-vault.windup.yaml
@@ -7,8 +7,8 @@
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  message: "\n Vault support has been removed in EAP8; migration to Elytron credential
-    store is mandatory.\n "
+  message: Vault support has been removed in EAP8; migration to Elytron credential
+    store is mandatory.
   ruleID: legacy-vault-00010
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/eap8/170-log4j-removed.windup.yaml b/resources/rulesets/eap8/170-log4j-removed.windup.yaml
new file mode 100644
index 0000000..ee583fe
--- /dev/null
+++ b/resources/rulesets/eap8/170-log4j-removed.windup.yaml
@@ -0,0 +1,165 @@
+- category: mandatory
+  customVariables: []
+  description: Log4j version 1 is not longer provided in EAP8
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  links:
+  - title: 'Migration: Apache Log4j version 1 is not longer provided in EAP 8'
+    url: https://access.redhat.com/articles/6973120
+  message: Log4j usage without configuration files
+  ruleID: log4j-removed-00001
+  when:
+    and:
+    - not: true
+      or:
+      - builtin.file:
+          pattern: log4j\.xml
+      - builtin.file:
+          pattern: log4j\.properties
+      - builtin.file:
+          pattern: jboss-log4j\.xml
+    - not: true
+      or:
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - builtin.file:
+          pattern: log4j\.jar
+    - java.referenced:
+        location: IMPORT
+        pattern: org.apache.log4j.Logger
+- category: mandatory
+  customVariables: []
+  description: Log4j version 1 is not longer provided in EAP8
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  links:
+  - title: 'Migration: Apache Log4j version 1 is not longer provided in EAP 8'
+    url: https://access.redhat.com/articles/6973120
+  message: Log4j usage without including `log4j.jar`
+  ruleID: log4j-removed-00002
+  when:
+    or:
+    - and:
+      - java.referenced:
+          location: IMPORT
+          pattern: org.apache.log4j.Logger
+    - not: true
+      or:
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - builtin.file:
+          pattern: log4j\.jar
+- category: mandatory
+  customVariables: []
+  description: Log4j version 1 is not longer provided in EAP8
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  links:
+  - title: 'Migration: Apache Log4j version 1 is not longer provided in EAP 8'
+    url: https://access.redhat.com/articles/6973120
+  message: Log4j configuration without including `log4j.jar`
+  ruleID: log4j-removed-00003
+  when:
+    or:
+    - and:
+      - builtin.file:
+          pattern: (log4j\.xml|log4j\.properties|jboss-log4j\.xml)
+    - not: true
+      or:
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - builtin.file:
+          pattern: log4j\.jar
+- category: mandatory
+  customVariables: []
+  description: Log4j version 1 is not longer provided in EAP8
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  links:
+  - title: 'Migration: Apache Log4j version 1 is not longer provided in EAP 8'
+    url: https://access.redhat.com/articles/6973120
+  message: Log4j custom-handler using appender
+  ruleID: log4j-removed-00004
+  when:
+    or:
+    - and:
+      - builtin.filecontent:
+          filePattern: .*\.xml
+          pattern: custom-handler.*org.apache.log4j..*Appender
+    - not: true
+      or:
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - builtin.file:
+          pattern: log4j\.jar
+- category: mandatory
+  customVariables: []
+  description: Log4j version 1 is not longer provided in EAP8
+  effort: 1
+  labels:
+  - konveyor.io/source=eap6
+  - konveyor.io/source=eap7
+  - konveyor.io/source=eap
+  - konveyor.io/target=eap8+
+  - konveyor.io/target=eap
+  links:
+  - title: 'Migration: Apache Log4j version 1 is not longer provided in EAP 8'
+    url: https://access.redhat.com/articles/6973120
+  message: Log4j module dependency declaration
+  ruleID: log4j-removed-00005
+  when:
+    or:
+    - and:
+      - or:
+        - builtin.filecontent:
+            filePattern: jboss-deployment-structure\.xml
+            pattern: org.jboss.log4j.logmanager
+        - builtin.filecontent:
+            filePattern: Manifest\.MF
+            pattern: org.jboss.log4j.logmanager
+    - not: true
+      or:
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - java.dependency:
+          lowerbound: 0.0.0
+          name: log4j.log4j
+      - builtin.file:
+          pattern: log4j\.jar
diff --git a/resources/rulesets/eap8/129-login-modules.windup.yaml b/resources/rulesets/eap8/171-login-modules.windup.yaml
similarity index 100%
rename from resources/rulesets/eap8/129-login-modules.windup.yaml
rename to resources/rulesets/eap8/171-login-modules.windup.yaml
diff --git a/resources/rulesets/eap8/130-picketlink.windup.yaml b/resources/rulesets/eap8/172-picketlink.windup.yaml
similarity index 72%
rename from resources/rulesets/eap8/130-picketlink.windup.yaml
rename to resources/rulesets/eap8/172-picketlink.windup.yaml
index e363b02..91ca7fd 100644
--- a/resources/rulesets/eap8/130-picketlink.windup.yaml
+++ b/resources/rulesets/eap8/172-picketlink.windup.yaml
@@ -9,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: "\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.\n In case of Picketlink STS usage, migration to Apache CXF is required.\n "
+  message: |-
+    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.
   ruleID: picketlink-00010
   when:
     or:
@@ -32,10 +32,10 @@
   - konveyor.io/target=eap
   - konveyor.io/source
   links: []
-  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
+  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
     WEB-INF directory. Set the auth-method to KEYCLOAK-SAML in the deployment’s web.xml
-    file.\n "
+    file.
   ruleID: picketlink-00020
   when:
     as: file
diff --git a/resources/rulesets/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml b/resources/rulesets/eapxp/173-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
similarity index 100%
rename from resources/rulesets/eapxp/131-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
rename to resources/rulesets/eapxp/173-eapxp_bootable_jar_maven_plugin_configuration_changes.mta.yaml
diff --git a/resources/rulesets/eapxp/174-eapxp_microprofile_metrics_not_supported.mta.yaml b/resources/rulesets/eapxp/174-eapxp_microprofile_metrics_not_supported.mta.yaml
new file mode 100644
index 0000000..f2d6494
--- /dev/null
+++ b/resources/rulesets/eapxp/174-eapxp_microprofile_metrics_not_supported.mta.yaml
@@ -0,0 +1,22 @@
+- category: mandatory
+  customVariables: []
+  description: MicroProfile Metrics not supported
+  effort: 1
+  labels:
+  - konveyor.io/source=eapxp
+  - konveyor.io/target=eapxp5+
+  - konveyor.io/target=eapxp
+  - JBossEAP
+  - EAPXP
+  links: []
+  message: If you migrate your application to JBoss EAP XP 5.0 (or later), please
+    note that MicroProfile Metrics is not supported.
+  ruleID: eapxp_microprofile_metrics_not_supported-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.eclipse.microprofile.metrics.microprofile-metrics-api
+    - java.referenced:
+        location: IMPORT
+        pattern: org.eclipse.microprofile.metric*
diff --git a/resources/rulesets/eapxp/175-eapxp_microprofile_opentracing_not_supported.mta.yaml b/resources/rulesets/eapxp/175-eapxp_microprofile_opentracing_not_supported.mta.yaml
new file mode 100644
index 0000000..9b6a12d
--- /dev/null
+++ b/resources/rulesets/eapxp/175-eapxp_microprofile_opentracing_not_supported.mta.yaml
@@ -0,0 +1,22 @@
+- category: mandatory
+  customVariables: []
+  description: MicroProfile OpenTracing not supported
+  effort: 1
+  labels:
+  - konveyor.io/source=eapxp
+  - konveyor.io/target=eapxp5+
+  - konveyor.io/target=eapxp
+  - JBossEAP
+  - EAPXP
+  links: []
+  message: If you migrate your application to JBoss EAP XP 5.0 (or later), please
+    note that MicroProfile OpenTracing is not supported.
+  ruleID: eapxp_microprofile_opentracing_not_supported-00001
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: org.eclipse.microprofile.opentracing.microprofile-opentracing-api
+    - java.referenced:
+        location: PACKAGE
+        pattern: org.eclipse.microprofile.opentracing*
diff --git a/resources/rulesets/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml b/resources/rulesets/eapxp/176-remove_thorntail_yaml_configuration_files.mta.yaml
similarity index 100%
rename from resources/rulesets/eapxp/132-remove_thorntail_yaml_configuration_files.mta.yaml
rename to resources/rulesets/eapxp/176-remove_thorntail_yaml_configuration_files.mta.yaml
diff --git a/resources/rulesets/eapxp/133-replace_thorntail_boms.mta.yaml b/resources/rulesets/eapxp/177-replace_thorntail_boms.mta.yaml
similarity index 100%
rename from resources/rulesets/eapxp/133-replace_thorntail_boms.mta.yaml
rename to resources/rulesets/eapxp/177-replace_thorntail_boms.mta.yaml
diff --git a/resources/rulesets/eapxp/134-replace_thorntail_fractions.mta.yaml b/resources/rulesets/eapxp/178-replace_thorntail_fractions.mta.yaml
similarity index 100%
rename from resources/rulesets/eapxp/134-replace_thorntail_fractions.mta.yaml
rename to resources/rulesets/eapxp/178-replace_thorntail_fractions.mta.yaml
diff --git a/resources/rulesets/eapxp/135-replace_thorntail_maven_plugin.mta.yaml b/resources/rulesets/eapxp/179-replace_thorntail_maven_plugin.mta.yaml
similarity index 100%
rename from resources/rulesets/eapxp/135-replace_thorntail_maven_plugin.mta.yaml
rename to resources/rulesets/eapxp/179-replace_thorntail_maven_plugin.mta.yaml
diff --git a/resources/rulesets/fuse-service-works/141-soa-p-5.windup.yaml b/resources/rulesets/fuse-service-works/185-soa-p-5.windup.yaml
similarity index 56%
rename from resources/rulesets/fuse-service-works/141-soa-p-5.windup.yaml
rename to resources/rulesets/fuse-service-works/185-soa-p-5.windup.yaml
index ea3319b..54b18cb 100644
--- a/resources/rulesets/fuse-service-works/141-soa-p-5.windup.yaml
+++ b/resources/rulesets/fuse-service-works/185-soa-p-5.windup.yaml
@@ -95,11 +95,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-5-05000
   when:
     builtin.xml:
@@ -131,11 +132,13 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-5-07000
   when:
     builtin.xml:
@@ -151,12 +154,13 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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)
   ruleID: soa-p-5-08000
   when:
     builtin.xml:
@@ -172,11 +176,15 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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.
   ruleID: soa-p-5-09000
   when:
     builtin.xml:
@@ -192,11 +200,14 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-5-10000
   when:
     builtin.xml:
@@ -212,10 +223,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-5-11000
   when:
     builtin.xml:
@@ -232,10 +245,12 @@
   - jboss-esb
   - camel
   links: []
-  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 "
+  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)
   ruleID: soa-p-5-12000
   when:
     builtin.xml:
@@ -253,8 +268,9 @@
   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: "\n \n A UDP Listener definition can be converted to a TCP/UDP\n gateway
-    binding on a composite service in SwitchYard.\n \n "
+  message: |-
+    A UDP Listener definition can be converted to a TCP/UDP
+     gateway binding on a composite service in SwitchYard.
   ruleID: soa-p-5-13000
   when:
     builtin.xml:
@@ -272,8 +288,9 @@
   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: "\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 "
+  message: |-
+    A jms-jca-provider definition can be converted to a JCA
+     gateway binding on a composite service in Fuse Service Works.
   ruleID: soa-p-5-14000
   when:
     builtin.xml:
@@ -290,10 +307,12 @@
   - jboss-esb
   - soa-p
   links: []
-  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 "
+  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).
   ruleID: soa-p-5-15000
   when:
     builtin.xml:
@@ -309,10 +328,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-16000
   when:
     builtin.xml:
@@ -328,11 +349,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-17000
   when:
     builtin.xml:
@@ -349,11 +371,13 @@
   - jboss-esb
   - camel
   links: []
-  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 "
+  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).
   ruleID: soa-p-18000
   when:
     builtin.xml:
@@ -369,10 +393,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-19000
   when:
     builtin.xml:
@@ -389,11 +414,13 @@
   - jboss-esb
   - smooks
   links: []
-  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 "
+  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).
   ruleID: soa-p-20000
   when:
     builtin.xml:
@@ -410,10 +437,11 @@
   - jboss-esb
   - smooks
   links: []
-  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 "
+  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).
   ruleID: soa-p-21000
   when:
     builtin.xml:
@@ -430,11 +458,13 @@
   - jboss-esb
   - smooks
   links: []
-  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 "
+  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).
   ruleID: soa-p-22000
   when:
     builtin.xml:
@@ -451,13 +481,13 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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.\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 "
+  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 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).
   ruleID: soa-p-23000
   when:
     builtin.xml:
@@ -473,11 +503,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-24000
   when:
     builtin.xml:
@@ -493,10 +524,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-25000
   when:
     builtin.xml:
@@ -512,11 +545,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-26000
   when:
     builtin.xml:
@@ -532,13 +566,13 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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.
   ruleID: soa-p-27000
   when:
     builtin.xml:
@@ -554,10 +588,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-28000
   when:
     builtin.xml:
@@ -573,11 +609,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-29000
   when:
     builtin.xml:
@@ -593,10 +630,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-30000
   when:
     builtin.xml:
@@ -612,22 +650,47 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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>
+     ```
   ruleID: soa-p-31000
   when:
     builtin.xml:
@@ -647,9 +710,9 @@
     url: http://camel.apache.org/convertbodyto.html
   - title: Camel Type Converters
     url: http://camel.apache.org/type-converter.html
-  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 "
+  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.
   ruleID: soa-p-32000
   when:
     builtin.xml:
@@ -667,9 +730,10 @@
   links:
   - title: Camel Type Converters
     url: http://camel.apache.org/type-converter.html
-  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 "
+  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.
   ruleID: soa-p-33000
   when:
     builtin.xml:
@@ -685,11 +749,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-34000
   when:
     builtin.xml:
@@ -707,8 +772,9 @@
   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: "\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 "
+  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.
   ruleID: soa-p-35000
   when:
     builtin.xml:
@@ -724,11 +790,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-36000
   when:
     builtin.xml:
@@ -744,11 +811,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-37000
   when:
     builtin.xml:
@@ -764,10 +832,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-38000
   when:
     builtin.xml:
@@ -785,11 +855,12 @@
   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: "\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 "
+  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).
   ruleID: soa-p-39000
   when:
     builtin.xml:
@@ -805,9 +876,9 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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.
   ruleID: soa-p-40000
   when:
     builtin.xml:
@@ -825,9 +896,9 @@
   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: "\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 "
+  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.
   ruleID: soa-p-41000
   when:
     builtin.xml:
@@ -843,11 +914,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-42000
   when:
     builtin.xml:
@@ -863,11 +935,12 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-43000
   when:
     builtin.xml:
@@ -883,10 +956,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-44000
   when:
     builtin.xml:
@@ -902,10 +976,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-45000
   when:
     builtin.xml:
@@ -921,10 +996,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-46000
   when:
     builtin.xml:
@@ -940,9 +1016,9 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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.
   ruleID: soa-p-47000
   when:
     builtin.xml:
@@ -958,10 +1034,10 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-48000
   when:
     builtin.xml:
@@ -977,10 +1053,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-49000
   when:
     builtin.xml:
@@ -996,10 +1073,11 @@
   - konveyor.io/target=fsw
   - jboss-esb
   links: []
-  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 "
+  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).
   ruleID: soa-p-50000
   when:
     builtin.xml:
diff --git a/resources/rulesets/fuse/138-sonic-catchall.windup.yaml b/resources/rulesets/fuse/182-sonic-catchall.windup.yaml
similarity index 78%
rename from resources/rulesets/fuse/138-sonic-catchall.windup.yaml
rename to resources/rulesets/fuse/182-sonic-catchall.windup.yaml
index 7b435d9..98eb0a0 100644
--- a/resources/rulesets/fuse/138-sonic-catchall.windup.yaml
+++ b/resources/rulesets/fuse/182-sonic-catchall.windup.yaml
@@ -17,9 +17,9 @@
   - sonic
   - catchall
   links: []
-  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 "
+  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.
   ruleID: sonic-catchall-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/fuse/139-sonic-esb.windup.yaml b/resources/rulesets/fuse/183-sonic-esb.windup.yaml
similarity index 75%
rename from resources/rulesets/fuse/139-sonic-esb.windup.yaml
rename to resources/rulesets/fuse/183-sonic-esb.windup.yaml
index ea32073..cd7efb5 100644
--- a/resources/rulesets/fuse/139-sonic-esb.windup.yaml
+++ b/resources/rulesets/fuse/183-sonic-esb.windup.yaml
@@ -11,9 +11,10 @@
   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: "\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 "
+  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)
   ruleID: sonic-esb-01000
   tag:
   - sonic-esb
@@ -33,20 +34,35 @@
   - sonic-esb
   - camel
   links: []
-  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 "
+  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
   ruleID: sonic-esb-02000
   when:
     or:
@@ -68,13 +84,19 @@
   - camel
   - spring
   links: []
-  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 "
+  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
+     }}
+     ```
   ruleID: sonic-esb-03000
   when:
     or:
@@ -302,7 +324,7 @@
   - camel
   - slf4j
   links: []
-  message: "\n Migrate to [Apache SLF4J](http://www.slf4j.org).\n "
+  message: Migrate to [Apache SLF4J](http://www.slf4j.org).
   ruleID: sonic-esb-15000
   when:
     or:
@@ -323,9 +345,10 @@
   - sonic-esb
   - camel
   links: []
-  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 "
+  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)
   ruleID: sonic-esb-16000
   when:
     or:
@@ -346,8 +369,10 @@
   - sonic-esb
   - camel
   links: []
-  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 "
+  message: |-
+    Correlation is handled several ways in Camel. Read the article below.
+
+     * [Camel Exception Handling](http://camel.apache.org/correlation-identifier.html)
   ruleID: sonic-esb-17000
   when:
     java.referenced:
@@ -364,12 +389,12 @@
   - sonic-esb
   - camel
   links: []
-  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 "
+  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)
   ruleID: sonic-esb-18000
   when:
     java.referenced:
@@ -386,11 +411,11 @@
   - sonic-esb
   - camel
   links: []
-  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 "
+  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)
   ruleID: sonic-esb-19000
   when:
     java.referenced:
diff --git a/resources/rulesets/fuse/140-xml-sonic-esb.windup.yaml b/resources/rulesets/fuse/184-xml-sonic-esb.windup.yaml
similarity index 100%
rename from resources/rulesets/fuse/140-xml-sonic-esb.windup.yaml
rename to resources/rulesets/fuse/184-xml-sonic-esb.windup.yaml
diff --git a/resources/rulesets/hibernate/143-hibernate-xml.windup.yaml b/resources/rulesets/hibernate/143-hibernate-xml.windup.yaml
deleted file mode 100644
index 9e6f971..0000000
--- a/resources/rulesets/hibernate/143-hibernate-xml.windup.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: 'Hibernate: Deprecated ''string'' CLOB data type'
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate3.9-
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=hibernate4+
-  - konveyor.io/target=hibernate
-  - hibernate
-  - configuration
-  links: []
-  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
-  ruleID: hibernate-xml-01000
-  when:
-    and:
-    - as: "1"
-      builtin.xml:
-        namespaces: {}
-        xpath: /hibernate-mapping
-    - as: "2"
-      builtin.xml:
-        namespaces: {}
-        xpath: //*[@type='string']
-      from: "1"
-- category: mandatory
-  customVariables: []
-  description: hibernate.jdbc.use_streams_for_binary must be set according to the
-    provider
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate3.9-
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=hibernate4+
-  - konveyor.io/target=hibernate
-  - hibernate
-  - configuration
-  links: []
-  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:
-    and:
-    - as: "1"
-      builtin.xml:
-        namespaces: {}
-        xpath: /hibernate-configuration
-    - as: "2"
-      builtin.xml:
-        namespaces: {}
-        xpath: //property[@name='hibernate.jdbc.use_streams_for_binary']
-      from: "1"
-- category: mandatory
-  customVariables: []
-  description: 'Hibernate: Removed package org.hibernate.connection'
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate3.9-
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=hibernate4+
-  - konveyor.io/target=hibernate
-  - 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`.\n You should change
-    your Hibernate setup to replace references to the old package names.\n "
-  ruleID: hibernate-xml-03000
-  when:
-    builtin.filecontent:
-      filePattern: hibernate-configuration\.xml
-      pattern: org.hibernate.connection
diff --git a/resources/rulesets/hibernate/142-hibernate-catchall.windup.yaml b/resources/rulesets/hibernate/186-hibernate-catchall.windup.yaml
similarity index 100%
rename from resources/rulesets/hibernate/142-hibernate-catchall.windup.yaml
rename to resources/rulesets/hibernate/186-hibernate-catchall.windup.yaml
diff --git a/resources/rulesets/hibernate/187-hibernate-xml.windup.yaml b/resources/rulesets/hibernate/187-hibernate-xml.windup.yaml
new file mode 100644
index 0000000..074398d
--- /dev/null
+++ b/resources/rulesets/hibernate/187-hibernate-xml.windup.yaml
@@ -0,0 +1,122 @@
+- category: mandatory
+  customVariables: []
+  description: 'Hibernate: Deprecated ''string'' CLOB data type'
+  effort: 1
+  labels:
+  - konveyor.io/source=hibernate3.9-
+  - konveyor.io/source=hibernate
+  - konveyor.io/target=hibernate4+
+  - konveyor.io/target=hibernate
+  - hibernate
+  - configuration
+  links: []
+  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
+  ruleID: hibernate-xml-01000
+  when:
+    and:
+    - as: "1"
+      builtin.xml:
+        namespaces: {}
+        xpath: /hibernate-mapping
+    - as: "2"
+      builtin.xml:
+        namespaces: {}
+        xpath: //*[@type='string']
+      from: "1"
+- category: mandatory
+  customVariables: []
+  description: hibernate.jdbc.use_streams_for_binary must be set according to the
+    provider
+  effort: 1
+  labels:
+  - konveyor.io/source=hibernate3.9-
+  - konveyor.io/source=hibernate
+  - konveyor.io/target=hibernate4+
+  - konveyor.io/target=hibernate
+  - 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.\n\t\t\tIf you
+    are using PostgreSQL and using the CLOB or BLOB properties, this global environment
+    variable must be set to false."
+  ruleID: hibernate-xml-02000
+  when:
+    and:
+    - as: "1"
+      builtin.xml:
+        namespaces: {}
+        xpath: /hibernate-configuration
+    - as: "2"
+      builtin.xml:
+        namespaces: {}
+        xpath: //property[@name='hibernate.jdbc.use_streams_for_binary']
+      from: "1"
+- category: mandatory
+  customVariables: []
+  description: 'Hibernate: Removed package org.hibernate.connection'
+  effort: 1
+  labels:
+  - konveyor.io/source=hibernate3.9-
+  - konveyor.io/source=hibernate
+  - konveyor.io/target=hibernate4+
+  - konveyor.io/target=hibernate
+  - 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.
+  ruleID: hibernate-xml-03000
+  when:
+    builtin.filecontent:
+      filePattern: hibernate-configuration\.xml
+      pattern: org.hibernate.connection
+- customVariables: []
+  description: 'Hibernate: Deprecated dtd configuration namespace'
+  labels:
+  - konveyor.io/source=hibernate3.9-
+  - konveyor.io/source=hibernate
+  - konveyor.io/target=hibernate4+
+  - konveyor.io/target=hibernate
+  - hibernate
+  - configuration
+  links:
+  - title: Hibernate 3.5 to 4 - DTD
+    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: " Hibernate 4.0 uses http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd
+    instead.\n                     "
+  ruleID: hibernate-xml-04000
+  tag:
+  - hibernate
+  - configuration
+  - 'Hibernate: Deprecated dtd configuration namespace'
+  when:
+    builtin.xml:
+      namespaces: {}
+      xpath: //*[@system-id='']
+- customVariables: []
+  description: 'Hibernate: Deprecated dtd mapping namespace'
+  labels:
+  - konveyor.io/source=hibernate3.9-
+  - konveyor.io/source=hibernate
+  - konveyor.io/target=hibernate4+
+  - konveyor.io/target=hibernate
+  - hibernate
+  - configuration
+  links:
+  - title: Hibernate 3.5 to 4 - DTD
+    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: " Hibernate 4.0 uses http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd
+    instead.\n                     "
+  ruleID: hibernate-xml-05000
+  tag:
+  - hibernate
+  - configuration
+  - 'Hibernate: Deprecated dtd mapping namespace'
+  when:
+    builtin.xml:
+      namespaces: {}
+      xpath: //*[@system-id='']
diff --git a/resources/rulesets/hibernate/144-hibernate.windup.yaml b/resources/rulesets/hibernate/188-hibernate.windup.yaml
similarity index 82%
rename from resources/rulesets/hibernate/144-hibernate.windup.yaml
rename to resources/rulesets/hibernate/188-hibernate.windup.yaml
index 7825f35..2205634 100644
--- a/resources/rulesets/hibernate/144-hibernate.windup.yaml
+++ b/resources/rulesets/hibernate/188-hibernate.windup.yaml
@@ -13,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: "\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 "
+  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.
   ruleID: hibernate-01000
   when:
     java.referenced:
@@ -39,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: "\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 "
+  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.
   ruleID: hibernate-02000
   when:
     java.referenced:
@@ -62,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: "\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 "
+  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.
   ruleID: hibernate-03000
   when:
     java.referenced:
@@ -123,11 +123,11 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  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 "
+  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.
   ruleID: hibernate-06000
   when:
     or:
@@ -150,8 +150,9 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  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 "
+  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.
   ruleID: hibernate-07000
   when:
     or:
@@ -176,7 +177,7 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  message: "Replace org.hibernate.engine.SessionImplementor with org.hibernate.engine.spi.SessionImplementor\n "
+  message: Replace org.hibernate.engine.SessionImplementor with org.hibernate.engine.spi.SessionImplementor
   ruleID: hibernate-08000
   when:
     java.referenced:
@@ -239,9 +240,9 @@
   - konveyor.io/target=eap
   - hibernate
   links: []
-  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 "
+  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.
   ruleID: hibernate-10100
   tag:
   - Hibernate 2.x - Renamed package 'net.sf.hibernate'
diff --git a/resources/rulesets/jakarta-ee9/189-spring-components.windup.yaml b/resources/rulesets/jakarta-ee9/189-spring-components.windup.yaml
new file mode 100644
index 0000000..893d817
--- /dev/null
+++ b/resources/rulesets/jakarta-ee9/189-spring-components.windup.yaml
@@ -0,0 +1,47 @@
+- category: mandatory
+  customVariables: []
+  description: Version of Spring Boot not compatible with Jakarta EE 9+
+  effort: 3
+  labels:
+  - konveyor.io/target=jakarta-ee9+
+  - konveyor.io/target=jakarta-ee
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
+  - konveyor.io/source
+  links:
+  - title: A Java 17 and Jakarta EE 9 baseline for Spring Framework 6
+    url: https://spring.io/blog/2021/09/02/a-java-17-and-jakarta-ee-9-baseline-for-spring-framework-6/
+  message: Version 3.0.0 is the minimum version of Spring Boot that is Jakarta EE
+    9+ compatible
+  ruleID: spring-components-00001
+  when:
+    or:
+    - java.dependency:
+        nameregex: org\.springframework\.boot\..*
+        upperbound: 2.99.999
+    - java.dependency:
+        nameregex: org\.springframework\.boot\..*
+        upperbound: 2.99.999
+- category: mandatory
+  customVariables: []
+  description: Version of Spring not compatible with Jakarta EE 9+
+  effort: 3
+  labels:
+  - konveyor.io/target=jakarta-ee9+
+  - konveyor.io/target=jakarta-ee
+  - konveyor.io/target=jws6+
+  - konveyor.io/target=jws
+  - konveyor.io/source
+  links:
+  - title: A Java 17 and Jakarta EE 9 baseline for Spring Framework 6
+    url: https://spring.io/blog/2021/09/02/a-java-17-and-jakarta-ee-9-baseline-for-spring-framework-6/
+  message: Version 6.0.0 is the minimum version of Spring that is Jakarta EE 9+ compatible
+  ruleID: spring-components-00002
+  when:
+    or:
+    - java.dependency:
+        nameregex: org\.springframework\..*
+        upperbound: 5.99.999
+    - java.dependency:
+        nameregex: org\.springframework\..*
+        upperbound: 5.99.999
diff --git a/resources/rulesets/jakarta-ee9/ruleset.yaml b/resources/rulesets/jakarta-ee9/ruleset.yaml
new file mode 100644
index 0000000..7025d9b
--- /dev/null
+++ b/resources/rulesets/jakarta-ee9/ruleset.yaml
@@ -0,0 +1 @@
+name: jakarta-ee9
diff --git a/resources/rulesets/openjdk11/145-java-removals.windup.yaml b/resources/rulesets/openjdk11/191-java-removals.windup.yaml
similarity index 59%
rename from resources/rulesets/openjdk11/145-java-removals.windup.yaml
rename to resources/rulesets/openjdk11/191-java-removals.windup.yaml
index ea2a69e..df37470 100644
--- a/resources/rulesets/openjdk11/145-java-removals.windup.yaml
+++ b/resources/rulesets/openjdk11/191-java-removals.windup.yaml
@@ -4,15 +4,15 @@
   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: "\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 "
+  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`.
   ruleID: java-removals-00000
   when:
     or:
@@ -28,13 +28,17 @@
   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: "\n Java 9 introduced the `StackWalker API` to replace `sun.reflect.Reflection`.
+    url: https://github.com/openjdk/jfx/commit/d647521fa83f0cebe9532642ee97ffc4356c8bb3
+  - title: JDK-8154203
+    url: https://bugs.openjdk.org/browse/JDK-8154203
+  message: "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 "
+    method should no longer be needed. \n Refer to the example changeset linked below."
   ruleID: java-removals-00010
   when:
     or:
@@ -50,12 +54,17 @@
   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: "\n `sun.reflect.CallerSensitive` annotation was deprecated in Java 9.\n
-    Refer to the example changeset linked below. \n "
+    url: https://github.com/openjdk/jfx/commit/d647521fa83f0cebe9532642ee97ffc4356c8bb3
+  - title: JDK-8154203
+    url: https://bugs.openjdk.org/browse/JDK-8154203
+  message: |-
+    `sun.reflect.CallerSensitive` annotation was deprecated in Java 9.
+     Refer to the example changeset linked below.
   ruleID: java-removals-00020
   when:
     or:
@@ -71,17 +80,19 @@
   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: "\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 "
+  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)
   ruleID: java-removals-00030
   when:
     java.referenced:
@@ -95,21 +106,25 @@
   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: "\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.\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\"))`\n "
+  message: |-
+    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"))`
   ruleID: java-removals-00040
   when:
     java.referenced:
@@ -122,14 +137,17 @@
   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: "\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 "
+  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"))`.
   ruleID: java-removals-00041
   when:
     java.referenced:
@@ -142,14 +160,16 @@
   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: "\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 "
+  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.
   ruleID: java-removals-00050
   when:
     java.referenced:
@@ -162,14 +182,16 @@
   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: "\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 "
+  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.
   ruleID: java-removals-00060
   when:
     java.referenced:
@@ -182,16 +204,18 @@
   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: "\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 "
+  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.
   ruleID: java-removals-00100
   when:
     or:
@@ -213,28 +237,28 @@
     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
-  effort: 2
+  effort: 1
   labels:
   - konveyor.io/source=openjdk8-
+  - konveyor.io/source=openjdk
   - konveyor.io/target=openjdk11+
+  - konveyor.io/target=openjdk
   links:
+  - title: JDK-8054494
+    url: https://bugs.openjdk.org/browse/JDK-8054494
   - title: Test changes for JDK-8054494
-    url: https://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/0a0a0986400e#l2.19
+    url: https://github.com/openjdk/jdk/commit/083d9a2b6145a422bad64423675660c94bb32958#diff-12d7d73c9a167ec9451fe5e53373574adc02d9179cab3465e096a07d1aa79fc7
   - title: Variable Handles
     url: https://openjdk.java.net/jeps/193
-  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.\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).\n\n In the long term, please consider using Variable Handles
-    (see the link below)\n "
+  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 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)
   ruleID: java-removals-00110
   when:
     java.referenced:
@@ -249,23 +273,27 @@
   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
+  - title: JDK-8006182
+    url: https://bugs.openjdk.org/browse/JDK-8006182
   - title: Code example
-    url: https://hg.openjdk.java.net/jdk8/jdk8/jdk/rev/9078c34437ab
+    url: https://github.com/openjdk/jdk/commit/ec9e303630158405d0faaabb74f466f0a376c1fc
   - title: OpenJDK - Original enhancement request
     url: https://bugs.openjdk.java.net/browse/JDK-8006182
-  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}}()`
+  message: "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 "
+    below."
   ruleID: java-removals-00120
   when:
     java.referenced:
-      location: PACKAGE
+      location: IMPORT
       pattern: sun.misc.BASE64(Encoder|Decoder)*
 - category: mandatory
   customVariables: []
@@ -273,15 +301,18 @@
   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: "\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 "
+  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.
   ruleID: java-removals-00130
   when:
     or:
@@ -298,17 +329,19 @@
   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: "\n The `java.awt.Font.getPeer()` and `java.awt.Component.getPeer()` methods
+  message: "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 "
+    method."
   ruleID: java-removals-00140
   when:
     or:
@@ -324,17 +357,18 @@
   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: "\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 "
+  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)
   ruleID: java-removals-00150
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk11/146-removed-javaee-modules.windup.yaml b/resources/rulesets/openjdk11/192-removed-javaee-modules.windup.yaml
similarity index 68%
rename from resources/rulesets/openjdk11/146-removed-javaee-modules.windup.yaml
rename to resources/rulesets/openjdk11/192-removed-javaee-modules.windup.yaml
index 66a955f..886943c 100644
--- a/resources/rulesets/openjdk11/146-removed-javaee-modules.windup.yaml
+++ b/resources/rulesets/openjdk11/192-removed-javaee-modules.windup.yaml
@@ -4,12 +4,18 @@
   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: "\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 "
+  message: |-
+    Add the `jakarta.activation` dependency to your application's `pom.xml`.
+
+     `<groupId>jakarta.activation</groupId>`
+
+     `<artifactId>jakarta.activation</artifactId>`
   ruleID: removed-javaee-modules-00000
   when:
     java.referenced:
@@ -21,15 +27,17 @@
   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: "\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 "
+  message: "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."
   ruleID: removed-javaee-modules-00010
   when:
     or:
@@ -49,12 +57,18 @@
   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: "\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 "
+  message: |-
+    Add the `jakarta.annotation` dependency to your application's `pom.xml`.
+
+     `<groupId>jakarta.annotation</groupId>`
+
+     `<artifactId>jakarta.annotation-api</artifactId>`
   ruleID: removed-javaee-modules-00020
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk17/147-applet-api-deprecation.windup.yaml b/resources/rulesets/openjdk17/193-applet-api-deprecation.windup.yaml
similarity index 68%
rename from resources/rulesets/openjdk17/147-applet-api-deprecation.windup.yaml
rename to resources/rulesets/openjdk17/193-applet-api-deprecation.windup.yaml
index dbf7db9..13f876a 100644
--- a/resources/rulesets/openjdk17/147-applet-api-deprecation.windup.yaml
+++ b/resources/rulesets/openjdk17/193-applet-api-deprecation.windup.yaml
@@ -4,13 +4,15 @@
   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: "\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 "
+  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.
   ruleID: applet-api-deprecation-00000
   when:
     or:
diff --git a/resources/rulesets/openjdk17/148-lombok.windup.yaml b/resources/rulesets/openjdk17/194-lombok.windup.yaml
similarity index 64%
rename from resources/rulesets/openjdk17/148-lombok.windup.yaml
rename to resources/rulesets/openjdk17/194-lombok.windup.yaml
index c814a68..1373c9e 100644
--- a/resources/rulesets/openjdk17/148-lombok.windup.yaml
+++ b/resources/rulesets/openjdk17/194-lombok.windup.yaml
@@ -4,13 +4,15 @@
   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: "\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 "
+  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.
   ruleID: lombok-incompatibility-00001
   when:
     java.dependency:
diff --git a/resources/rulesets/openjdk17/149-removed-classes.windup.yaml b/resources/rulesets/openjdk17/195-removed-classes.windup.yaml
similarity index 63%
rename from resources/rulesets/openjdk17/149-removed-classes.windup.yaml
rename to resources/rulesets/openjdk17/195-removed-classes.windup.yaml
index b8c0b84..e375314 100644
--- a/resources/rulesets/openjdk17/149-removed-classes.windup.yaml
+++ b/resources/rulesets/openjdk17/195-removed-classes.windup.yaml
@@ -7,16 +7,18 @@
   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: "\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 "
+  message: "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."
   ruleID: removed-classes-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk17/150-removed-packages.windup.yaml b/resources/rulesets/openjdk17/196-removed-packages.windup.yaml
similarity index 71%
rename from resources/rulesets/openjdk17/150-removed-packages.windup.yaml
rename to resources/rulesets/openjdk17/196-removed-packages.windup.yaml
index f1fc813..ff9cc5a 100644
--- a/resources/rulesets/openjdk17/150-removed-packages.windup.yaml
+++ b/resources/rulesets/openjdk17/196-removed-packages.windup.yaml
@@ -4,12 +4,14 @@
   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: "\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 "
+  message: RMI activation and its associated daemon, rmid, and code package, java.rmi.activation
+    were deprecated in OpenJDK 15 and removed in OpenJDK 17.
   ruleID: removed-packages-00000
   when:
     java.referenced:
@@ -22,16 +24,18 @@
   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: "\n The Nashorn scripting implementation has been removed from OpenJDK
-    15 onwards. \n The javax.script API is still present and third party implementations,
+  message: "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 "
+    its packages should be removed or substituted with the third party implementations."
   ruleID: removed-packages-00010
   when:
     or:
diff --git a/resources/rulesets/openjdk17/151-security-manager-deprecation.windup.yaml b/resources/rulesets/openjdk17/197-security-manager-deprecation.windup.yaml
similarity index 76%
rename from resources/rulesets/openjdk17/151-security-manager-deprecation.windup.yaml
rename to resources/rulesets/openjdk17/197-security-manager-deprecation.windup.yaml
index 44938fa..35892af 100644
--- a/resources/rulesets/openjdk17/151-security-manager-deprecation.windup.yaml
+++ b/resources/rulesets/openjdk17/197-security-manager-deprecation.windup.yaml
@@ -7,12 +7,14 @@
   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: "\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 "
+  message: "The Java Security Manager API is deprecated in Java 17. Any references
+    to it should be removed. \n See the link for further information."
   ruleID: security-manager-deprecation-00000
   when:
     java.referenced:
@@ -26,12 +28,14 @@
   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: "\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 "
+  message: "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."
   ruleID: security-manager-deprecation-00010
   when:
     java.referenced:
@@ -45,12 +49,14 @@
   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: "\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 "
+  message: "The java.lang.System::getSecurityManager and java.lang.System::setSecurityManager
+    methods have been deprecated in Java 17. \n See the link for further information."
   ruleID: security-manager-deprecation-00020
   when:
     java.referenced:
@@ -62,12 +68,14 @@
   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: "\n The java.lang.Thread::checkAccess method has been deprecated in Java
-    17. \n See the link for further information.\n "
+  message: "The java.lang.Thread::checkAccess method has been deprecated in Java 17.
+    \n See the link for further information."
   ruleID: security-manager-deprecation-00030
   when:
     java.referenced:
@@ -79,12 +87,14 @@
   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: "\n The java.lang.ThreadGroup::checkAccess method has been deprecated in
-    Java 17. \n See the link for further information.\n "
+  message: "The java.lang.ThreadGroup::checkAccess method has been deprecated in Java
+    17. \n See the link for further information."
   ruleID: security-manager-deprecation-00040
   when:
     java.referenced:
@@ -96,12 +106,14 @@
   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: "\n The java.util.logging.LogManager::checkAccess method has been deprecated
-    in Java 17. \n See the link for further information.\n "
+  message: "The java.util.logging.LogManager::checkAccess method has been deprecated
+    in Java 17. \n See the link for further information."
   ruleID: security-manager-deprecation-00050
   when:
     java.referenced:
@@ -116,12 +128,14 @@
   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: "\n The java.util.concurrent.Executors::{{methodNames}} method has been
-    deprecated in Java 17. \n See the link for further information.\n "
+  message: "The java.util.concurrent.Executors::{{methodNames}} method has been deprecated
+    in Java 17. \n See the link for further information."
   ruleID: security-manager-deprecation-00060
   when:
     java.referenced:
@@ -136,12 +150,14 @@
   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: "\n The javax.security.auth.Subject::{{methName}} method has been deprecated
-    in Java 17. \n See the link for further information.\n "
+  message: "The javax.security.auth.Subject::{{methName}} method has been deprecated
+    in Java 17. \n See the link for further information."
   ruleID: security-manager-deprecation-00070
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk21/01-deprecation-openjdk18.windup.yaml b/resources/rulesets/openjdk21/198-deprecation-openjdk18.windup.yaml
similarity index 78%
rename from resources/rulesets/openjdk21/01-deprecation-openjdk18.windup.yaml
rename to resources/rulesets/openjdk21/198-deprecation-openjdk18.windup.yaml
index 5562368..86398f4 100644
--- a/resources/rulesets/openjdk21/01-deprecation-openjdk18.windup.yaml
+++ b/resources/rulesets/openjdk21/198-deprecation-openjdk18.windup.yaml
@@ -8,8 +8,8 @@
   - konveyor.io/target=openjdk18+
   - konveyor.io/target=openjdk
   links: []
-  message: "\n This `doAs` signature has been deprecated in JDK18 for removal in a
-    future release.\n "
+  message: This `doAs` signature has been deprecated in JDK18 for removal in a future
+    release.
   ruleID: deprecation-00000
   when:
     java.referenced:
@@ -25,8 +25,8 @@
   - konveyor.io/target=openjdk18+
   - konveyor.io/target=openjdk
   links: []
-  message: "\n The `Thread.stop()` signature has been deprecated in JDK18 for removal
-    in a future release.\n "
+  message: The `Thread.stop()` signature has been deprecated in JDK18 for removal
+    in a future release.
   ruleID: deprecation-00005
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk21/02-deprecation-openjdk19.windup.yaml b/resources/rulesets/openjdk21/199-deprecation-openjdk19.windup.yaml
similarity index 90%
rename from resources/rulesets/openjdk21/02-deprecation-openjdk19.windup.yaml
rename to resources/rulesets/openjdk21/199-deprecation-openjdk19.windup.yaml
index d5ddc26..b5df864 100644
--- a/resources/rulesets/openjdk21/02-deprecation-openjdk19.windup.yaml
+++ b/resources/rulesets/openjdk21/199-deprecation-openjdk19.windup.yaml
@@ -8,8 +8,8 @@
   - konveyor.io/target=openjdk19+
   - konveyor.io/target=openjdk
   links: []
-  message: "\n Several classes under `javax.swing.plaf.basic` have been deprecated
-    in JDK 19 for removal in a future release.\n "
+  message: Several classes under `javax.swing.plaf.basic` have been deprecated in
+    JDK 19 for removal in a future release.
   ruleID: deprecation-00010
   when:
     or:
diff --git a/resources/rulesets/openjdk21/03-deprecation-openjdk20.windup.yaml b/resources/rulesets/openjdk21/200-deprecation-openjdk20.windup.yaml
similarity index 85%
rename from resources/rulesets/openjdk21/03-deprecation-openjdk20.windup.yaml
rename to resources/rulesets/openjdk21/200-deprecation-openjdk20.windup.yaml
index 72de3d7..79734e2 100644
--- a/resources/rulesets/openjdk21/03-deprecation-openjdk20.windup.yaml
+++ b/resources/rulesets/openjdk21/200-deprecation-openjdk20.windup.yaml
@@ -8,8 +8,8 @@
   - konveyor.io/target=openjdk20+
   - konveyor.io/target=openjdk
   links: []
-  message: "\n Several classes under `javax` have been deprecated in JDK 20 for removal
-    in a future release.\n "
+  message: Several classes under `javax` have been deprecated in JDK 20 for removal
+    in a future release.
   ruleID: deprecation-00020
   when:
     or:
diff --git a/resources/rulesets/openjdk21/04-deprecation-openjdk21.windup.yaml b/resources/rulesets/openjdk21/201-deprecation-openjdk21.windup.yaml
similarity index 77%
rename from resources/rulesets/openjdk21/04-deprecation-openjdk21.windup.yaml
rename to resources/rulesets/openjdk21/201-deprecation-openjdk21.windup.yaml
index 9a4948d..09e0eea 100644
--- a/resources/rulesets/openjdk21/04-deprecation-openjdk21.windup.yaml
+++ b/resources/rulesets/openjdk21/201-deprecation-openjdk21.windup.yaml
@@ -8,8 +8,8 @@
   - konveyor.io/target=openjdk21+
   - konveyor.io/target=openjdk
   links: []
-  message: "\n The `load(URL)` method under `SynthLookAndFeel` has been deprecated
-    in JDK 21 for removal in a future release.\n "
+  message: The `load(URL)` method under `SynthLookAndFeel` has been deprecated in
+    JDK 21 for removal in a future release.
   ruleID: deprecation-00030
   when:
     or:
diff --git a/resources/rulesets/openjdk21/05-dynamic-agents.windup.yaml b/resources/rulesets/openjdk21/202-dynamic-agents.windup.yaml
similarity index 73%
rename from resources/rulesets/openjdk21/05-dynamic-agents.windup.yaml
rename to resources/rulesets/openjdk21/202-dynamic-agents.windup.yaml
index 326d902..663b7e2 100644
--- a/resources/rulesets/openjdk21/05-dynamic-agents.windup.yaml
+++ b/resources/rulesets/openjdk21/202-dynamic-agents.windup.yaml
@@ -13,9 +13,9 @@
   - title: 'Issue tracker: Implementation of Prepare to Restrict The Dynamic Loading
       of Agents'
     url: https://bugs.openjdk.org/browse/JDK-8307479
-  message: "\n Dynamic loading of agents will be restricted at a later JDK release.\n
-    JDKs can use the `-XX:-EnableDynamicAgentLoading` command line option starting
-    in JDK21 to ensure that agents cannot be loaded dynamically.\n "
+  message: |-
+    Dynamic loading of agents will be restricted at a later JDK release.
+     JDKs can use the `-XX:-EnableDynamicAgentLoading` command line option starting in JDK21 to ensure that agents cannot be loaded dynamically.
   ruleID: dynamic-agents-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk21/06-finalization-deprecation.windup.yaml b/resources/rulesets/openjdk21/203-finalization-deprecation.windup.yaml
similarity index 61%
rename from resources/rulesets/openjdk21/06-finalization-deprecation.windup.yaml
rename to resources/rulesets/openjdk21/203-finalization-deprecation.windup.yaml
index f3d7fa8..4840c5b 100644
--- a/resources/rulesets/openjdk21/06-finalization-deprecation.windup.yaml
+++ b/resources/rulesets/openjdk21/203-finalization-deprecation.windup.yaml
@@ -11,10 +11,10 @@
   links:
   - title: 'JEP 421: Deprecate Finalization for Removal'
     url: https://openjdk.org/jeps/421
-  message: "\n Finalization has been deprecated for removal in a future release by
-    JDK18. It continues to work now but users should start their migration off finalizers.\n
-    Use `Cleaner` or `PhantomReference` instead (see the provided link below).\n Users
-    can test what happens with finalization disable by running with: `-finalization=disabled`.\n "
+  message: |-
+    Finalization has been deprecated for removal in a future release by JDK18. It continues to work now but users should start their migration off finalizers.
+     Use `Cleaner` or `PhantomReference` instead (see the provided link below).
+     Users can test what happens with finalization disable by running with: `-finalization=disabled`.
   ruleID: finalization-deprecation-00000
   when:
     java.referenced:
@@ -33,10 +33,10 @@
   links:
   - title: 'JEP 421: Deprecate Finalization for Removal'
     url: https://openjdk.org/jeps/421
-  message: "\n Finalization has been deprecated for removal in a future release by
-    JDK18. It continues to work now but users should start their migration off finalizers.\n
-    Use `Cleaner` or `PhantomReference` instead (see the provided link below).\n Users
-    can test what happens with finalization disable by running with: `-finalization=disabled`.\n "
+  message: |-
+    Finalization has been deprecated for removal in a future release by JDK18. It continues to work now but users should start their migration off finalizers.
+     Use `Cleaner` or `PhantomReference` instead (see the provided link below).
+     Users can test what happens with finalization disable by running with: `-finalization=disabled`.
   ruleID: finalization-deprecation-00010
   when:
     or:
diff --git a/resources/rulesets/openjdk21/07-removed-apis.windup.yaml b/resources/rulesets/openjdk21/204-removed-apis.windup.yaml
similarity index 77%
rename from resources/rulesets/openjdk21/07-removed-apis.windup.yaml
rename to resources/rulesets/openjdk21/204-removed-apis.windup.yaml
index 224cb8d..f0a5bf7 100644
--- a/resources/rulesets/openjdk21/07-removed-apis.windup.yaml
+++ b/resources/rulesets/openjdk21/204-removed-apis.windup.yaml
@@ -7,8 +7,8 @@
   - konveyor.io/target=openjdk
   - konveyor.io/source
   links: []
-  message: "\n This finalization method has been removed between JDK 18 and 21 and
-    must be removed from the code.\n "
+  message: This finalization method has been removed between JDK 18 and 21 and must
+    be removed from the code.
   ruleID: removed-apis-00000
   when:
     or:
@@ -30,8 +30,8 @@
   - konveyor.io/target=openjdk
   - konveyor.io/source
   links: []
-  message: "\n The `java.lang.ThreadGroup.allowThreadSuspension` method has been removed
-    and cannot be used anymore.\n "
+  message: The `java.lang.ThreadGroup.allowThreadSuspension` method has been removed
+    and cannot be used anymore.
   ruleID: removed-apis-00005
   when:
     java.referenced:
@@ -46,8 +46,7 @@
   - konveyor.io/target=openjdk
   - konveyor.io/source
   links: []
-  message: "\n The `java.lang.Compiler` method has been removed and cannot be used
-    anymore.\n "
+  message: The `java.lang.Compiler` method has been removed and cannot be used anymore.
   ruleID: removed-apis-00010
   when:
     java.referenced:
@@ -61,8 +60,8 @@
   - konveyor.io/target=openjdk
   - konveyor.io/source
   links: []
-  message: "\n The `javax.management.remote.rmi.RMIIIOPServerImpl` method has been
-    removed and cannot be used anymore.\n "
+  message: The `javax.management.remote.rmi.RMIIIOPServerImpl` method has been removed
+    and cannot be used anymore.
   ruleID: removed-apis-00015
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk21/08-utf-8-by-default.windup.yaml b/resources/rulesets/openjdk21/205-utf-8-by-default.windup.yaml
similarity index 96%
rename from resources/rulesets/openjdk21/08-utf-8-by-default.windup.yaml
rename to resources/rulesets/openjdk21/205-utf-8-by-default.windup.yaml
index e1f001e..9000299 100644
--- a/resources/rulesets/openjdk21/08-utf-8-by-default.windup.yaml
+++ b/resources/rulesets/openjdk21/205-utf-8-by-default.windup.yaml
@@ -14,7 +14,7 @@
     url: https://openjdk.org/jeps/400
   message: "If not supplied, the `java.io.{{className}}` constructor uses UTF-8 by
     default. \n If you haven't provided the character set, and UTF-8 is not appropriate
-    for your class, then supply the appropriate character set to the constructor call.\n "
+    for your class, then supply the appropriate character set to the constructor call."
   ruleID: utf-8-by-default-00000
   when:
     java.referenced:
@@ -36,7 +36,7 @@
     url: https://openjdk.org/jeps/400
   message: "If not supplied, the `java.util.{{classNames}}` constructor uses UTF-8
     by default. \n If you haven't provided the character set, and UTF-8 is not appropriate
-    for your class, then supply the appropriate character set to the constructor call.\n "
+    for your class, then supply the appropriate character set to the constructor call."
   ruleID: utf-8-by-default-00010
   when:
     java.referenced:
@@ -55,7 +55,7 @@
     url: https://openjdk.org/jeps/400
   message: "If not supplied, the `java.net.URLEncoder.encode` method uses UTF-8 by
     default. \n If you haven't provided the character set, and UTF-8 is not appropriate
-    for your class, then then supply the appropriate character set to the method call.\n "
+    for your class, then then supply the appropriate character set to the method call."
   ruleID: utf-8-by-default-00020
   when:
     java.referenced:
@@ -74,7 +74,7 @@
     url: https://openjdk.org/jeps/400
   message: "If not supplied, the `java.net.URLDecoder.decode` method uses UTF-8 by
     default. \n If you haven't provided the character set, and UTF-8 is not appropriate
-    for your class, then then supply the appropriate character set to the method call.\n "
+    for your class, then then supply the appropriate character set to the method call."
   ruleID: utf-8-by-default-00030
   when:
     java.referenced:
diff --git a/resources/rulesets/openjdk7/152-oracle2openjdk.rhamt.yaml b/resources/rulesets/openjdk7/206-oracle2openjdk.rhamt.yaml
similarity index 54%
rename from resources/rulesets/openjdk7/152-oracle2openjdk.rhamt.yaml
rename to resources/rulesets/openjdk7/206-oracle2openjdk.rhamt.yaml
index cf926a9..b1fdba5 100644
--- a/resources/rulesets/openjdk7/152-oracle2openjdk.rhamt.yaml
+++ b/resources/rulesets/openjdk7/206-oracle2openjdk.rhamt.yaml
@@ -3,15 +3,20 @@
   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: "\n Currently OpenJFX (open-source implementation of JavaFX) is neither
-    shipped nor supported on RHEL.\n "
+  message: Currently OpenJFX (open-source implementation of JavaFX) is neither shipped
+    nor supported on RHEL.
   ruleID: oracle2openjdk-00000
   when:
     java.referenced:
@@ -22,14 +27,20 @@
   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: "\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 "
+  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.
   ruleID: oracle2openjdk-00001
   when:
     or:
@@ -41,18 +52,23 @@
         pattern: (java.awt|javafx.scene.text)*Font*
     - java.referenced:
         location: METHOD_CALL
-        pattern: javax.swing*Font*
+        pattern: javax.swing.*Font*
 - category: potential
   customVariables: []
   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: "\n OpenJDK does not support the resource management API for Java.\n "
+  message: OpenJDK does not support the resource management API for Java.
   ruleID: oracle2openjdk-00002
   when:
     java.referenced:
@@ -63,16 +79,19 @@
   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: "\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.\n "
+  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``, remove this property and ensure in your tests that your application still works as expected.
   ruleID: oracle2openjdk-00003
   when:
     java.referenced:
@@ -85,14 +104,19 @@
   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: "\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 "
+  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.
   ruleID: oracle2openjdk-00004
   when:
     java.referenced:
@@ -103,16 +127,21 @@
   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: "\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 "
+  message: "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)"
   ruleID: oracle2openjdk-00005
   when:
     or:
@@ -152,3 +181,42 @@
     - java.referenced:
         location: VARIABLE_DECLARATION
         pattern: java.security.spec.EllipticCurve*
+- category: mandatory
+  customVariables: []
+  description: Oracle JDK JPEG image encoder/decoder usage
+  effort: 3
+  labels:
+  - konveyor.io/source=oraclejdk7+
+  - konveyor.io/source=oraclejdk
+  - konveyor.io/target=openjdk7+
+  - konveyor.io/target=openjdk
+  - oracle-jdk
+  - jdk
+  links:
+  - title: 'java.lang.NoClassDefFoundError: com/sun/image/codec/jpeg/ImageFormatException
+      when using OpenJDK'
+    url: https://access.redhat.com/solutions/443673
+  - title: Java Image I/O tutorial
+    url: https://docs.oracle.com/javase/tutorial/2d/images/saveimage.html
+  - title: Java Image I/O API Guide
+    url: https://docs.oracle.com/javase/8/docs/technotes/guides/imageio/spec/imageio_guideTOC.fm.html
+  message: Replace the use of classes and methods from the `com.sun.image.codec.jpeg`
+    package with `javax.imageio.ImageIO`
+  ruleID: oracle2openjdk-00006
+  when:
+    or:
+    - java.referenced:
+        location: CONSTRUCTOR_CALL
+        pattern: com.sun.image.codec.jpeg*
+    - java.referenced:
+        location: IMPORT
+        pattern: com.sun.image.codec.jpeg*
+    - java.referenced:
+        location: INHERITANCE
+        pattern: com.sun.image.codec.jpeg*
+    - java.referenced:
+        location: METHOD_CALL
+        pattern: com.sun.image.codec.jpeg*
+    - java.referenced:
+        location: VARIABLE_DECLARATION
+        pattern: com.sun.image.codec.jpeg*
diff --git a/resources/rulesets/openliberty/153-liberty-java-unavailable-technologies.windup.yaml b/resources/rulesets/openliberty/207-liberty-java-unavailable-technologies.windup.yaml
similarity index 100%
rename from resources/rulesets/openliberty/153-liberty-java-unavailable-technologies.windup.yaml
rename to resources/rulesets/openliberty/207-liberty-java-unavailable-technologies.windup.yaml
diff --git a/resources/rulesets/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml b/resources/rulesets/openliberty/208-liberty-websphere-unavailable-technologies.windup.yaml
similarity index 99%
rename from resources/rulesets/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml
rename to resources/rulesets/openliberty/208-liberty-websphere-unavailable-technologies.windup.yaml
index 1b3cc92..71ceab3 100644
--- a/resources/rulesets/openliberty/154-liberty-websphere-unavailable-technologies.windup.yaml
+++ b/resources/rulesets/openliberty/208-liberty-websphere-unavailable-technologies.windup.yaml
@@ -21,7 +21,7 @@
         filePattern: .*\.java
         pattern: \"[^\"]*java\:comp/websphere/UserActivitySession[^\"]*\"
     - java.referenced:
-        location: PACKAGE
+        location: IMPORT
         pattern: com.ibm.websphere.ActivitySession*
     - builtin.xml:
         filepaths:
@@ -293,7 +293,7 @@
     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"
+    return false;\"> Dynamic cache in Liberty</a> document </li>\n </div>"
   ruleID: DynamicCacheRule
   when:
     java.referenced:
@@ -1389,12 +1389,12 @@
       pattern: (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*)
 - category: optional
   customVariables:
-  - 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\.[^.]+))
   - name: WebSphereWebServicesGeneratedClassesRule_0_packages
     nameOfCaptureGroup: WebSphereWebServicesGeneratedClassesRule_0_packages
     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\.[^.]+))
+  - 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
   effort: 0
   labels:
diff --git a/resources/rulesets/quarkus/01-agroal-to-quarkus.windup.yaml b/resources/rulesets/quarkus/01-agroal-to-quarkus.windup.yaml
deleted file mode 100644
index f45d155..0000000
--- a/resources/rulesets/quarkus/01-agroal-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'agroal-api' dependency with Quarkus 'quarkus-agroal' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=agroal
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.agroal:agroal-api` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-agroal` \n Further information in the link below.\n "
-  ruleID: quarkus-agroal-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.agroal.agroal-api
-- category: mandatory
-  customVariables: []
-  description: Replace the 'agroal-api' dependency with Quarkus 'quarkus-agroal' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=agroal
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/datasource
-  message: "\n Replace the `io.agroal:agroal-api` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-agroal` \n Further information in the link below.\n "
-  ruleID: quarkus-agroal-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.agroal.agroal-api
diff --git a/resources/rulesets/quarkus/02-amazon-to-quarkus.windup.yaml b/resources/rulesets/quarkus/02-amazon-to-quarkus.windup.yaml
deleted file mode 100644
index 6d91bf3..0000000
--- a/resources/rulesets/quarkus/02-amazon-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,380 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'dynamodb' dependency with Quarkus 'quarkus-amazon-dynamodb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:dynamodb` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-dynamodb` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-amazon-dynamodb-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.dynamodb
-- category: mandatory
-  customVariables: []
-  description: Replace the 'dynamodb' dependency with Quarkus 'quarkus-amazon-dynamodb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-dynamodb
-  message: "\n Replace the `software.amazon.awssdk:dynamodb` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-dynamodb` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-amazon-dynamodb-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.dynamodb
-- category: mandatory
-  customVariables: []
-  description: Replace the 'iam' dependency with Quarkus 'quarkus-amazon-iam' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:iam` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-iam` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-iam-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.iam
-- category: mandatory
-  customVariables: []
-  description: Replace the 'iam' dependency with Quarkus 'quarkus-amazon-iam' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-iam
-  message: "\n Replace the `software.amazon.awssdk:iam` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-iam` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-iam-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.iam
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kms' dependency with Quarkus 'quarkus-amazon-kms' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:kms` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-kms` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-kms-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.kms
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kms' dependency with Quarkus 'quarkus-amazon-kms' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-kms
-  message: "\n Replace the `software.amazon.awssdk:kms` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-kms` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-kms-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.kms
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-lambda-java-core' dependency with Quarkus 'quarkus-amazon-lambda-http'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `com.amazonaws:aws-lambda-java-core` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-amazon-lambda-http` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-amazon-lambda-http-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.aws-lambda-java-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-lambda-java-core' dependency with Quarkus 'quarkus-amazon-lambda-http'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/aws-lambda-http
-  message: "\n Replace the `com.amazonaws:aws-lambda-java-core` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-amazon-lambda-http` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-amazon-lambda-http-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.aws-lambda-java-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-serverless-java-container-core' dependency with Quarkus
-    'quarkus-amazon-lambda-rest' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `com.amazonaws.serverless:aws-serverless-java-container-core`
-    dependency with the Quarkus dependency `io.quarkus:quarkus-amazon-lambda-rest`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-amazon-lambda-rest-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.serverless.aws-serverless-java-container-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-serverless-java-container-core' dependency with Quarkus
-    'quarkus-amazon-lambda-rest' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/aws-lambda-http
-  message: "\n Replace the `com.amazonaws.serverless:aws-serverless-java-container-core`
-    dependency with the Quarkus dependency `io.quarkus:quarkus-amazon-lambda-rest`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-amazon-lambda-rest-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.serverless.aws-serverless-java-container-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-xray-recorder-sdk-aws-sdk-v2' dependency with Quarkus
-    'quarkus-amazon-lambda-xray' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `com.amazonaws:aws-xray-recorder-sdk-aws-sdk-v2` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-amazon-lambda-xray` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-amazon-lambda-xray-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.aws-xray-recorder-sdk-aws-sdk-v2
-- category: mandatory
-  customVariables: []
-  description: Replace the 'aws-xray-recorder-sdk-aws-sdk-v2' dependency with Quarkus
-    'quarkus-amazon-lambda-xray' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/aws-lambda#tracing-with-aws-xray-and-graalvm
-  message: "\n Replace the `com.amazonaws:aws-xray-recorder-sdk-aws-sdk-v2` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-amazon-lambda-xray` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-amazon-lambda-xray-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.amazonaws.aws-xray-recorder-sdk-aws-sdk-v2
-- category: mandatory
-  customVariables: []
-  description: Replace the 's3' dependency with Quarkus 'quarkus-amazon-s3' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:s3` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-s3` \n Further information in the link below.\n "
-  ruleID: quarkus-amazon-s3-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.s3
-- category: mandatory
-  customVariables: []
-  description: Replace the 's3' dependency with Quarkus 'quarkus-amazon-s3' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-s3
-  message: "\n Replace the `software.amazon.awssdk:s3` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-s3` \n Further information in the link below.\n "
-  ruleID: quarkus-amazon-s3-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.s3
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ses' dependency with Quarkus 'quarkus-amazon-ses' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:ses` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-ses` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-ses-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.ses
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ses' dependency with Quarkus 'quarkus-amazon-ses' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-ses
-  message: "\n Replace the `software.amazon.awssdk:ses` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-ses` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-ses-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.ses
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sns' dependency with Quarkus 'quarkus-amazon-sns' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:sns` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-sns` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-sns-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.sns
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sns' dependency with Quarkus 'quarkus-amazon-sns' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-sns
-  message: "\n Replace the `software.amazon.awssdk:sns` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-sns` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-sns-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.sns
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sqs' dependency with Quarkus 'quarkus-amazon-sqs' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:sqs` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-sqs` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-sqs-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.sqs
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sqs' dependency with Quarkus 'quarkus-amazon-sqs' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-sqs
-  message: "\n Replace the `software.amazon.awssdk:sqs` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-sqs` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-sqs-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.sqs
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ssm' dependency with Quarkus 'quarkus-amazon-ssm' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `software.amazon.awssdk:ssm` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-ssm` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-ssm-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.ssm
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ssm' dependency with Quarkus 'quarkus-amazon-ssm' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=amazon
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/amazon-ssm
-  message: "\n Replace the `software.amazon.awssdk:ssm` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-amazon-ssm` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-amazon-ssm-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: software.amazon.awssdk.ssm
diff --git a/resources/rulesets/quarkus/03-apicurio-to-quarkus.windup.yaml b/resources/rulesets/quarkus/03-apicurio-to-quarkus.windup.yaml
deleted file mode 100644
index 1f94baa..0000000
--- a/resources/rulesets/quarkus/03-apicurio-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'apicurio-registry-serdes-avro-serde' dependency with Quarkus
-    'quarkus-apicurio-registry-avro' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=apicurio
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.apicurio:apicurio-registry-serdes-avro-serde` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-apicurio-registry-avro` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-apicurio-registry-avro-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.apicurio.apicurio-registry-serdes-avro-serde
-- category: mandatory
-  customVariables: []
-  description: Replace the 'apicurio-registry-serdes-avro-serde' dependency with Quarkus
-    'quarkus-apicurio-registry-avro' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=apicurio
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kafka-schema-registry-avro
-  message: "\n Replace the `io.apicurio:apicurio-registry-serdes-avro-serde` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-apicurio-registry-avro` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-apicurio-registry-avro-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.apicurio.apicurio-registry-serdes-avro-serde
diff --git a/resources/rulesets/quarkus/04-artemis-to-quarkus.windup.yaml b/resources/rulesets/quarkus/04-artemis-to-quarkus.windup.yaml
deleted file mode 100644
index f30e307..0000000
--- a/resources/rulesets/quarkus/04-artemis-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'artemis-jms-client' dependency with Quarkus 'quarkus-artemis-jms'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=artemis
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.apache.activemq:artemis-jms-client` dependency with
-    the Quarkus dependency `io.quarkus:quarkus-artemis-jms` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-artemis-jms-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.activemq.artemis-jms-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'artemis-jms-client' dependency with Quarkus 'quarkus-artemis-jms'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=artemis
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/jms
-  message: "\n Replace the `org.apache.activemq:artemis-jms-client` dependency with
-    the Quarkus dependency `io.quarkus:quarkus-artemis-jms` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-artemis-jms-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.activemq.artemis-jms-client
diff --git a/resources/rulesets/quarkus/05-avro-to-quarkus.windup.yaml b/resources/rulesets/quarkus/05-avro-to-quarkus.windup.yaml
deleted file mode 100644
index 4859632..0000000
--- a/resources/rulesets/quarkus/05-avro-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'avro' dependency with Quarkus 'quarkus-avro' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=avro
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.apache.avro:avro` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-avro` \n Further information in the link below.\n "
-  ruleID: quarkus-avro-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.avro.avro
-- category: mandatory
-  customVariables: []
-  description: Replace the 'avro' dependency with Quarkus 'quarkus-avro' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=avro
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kafka
-  message: "\n Replace the `org.apache.avro:avro` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-avro` \n Further information in the link below.\n "
-  ruleID: quarkus-avro-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.avro.avro
diff --git a/resources/rulesets/quarkus/06-config-to-quarkus.windup.yaml b/resources/rulesets/quarkus/06-config-to-quarkus.windup.yaml
deleted file mode 100644
index 473eed6..0000000
--- a/resources/rulesets/quarkus/06-config-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'smallrye-config-source-yaml' dependency with Quarkus 'quarkus-config-yaml'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=config
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.smallrye.config:smallrye-config-source-yaml` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-config-yaml` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-config-yaml-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.smallrye.config.smallrye-config-source-yaml
-- category: mandatory
-  customVariables: []
-  description: Replace the 'smallrye-config-source-yaml' dependency with Quarkus 'quarkus-config-yaml'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=config
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/config#yaml
-  message: "\n Replace the `io.smallrye.config:smallrye-config-source-yaml` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-config-yaml` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-config-yaml-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.smallrye.config.smallrye-config-source-yaml
diff --git a/resources/rulesets/quarkus/07-elytron-to-quarkus.windup.yaml b/resources/rulesets/quarkus/07-elytron-to-quarkus.windup.yaml
deleted file mode 100644
index a39f3d5..0000000
--- a/resources/rulesets/quarkus/07-elytron-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-jdbc' dependency with Quarkus 'quarkus-elytron-security-jdbc'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-jdbc` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-jdbc` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-jdbc-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-jdbc
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-jdbc' dependency with Quarkus 'quarkus-elytron-security-jdbc'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/security-jdbc
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-jdbc` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-jdbc` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-jdbc-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-jdbc
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-ldap' dependency with Quarkus 'quarkus-elytron-security-ldap'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-ldap` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-ldap` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-ldap-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-ldap
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-ldap' dependency with Quarkus 'quarkus-elytron-security-ldap'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/security-ldap
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-ldap` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-ldap` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-ldap-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-ldap
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-token' dependency with Quarkus 'quarkus-elytron-security-oauth2'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-token` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-oauth2` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-oauth2-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-token
-- category: mandatory
-  customVariables: []
-  description: Replace the 'wildfly-elytron-realm-token' dependency with Quarkus 'quarkus-elytron-security-oauth2'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=elytron
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/security-oauth2
-  message: "\n Replace the `org.wildfly.security:wildfly-elytron-realm-token` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-elytron-security-oauth2` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-elytron-security-oauth2-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.wildfly.security.wildfly-elytron-realm-token
diff --git a/resources/rulesets/quarkus/08-flyway-to-quarkus.windup.yaml b/resources/rulesets/quarkus/08-flyway-to-quarkus.windup.yaml
deleted file mode 100644
index 239e642..0000000
--- a/resources/rulesets/quarkus/08-flyway-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'flyway-core' dependency with Quarkus 'quarkus-flyway'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=flyway
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.flywaydb:flyway-core` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-flyway` \n Further information in the link below.\n "
-  ruleID: quarkus-flyway-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.flywaydb.flyway-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'flyway-core' dependency with Quarkus 'quarkus-flyway'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=flyway
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/flyway
-  message: "\n Replace the `org.flywaydb:flyway-core` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-flyway` \n Further information in the link below.\n "
-  ruleID: quarkus-flyway-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.flywaydb.flyway-core
diff --git a/resources/rulesets/quarkus/09-hibernate-to-quarkus.windup.yaml b/resources/rulesets/quarkus/09-hibernate-to-quarkus.windup.yaml
deleted file mode 100644
index a043953..0000000
--- a/resources/rulesets/quarkus/09-hibernate-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-envers' dependency with Quarkus 'quarkus-hibernate-envers'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.hibernate:hibernate-envers` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-hibernate-envers` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-hibernate-envers-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.hibernate-envers
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-envers' dependency with Quarkus 'quarkus-hibernate-envers'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm#envers
-  message: "\n Replace the `org.hibernate:hibernate-envers` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-hibernate-envers` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-hibernate-envers-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.hibernate-envers
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-reactive-core' dependency with Quarkus 'quarkus-hibernate-reactive'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.hibernate.reactive:hibernate-reactive-core` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-hibernate-reactive` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-hibernate-reactive-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.reactive.hibernate-reactive-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-reactive-core' dependency with Quarkus 'quarkus-hibernate-reactive'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Quickstart
-    url: https://github.com/quarkusio/quarkus-quickstarts/tree/master/hibernate-reactive-quickstart
-  message: "\n Replace the `org.hibernate.reactive:hibernate-reactive-core` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-hibernate-reactive` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-hibernate-reactive-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.reactive.hibernate-reactive-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-search-backend-elasticsearch-aws' dependency
-    with Quarkus 'quarkus-hibernate-search-orm-elasticsearch-aws' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.hibernate.search:hibernate-search-backend-elasticsearch-aws`
-    dependency with the Quarkus dependency `io.quarkus:quarkus-hibernate-search-orm-elasticsearch-aws`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-hibernate-search-orm-elasticsearch-aws-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.search.hibernate-search-backend-elasticsearch-aws
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-search-backend-elasticsearch-aws' dependency
-    with Quarkus 'quarkus-hibernate-search-orm-elasticsearch-aws' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-search-orm-elasticsearch
-  message: "\n Replace the `org.hibernate.search:hibernate-search-backend-elasticsearch-aws`
-    dependency with the Quarkus dependency `io.quarkus:quarkus-hibernate-search-orm-elasticsearch-aws`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-hibernate-search-orm-elasticsearch-aws-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.search.hibernate-search-backend-elasticsearch-aws
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-validator' dependency with Quarkus 'quarkus-hibernate-validator'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.hibernate.validator:hibernate-validator` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-hibernate-validator` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-hibernate-validator-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.validator.hibernate-validator
-- category: mandatory
-  customVariables: []
-  description: Replace the 'hibernate-validator' dependency with Quarkus 'quarkus-hibernate-validator'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=hibernate
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/validation
-  message: "\n Replace the `org.hibernate.validator:hibernate-validator` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-hibernate-validator` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-hibernate-validator-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.hibernate.validator.hibernate-validator
diff --git a/resources/rulesets/quarkus/10-jdbc-to-quarkus.windup.yaml b/resources/rulesets/quarkus/10-jdbc-to-quarkus.windup.yaml
deleted file mode 100644
index 19c9f0c..0000000
--- a/resources/rulesets/quarkus/10-jdbc-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'jcc' dependency with Quarkus 'quarkus-jdbc-db2' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `com.ibm.db2:jcc` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-jdbc-db2` \n Further information in the link below.\n "
-  ruleID: quarkus-jdbc-db2-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.ibm.db2.jcc
-- category: mandatory
-  customVariables: []
-  description: Replace the 'jcc' dependency with Quarkus 'quarkus-jdbc-db2' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `com.ibm.db2:jcc` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-jdbc-db2` \n Further information in the link below.\n "
-  ruleID: quarkus-jdbc-db2-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.ibm.db2.jcc
-- category: mandatory
-  customVariables: []
-  description: Replace the 'derbyclient' dependency with Quarkus 'quarkus-jdbc-derby'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.apache.derby:derbyclient` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-derby` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-jdbc-derby-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.derby.derbyclient
-- category: mandatory
-  customVariables: []
-  description: Replace the 'derbyclient' dependency with Quarkus 'quarkus-jdbc-derby'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `org.apache.derby:derbyclient` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-derby` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-jdbc-derby-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.derby.derbyclient
-- category: mandatory
-  customVariables: []
-  description: Replace the 'mariadb-java-client' dependency with Quarkus 'quarkus-jdbc-mariadb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.mariadb.jdbc:mariadb-java-client` dependency with
-    the Quarkus dependency `io.quarkus:quarkus-jdbc-mariadb` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-jdbc-mariadb-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.mariadb.jdbc.mariadb-java-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'mariadb-java-client' dependency with Quarkus 'quarkus-jdbc-mariadb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `org.mariadb.jdbc:mariadb-java-client` dependency with
-    the Quarkus dependency `io.quarkus:quarkus-jdbc-mariadb` \n Further information
-    in the link below.\n "
-  ruleID: quarkus-jdbc-mariadb-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.mariadb.jdbc.mariadb-java-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'mysql-connector-java' dependency with Quarkus 'quarkus-jdbc-mysql'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `mysql:mysql-connector-java` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-mysql` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-jdbc-mysql-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: mysql.mysql-connector-java
-- category: mandatory
-  customVariables: []
-  description: Replace the 'mysql-connector-java' dependency with Quarkus 'quarkus-jdbc-mysql'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `mysql:mysql-connector-java` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-mysql` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-jdbc-mysql-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: mysql.mysql-connector-java
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ojdbc11' dependency with Quarkus 'quarkus-jdbc-oracle'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `com.oracle.database.jdbc:ojdbc11` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-jdbc-oracle` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-jdbc-oracle-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.oracle.database.jdbc.ojdbc11
-- category: mandatory
-  customVariables: []
-  description: Replace the 'ojdbc11' dependency with Quarkus 'quarkus-jdbc-oracle'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `com.oracle.database.jdbc:ojdbc11` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-jdbc-oracle` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-jdbc-oracle-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: com.oracle.database.jdbc.ojdbc11
-- category: mandatory
-  customVariables: []
-  description: Replace the 'postgresql' dependency with Quarkus 'quarkus-jdbc-postgresql'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.postgresql:postgresql` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-postgresql` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-jdbc-postgresql-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.postgresql.postgresql
-- category: mandatory
-  customVariables: []
-  description: Replace the 'postgresql' dependency with Quarkus 'quarkus-jdbc-postgresql'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jdbc
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace the `org.postgresql:postgresql` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jdbc-postgresql` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-jdbc-postgresql-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.postgresql.postgresql
diff --git a/resources/rulesets/quarkus/11-jsonb-to-quarkus.windup.yaml b/resources/rulesets/quarkus/11-jsonb-to-quarkus.windup.yaml
deleted file mode 100644
index 17dc075..0000000
--- a/resources/rulesets/quarkus/11-jsonb-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'yasson' dependency with Quarkus 'quarkus-jsonb' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jsonb
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.eclipse:yasson` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-jsonb` \n Further information in the link below.\n "
-  ruleID: quarkus-jsonb-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.eclipse.yasson
-- category: mandatory
-  customVariables: []
-  description: Replace the 'yasson' dependency with Quarkus 'quarkus-jsonb' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jsonb
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/rest-json
-  message: "\n Replace the `org.eclipse:yasson` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-jsonb` \n Further information in the link below.\n "
-  ruleID: quarkus-jsonb-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.eclipse.yasson
diff --git a/resources/rulesets/quarkus/12-jsonp-to-quarkus.windup.yaml b/resources/rulesets/quarkus/12-jsonp-to-quarkus.windup.yaml
deleted file mode 100644
index 4ff5e3d..0000000
--- a/resources/rulesets/quarkus/12-jsonp-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'jakarta.json' dependency with Quarkus 'quarkus-jsonp'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jsonp
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.glassfish:jakarta.json` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jsonp` \n No specific guide is available.\n "
-  ruleID: quarkus-jsonp-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.glassfish.jakarta.json
-- category: mandatory
-  customVariables: []
-  description: Replace the 'jakarta.json' dependency with Quarkus 'quarkus-jsonp'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=jsonp
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/
-  message: "\n Replace the `org.glassfish:jakarta.json` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-jsonp` \n No specific guide is available.\n "
-  ruleID: quarkus-jsonp-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.glassfish.jakarta.json
diff --git a/resources/rulesets/quarkus/13-kafka-to-quarkus.windup.yaml b/resources/rulesets/quarkus/13-kafka-to-quarkus.windup.yaml
deleted file mode 100644
index 6a950a6..0000000
--- a/resources/rulesets/quarkus/13-kafka-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kafka-clients' dependency with Quarkus 'quarkus-kafka-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kafka
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.apache.kafka:kafka-clients` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kafka-client` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-kafka-client-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.kafka.kafka-clients
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kafka-clients' dependency with Quarkus 'quarkus-kafka-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kafka
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kafka
-  message: "\n Replace the `org.apache.kafka:kafka-clients` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kafka-client` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-kafka-client-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.kafka.kafka-clients
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kafka-streams' dependency with Quarkus 'quarkus-kafka-streams'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kafka
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.apache.kafka:kafka-streams` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kafka-streams` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-kafka-streams-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.kafka.kafka-streams
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kafka-streams' dependency with Quarkus 'quarkus-kafka-streams'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kafka
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kafka-streams
-  message: "\n Replace the `org.apache.kafka:kafka-streams` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kafka-streams` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-kafka-streams-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.apache.kafka.kafka-streams
diff --git a/resources/rulesets/quarkus/14-keycloak-to-quarkus.windup.yaml b/resources/rulesets/quarkus/14-keycloak-to-quarkus.windup.yaml
deleted file mode 100644
index 4a2a42d..0000000
--- a/resources/rulesets/quarkus/14-keycloak-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'keycloak-admin-client' dependency with Quarkus 'quarkus-keycloak-admin-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=keycloak
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.keycloak:keycloak-admin-client` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-keycloak-admin-client` \n No specific guide
-    is available.\n "
-  ruleID: quarkus-keycloak-admin-client-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.keycloak.keycloak-admin-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'keycloak-admin-client' dependency with Quarkus 'quarkus-keycloak-admin-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=keycloak
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/
-  message: "\n Replace the `org.keycloak:keycloak-admin-client` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-keycloak-admin-client` \n No specific guide
-    is available.\n "
-  ruleID: quarkus-keycloak-admin-client-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.keycloak.keycloak-admin-client
diff --git a/resources/rulesets/quarkus/15-kubernetes-to-quarkus.windup.yaml b/resources/rulesets/quarkus/15-kubernetes-to-quarkus.windup.yaml
deleted file mode 100644
index cebea5b..0000000
--- a/resources/rulesets/quarkus/15-kubernetes-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kubernetes-client' dependency with Quarkus 'quarkus-kubernetes-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kubernetes
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.fabric8:kubernetes-client` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kubernetes-client` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-kubernetes-client-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.fabric8.kubernetes-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'kubernetes-client' dependency with Quarkus 'quarkus-kubernetes-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=kubernetes
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kubernetes-client
-  message: "\n Replace the `io.fabric8:kubernetes-client` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-kubernetes-client` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-kubernetes-client-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.fabric8.kubernetes-client
diff --git a/resources/rulesets/quarkus/16-liquibase-to-quarkus.windup.yaml b/resources/rulesets/quarkus/16-liquibase-to-quarkus.windup.yaml
deleted file mode 100644
index c861047..0000000
--- a/resources/rulesets/quarkus/16-liquibase-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'liquibase-core' dependency with Quarkus 'quarkus-liquibase'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=liquibase
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.liquibase:liquibase-core` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-liquibase` \n Further information in the link below.\n "
-  ruleID: quarkus-liquibase-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.liquibase.liquibase-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'liquibase-core' dependency with Quarkus 'quarkus-liquibase'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=liquibase
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/liquibase
-  message: "\n Replace the `org.liquibase:liquibase-core` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-liquibase` \n Further information in the link below.\n "
-  ruleID: quarkus-liquibase-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.liquibase.liquibase-core
-- category: mandatory
-  customVariables: []
-  description: Replace the 'liquibase-mongodb' dependency with Quarkus 'quarkus-liquibase-mongodb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=liquibase
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.liquibase.ext:liquibase-mongodb` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-liquibase-mongodb` \n No specific guide
-    is available.\n "
-  ruleID: quarkus-liquibase-mongodb-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.liquibase.ext.liquibase-mongodb
-- category: mandatory
-  customVariables: []
-  description: Replace the 'liquibase-mongodb' dependency with Quarkus 'quarkus-liquibase-mongodb'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=liquibase
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/
-  message: "\n Replace the `org.liquibase.ext:liquibase-mongodb` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-liquibase-mongodb` \n No specific guide
-    is available.\n "
-  ruleID: quarkus-liquibase-mongodb-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.liquibase.ext.liquibase-mongodb
diff --git a/resources/rulesets/quarkus/17-logging-to-quarkus.windup.yaml b/resources/rulesets/quarkus/17-logging-to-quarkus.windup.yaml
deleted file mode 100644
index ee501ca..0000000
--- a/resources/rulesets/quarkus/17-logging-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'logstash-gelf' dependency with Quarkus 'quarkus-logging-gelf'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=logging
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `biz.paluch.logging:logstash-gelf` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-logging-gelf` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-logging-gelf-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: biz.paluch.logging.logstash-gelf
-- category: mandatory
-  customVariables: []
-  description: Replace the 'logstash-gelf' dependency with Quarkus 'quarkus-logging-gelf'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=logging
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/centralized-log-management
-  message: "\n Replace the `biz.paluch.logging:logstash-gelf` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-logging-gelf` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-logging-gelf-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: biz.paluch.logging.logstash-gelf
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sentry-jul' dependency with Quarkus 'quarkus-logging-sentry'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=logging
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.sentry:sentry-jul` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-logging-sentry` \n Further information in the link below.\n "
-  ruleID: quarkus-logging-sentry-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.sentry.sentry-jul
-- category: mandatory
-  customVariables: []
-  description: Replace the 'sentry-jul' dependency with Quarkus 'quarkus-logging-sentry'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=logging
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/logging-sentry
-  message: "\n Replace the `io.sentry:sentry-jul` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-logging-sentry` \n Further information in the link below.\n "
-  ruleID: quarkus-logging-sentry-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.sentry.sentry-jul
diff --git a/resources/rulesets/quarkus/18-micrometer-to-quarkus.windup.yaml b/resources/rulesets/quarkus/18-micrometer-to-quarkus.windup.yaml
deleted file mode 100644
index 97167fe..0000000
--- a/resources/rulesets/quarkus/18-micrometer-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'micrometer-registry-prometheus' dependency with Quarkus
-    'quarkus-micrometer-registry-prometheus' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=micrometer
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.micrometer:micrometer-registry-prometheus` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-micrometer-registry-prometheus`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-micrometer-registry-prometheus-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.micrometer.micrometer-registry-prometheus
-- category: mandatory
-  customVariables: []
-  description: Replace the 'micrometer-registry-prometheus' dependency with Quarkus
-    'quarkus-micrometer-registry-prometheus' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=micrometer
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/telemetry-micrometer
-  message: "\n Replace the `io.micrometer:micrometer-registry-prometheus` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-micrometer-registry-prometheus`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-micrometer-registry-prometheus-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.micrometer.micrometer-registry-prometheus
diff --git a/resources/rulesets/quarkus/19-narayana-to-quarkus.windup.yaml b/resources/rulesets/quarkus/19-narayana-to-quarkus.windup.yaml
deleted file mode 100644
index e32d35f..0000000
--- a/resources/rulesets/quarkus/19-narayana-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'narayana-jta' dependency with Quarkus 'quarkus-narayana-jta'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.jboss.narayana.jta:narayana-jta` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-narayana-jta` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-narayana-jta-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.jta.narayana-jta
-- category: mandatory
-  customVariables: []
-  description: Replace the 'narayana-jta' dependency with Quarkus 'quarkus-narayana-jta'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/transaction
-  message: "\n Replace the `org.jboss.narayana.jta:narayana-jta` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-narayana-jta` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-narayana-jta-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.jta.narayana-jta
-- category: mandatory
-  customVariables: []
-  description: Replace the 'narayana-lra' dependency with Quarkus 'quarkus-narayana-lra'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.jboss.narayana.rts:narayana-lra` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-narayana-lra` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-narayana-lra-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.rts.narayana-lra
-- category: mandatory
-  customVariables: []
-  description: Replace the 'narayana-lra' dependency with Quarkus 'quarkus-narayana-lra'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/lra
-  message: "\n Replace the `org.jboss.narayana.rts:narayana-lra` dependency with the
-    Quarkus dependency `io.quarkus:quarkus-narayana-lra` \n Further information in
-    the link below.\n "
-  ruleID: quarkus-narayana-lra-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.rts.narayana-lra
-- category: mandatory
-  customVariables: []
-  description: Replace the 'stm' dependency with Quarkus 'quarkus-narayana-stm' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.jboss.narayana.stm:stm` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-narayana-stm` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-narayana-stm-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.stm.stm
-- category: mandatory
-  customVariables: []
-  description: Replace the 'stm' dependency with Quarkus 'quarkus-narayana-stm' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=narayana
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/software-transactional-memory
-  message: "\n Replace the `org.jboss.narayana.stm:stm` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-narayana-stm` \n Further information in the link
-    below.\n "
-  ruleID: quarkus-narayana-stm-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.narayana.stm.stm
diff --git a/resources/rulesets/quarkus/20-openshift-to-quarkus.windup.yaml b/resources/rulesets/quarkus/20-openshift-to-quarkus.windup.yaml
deleted file mode 100644
index 1806251..0000000
--- a/resources/rulesets/quarkus/20-openshift-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'openshift-client' dependency with Quarkus 'quarkus-openshift-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=openshift
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.fabric8:openshift-client` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-openshift-client` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-openshift-client-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.fabric8.openshift-client
-- category: mandatory
-  customVariables: []
-  description: Replace the 'openshift-client' dependency with Quarkus 'quarkus-openshift-client'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=openshift
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/kubernetes-client
-  message: "\n Replace the `io.fabric8:openshift-client` dependency with the Quarkus
-    dependency `io.quarkus:quarkus-openshift-client` \n Further information in the
-    link below.\n "
-  ruleID: quarkus-openshift-client-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.fabric8.openshift-client
diff --git a/resources/rulesets/quarkus/203-javaee-faces-to-quarkus.windup.yaml b/resources/rulesets/quarkus/203-javaee-faces-to-quarkus.windup.yaml
deleted file mode 100644
index 991c430..0000000
--- a/resources/rulesets/quarkus/203-javaee-faces-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace JSF Dependency with MyFaces
-  effort: 1
-  labels:
-  - konveyor.io/source=java-ee
-  - konveyor.io/target=quarkus
-  links:
-  - title: 'Apache MyFaces: Getting Started on Quarkus'
-    url: https://myfaces.apache.org/#/coregettingstarted?id=quarkus
-  message: "\n \n JSF Dependencies with groupId `org.jboss.spec.javax.faces` should
-    be replaced with \n \n ```\n <!-- Quarkus MyFaces dependencies --> \n <dependency>\n
-    <groupId>org.apache.myfaces.core.extensions.quarkus</groupId>\n <artifactId>myfaces-quarkus</artifactId>\n
-    <version>4.0.1</version>\n </dependency>\n \n <!-- Quarkus Faces utilities and
-    components extensions -->\n <dependency>\n <groupId>io.quarkiverse.primefaces</groupId>\n
-    <artifactId>quarkus-primefaces</artifactId>\n <version>3.13.1</version>\n </dependency>\n
-    <dependency>\n <groupId>io.quarkiverse.omnifaces</groupId>\n <artifactId>quarkus-omnifaces</artifactId>\n
-    <version>4.2.0</version>\n </dependency>\n ```\n \n "
-  ruleID: javaee-faces-to-quarkus-00000
-  when:
-    builtin.xml:
-      filepaths:
-      - pom.xml
-      namespaces:
-        m: http://maven.apache.org/POM/4.0.0
-      xpath: /m:project/m:dependencies/m:dependency[m:groupId/text() = 'org.jboss.spec.javax.faces']
diff --git a/resources/rulesets/quarkus/21-opentelemetry-to-quarkus.windup.yaml b/resources/rulesets/quarkus/21-opentelemetry-to-quarkus.windup.yaml
deleted file mode 100644
index cbd50f5..0000000
--- a/resources/rulesets/quarkus/21-opentelemetry-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'opentelemetry-exporter-jaeger' dependency with Quarkus
-    'quarkus-opentelemetry-exporter-jaeger' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=opentelemetry
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.opentelemetry:opentelemetry-exporter-jaeger` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-opentelemetry-exporter-jaeger`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-opentelemetry-exporter-jaeger-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.opentelemetry.opentelemetry-exporter-jaeger
-- category: mandatory
-  customVariables: []
-  description: Replace the 'opentelemetry-exporter-jaeger' dependency with Quarkus
-    'quarkus-opentelemetry-exporter-jaeger' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=opentelemetry
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/opentelemetry
-  message: "\n Replace the `io.opentelemetry:opentelemetry-exporter-jaeger` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-opentelemetry-exporter-jaeger`
-    \n Further information in the link below.\n "
-  ruleID: quarkus-opentelemetry-exporter-jaeger-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.opentelemetry.opentelemetry-exporter-jaeger
-- category: mandatory
-  customVariables: []
-  description: Replace the 'opentelemetry-exporter-otlp-trace' dependency with Quarkus
-    'quarkus-opentelemetry-exporter-otlp' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=opentelemetry
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `io.opentelemetry:opentelemetry-exporter-otlp-trace` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-opentelemetry-exporter-otlp` \n
-    Further information in the link below.\n "
-  ruleID: quarkus-opentelemetry-exporter-otlp-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.opentelemetry.opentelemetry-exporter-otlp-trace
-- category: mandatory
-  customVariables: []
-  description: Replace the 'opentelemetry-exporter-otlp-trace' dependency with Quarkus
-    'quarkus-opentelemetry-exporter-otlp' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=opentelemetry
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/opentelemetry
-  message: "\n Replace the `io.opentelemetry:opentelemetry-exporter-otlp-trace` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-opentelemetry-exporter-otlp` \n
-    Further information in the link below.\n "
-  ruleID: quarkus-opentelemetry-exporter-otlp-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: io.opentelemetry.opentelemetry-exporter-otlp-trace
diff --git a/resources/rulesets/quarkus/201-cdi-to-quarkus.windup.yaml b/resources/rulesets/quarkus/210-cdi-to-quarkus.windup.yaml
similarity index 77%
rename from resources/rulesets/quarkus/201-cdi-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/210-cdi-to-quarkus.windup.yaml
index eb9ddf3..3ae168d 100644
--- a/resources/rulesets/quarkus/201-cdi-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/210-cdi-to-quarkus.windup.yaml
@@ -8,8 +8,8 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides/cdi-reference
-  message: "\n Dependency `javax.enterprise:cdi-api` has to be replaced with `io.quarkus:quarkus-arc`
-    artifact.\n "
+  message: Dependency `javax.enterprise:cdi-api` has to be replaced with `io.quarkus:quarkus-arc`
+    artifact.
   ruleID: cdi-to-quarkus-00000
   when:
     builtin.xml:
@@ -30,8 +30,8 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides/cdi-reference
-  message: "\n Dependency `javax.inject:javax.inject` has to be replaced with `io.quarkus:quarkus-arc`
-    artifact.\n "
+  message: Dependency `javax.inject:javax.inject` has to be replaced with `io.quarkus:quarkus-arc`
+    artifact.
   ruleID: cdi-to-quarkus-00020
   when:
     builtin.xml:
@@ -50,9 +50,9 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links: []
-  message: "\n `beans.xml` descriptor content is ignored and it could be removed from
+  message: "`beans.xml` descriptor content is ignored and it could be removed from
     the application. \n Refer to the guide referenced below to check the supported
-    CDI feature in Quarkus.\n "
+    CDI feature in Quarkus."
   ruleID: cdi-to-quarkus-00030
   when:
     as: root
@@ -72,9 +72,9 @@
   links:
   - title: Quarkus Simplified Producer Method Declaration
     url: https://quarkus.io/guides/cdi-reference#simplified-producer-method-declaration
-  message: "In Quarkus, you can skip the @Produces annotation completely if the producer
-    method is annotated with a scope annotation, a stereotype or a qualifier..\n This
-    field could be accessed using a `@Named` getter method instead.\n "
+  message: |-
+    In Quarkus, you can skip the @Produces annotation completely if the producer method is annotated with a scope annotation, a stereotype or a qualifier..
+     This field could be accessed using a `@Named` getter method instead.
   ruleID: cdi-to-quarkus-00040
   when:
     java.referenced:
@@ -90,8 +90,8 @@
   links:
   - title: Quarkus CDI reference
     url: https://quarkus.io/guides/cdi-reference
-  message: "Stateless EJBs can be converted to a cdi bean by replacing the `@Stateless`
-    annotation with a scope eg `@ApplicationScoped`\n "
+  message: Stateless EJBs can be converted to a cdi bean by replacing the `@Stateless`
+    annotation with a scope eg `@ApplicationScoped`
   ruleID: cdi-to-quarkus-00050
   when:
     java.referenced:
diff --git a/resources/rulesets/quarkus/202-dependency-removal-for-quarkus.windup.yaml b/resources/rulesets/quarkus/211-dependency-removal-for-quarkus.windup.yaml
similarity index 88%
rename from resources/rulesets/quarkus/202-dependency-removal-for-quarkus.windup.yaml
rename to resources/rulesets/quarkus/211-dependency-removal-for-quarkus.windup.yaml
index d3863a6..077380c 100644
--- a/resources/rulesets/quarkus/202-dependency-removal-for-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/211-dependency-removal-for-quarkus.windup.yaml
@@ -8,7 +8,7 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides
-  message: "\n Non-quarkus dependencies are no longer required and can be removed.\n "
+  message: Non-quarkus dependencies are no longer required and can be removed.
   ruleID: dependency-removal-for-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/212-jakarta-cdi-to-quarkus.windup.yaml b/resources/rulesets/quarkus/212-jakarta-cdi-to-quarkus.windup.yaml
new file mode 100644
index 0000000..5b8ecee
--- /dev/null
+++ b/resources/rulesets/quarkus/212-jakarta-cdi-to-quarkus.windup.yaml
@@ -0,0 +1,99 @@
+- category: mandatory
+  customVariables: []
+  description: Replace jakarta.enterprise:jakarta.enterprise.cdi-api dependency
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides/cdi-reference
+  message: Dependency `jakarta.enterprise:jakarta.enterprise.cdi-api` has to be replaced
+    with `io.quarkus:quarkus-arc` artifact.
+  ruleID: jakarta-cdi-to-quarkus-00000
+  when:
+    builtin.xml:
+      filepaths:
+      - pom.xml
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:dependencies/m:dependency[m:artifactId/text() = 'jakarta.enterprise.cdi-api'
+        and m:groupId/text() = 'jakarta.enterprise' and (count(../m:dependency/m:groupId[contains(.,
+        'io.quarkus')]) = 0)]
+- category: mandatory
+  customVariables: []
+  description: Replace jakarta.inject:jakarta.inject-api dependency
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides/cdi-reference
+  message: Dependency `jakarta.inject:jakarta.inject-api` has to be replaced with
+    `io.quarkus:quarkus-arc` artifact.
+  ruleID: jakarta-cdi-to-quarkus-00020
+  when:
+    builtin.xml:
+      filepaths:
+      - pom.xml
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:dependencies/m:dependency[m:artifactId/text() = 'jakarta.inject-api'
+        and m:groupId/text() = 'jakarta.inject' and (count(../m:dependency/m:groupId[contains(.,
+        'io.quarkus')]) = 0)]
+- category: potential
+  customVariables: []
+  description: '`beans.xml` descriptor content is ignored'
+  effort: 3
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links: []
+  message: "The `beans.xml` descriptor content is ignored and it could be removed
+    from the application. \n Refer to the guide referenced below to check the supported
+    CDI feature in Quarkus."
+  ruleID: jakarta-cdi-to-quarkus-00030
+  when:
+    as: root
+    builtin.xml:
+      filepaths:
+      - beans.xml
+      namespaces:
+        b: https://jakarta.ee/xml/ns/jakartaee
+      xpath: /b:beans
+- category: potential
+  customVariables: []
+  description: Producer annotation no longer required
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus Simplified Producer Method Declaration
+    url: https://quarkus.io/guides/cdi-reference#simplified-producer-method-declaration
+  message: |-
+    In Quarkus you can skip the @Produces annotation completely if the producer method is annotated with a scope annotation, a stereotype or a qualifier..
+     This field could be accessed using a `@Named` getter method instead.
+  ruleID: jakarta-cdi-to-quarkus-00040
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: jakarta.enterprise.inject.Produces
+- category: potential
+  customVariables: []
+  description: Stateless annotation can be replaced with scope
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus CDI reference
+    url: https://quarkus.io/guides/cdi-reference
+  message: The Stateless EJBs can be converted to a cdi bean by replacing the `@Stateless`
+    annotation with a scope eg `@ApplicationScoped`
+  ruleID: jakarta-cdi-to-quarkus-00050
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: jakarta.ejb.Stateless
diff --git a/resources/rulesets/quarkus/213-jakarta-faces-to-quarkus.windup.yaml b/resources/rulesets/quarkus/213-jakarta-faces-to-quarkus.windup.yaml
new file mode 100644
index 0000000..c7648bf
--- /dev/null
+++ b/resources/rulesets/quarkus/213-jakarta-faces-to-quarkus.windup.yaml
@@ -0,0 +1,49 @@
+- category: mandatory
+  customVariables: []
+  description: Replace Jakarta Faces Dependency with MyFaces
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: 'Apache MyFaces: Getting Started on Quarkus'
+    url: https://myfaces.apache.org/#/coregettingstarted?id=quarkus
+  message: "Faces Dependencies with groupId `jakarta.faces` should be replaced with
+    \n \n ```\n <!-- Quarkus MyFaces dependencies --> \n <dependency>\n <groupId>org.apache.myfaces.core.extensions.quarkus</groupId>\n
+    <artifactId>myfaces-quarkus</artifactId>\n <version>4.0.1</version>\n </dependency>\n
+    \n <!-- Quarkus Faces utilities and components extensions -->\n <dependency>\n
+    <groupId>io.quarkiverse.primefaces</groupId>\n <artifactId>quarkus-primefaces</artifactId>\n
+    <version>3.13.1</version>\n </dependency>\n <dependency>\n <groupId>io.quarkiverse.omnifaces</groupId>\n
+    <artifactId>quarkus-omnifaces</artifactId>\n <version>4.2.0</version>\n </dependency>\n
+    ```"
+  ruleID: jakarta-faces-to-quarkus-00000
+  when:
+    builtin.xml:
+      filepaths:
+      - pom.xml
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:dependencies/m:dependency[m:groupId/text() = 'jakarta.faces']
+- category: mandatory
+  customVariables: []
+  description: Replace Jakarta Faces Dependency with MyFaces
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: 'Apache MyFaces: Getting Started on Quarkus'
+    url: https://myfaces.apache.org/#/coregettingstarted?id=quarkus
+  message: "Faces Dependencies with artifactId `jakarta.faces` should be replaced
+    with \n \n ```\n <!-- Quarkus MyFaces dependencies --> \n <dependency>\n <groupId>org.apache.myfaces.core.extensions.quarkus</groupId>\n
+    <artifactId>myfaces-quarkus</artifactId>\n <version>4.0.1</version>\n </dependency>\n
+    \n <!-- Quarkus Faces utilities and components extensions -->\n <dependency>\n
+    <groupId>io.quarkiverse.primefaces</groupId>\n <artifactId>quarkus-primefaces</artifactId>\n
+    <version>3.13.1</version>\n </dependency>\n <dependency>\n <groupId>io.quarkiverse.omnifaces</groupId>\n
+    <artifactId>quarkus-omnifaces</artifactId>\n <version>4.2.0</version>\n </dependency>\n
+    ```"
+  ruleID: jakarta-faces-to-quarkus-00010
+  when:
+    builtin.filecontent:
+      filePattern: pom\.xml
+      pattern: artifactId>jakarta.faces<
diff --git a/resources/rulesets/quarkus/214-jakarta-jaxrs-to-quarkus.windup.yaml b/resources/rulesets/quarkus/214-jakarta-jaxrs-to-quarkus.windup.yaml
new file mode 100644
index 0000000..96d5438
--- /dev/null
+++ b/resources/rulesets/quarkus/214-jakarta-jaxrs-to-quarkus.windup.yaml
@@ -0,0 +1,38 @@
+- category: mandatory
+  customVariables: []
+  description: Replace jakarta JAX-RS dependency
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides/resteasy-reactive
+  message: Dependency `jakarta.ws.rs:jakarta.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive`
+    artifact.
+  ruleID: jakarta-jaxrs-to-quarkus-00010
+  when:
+    java.dependency:
+      lowerbound: 0.0.0
+      name: jakarta.ws.rs.jakarta.ws.rs-api
+- category: optional
+  customVariables: []
+  description: Jakarta JAX-RS activation is no longer necessary
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides/resteasy-reactive#declaring-endpoints-uri-mapping
+  message: Jakarta JAX-RS activation is no longer necessary. You can set a root path
+    like this but you don't have to.
+  ruleID: jakarta-jaxrs-to-quarkus-00020
+  when:
+    and:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.ws.rs.ApplicationPath
+    - java.referenced:
+        location: INHERITANCE
+        pattern: jakarta.ws.rs.core.Application
diff --git a/resources/rulesets/quarkus/215-javaee-faces-to-quarkus.windup.yaml b/resources/rulesets/quarkus/215-javaee-faces-to-quarkus.windup.yaml
new file mode 100644
index 0000000..54f7475
--- /dev/null
+++ b/resources/rulesets/quarkus/215-javaee-faces-to-quarkus.windup.yaml
@@ -0,0 +1,26 @@
+- category: mandatory
+  customVariables: []
+  description: Replace JSF Dependency with MyFaces
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: 'Apache MyFaces: Getting Started on Quarkus'
+    url: https://myfaces.apache.org/#/coregettingstarted?id=quarkus
+  message: "JSF Dependencies with groupId `org.jboss.spec.javax.faces` should be replaced
+    with \n \n ```\n <!-- Quarkus MyFaces dependencies --> \n <dependency>\n <groupId>org.apache.myfaces.core.extensions.quarkus</groupId>\n
+    <artifactId>myfaces-quarkus</artifactId>\n <version>4.0.1</version>\n </dependency>\n
+    \n <!-- Quarkus Faces utilities and components extensions -->\n <dependency>\n
+    <groupId>io.quarkiverse.primefaces</groupId>\n <artifactId>quarkus-primefaces</artifactId>\n
+    <version>3.13.1</version>\n </dependency>\n <dependency>\n <groupId>io.quarkiverse.omnifaces</groupId>\n
+    <artifactId>quarkus-omnifaces</artifactId>\n <version>4.2.0</version>\n </dependency>\n
+    ```"
+  ruleID: javaee-faces-to-quarkus-00000
+  when:
+    builtin.xml:
+      filepaths:
+      - pom.xml
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:dependencies/m:dependency[m:groupId/text() = 'org.jboss.spec.javax.faces']
diff --git a/resources/rulesets/quarkus/204-javaee-pom-to-quarkus.windup.yaml b/resources/rulesets/quarkus/216-javaee-pom-to-quarkus.windup.yaml
similarity index 70%
rename from resources/rulesets/quarkus/204-javaee-pom-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/216-javaee-pom-to-quarkus.windup.yaml
index 7c54343..1e24057 100644
--- a/resources/rulesets/quarkus/204-javaee-pom-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/216-javaee-pom-to-quarkus.windup.yaml
@@ -1,3 +1,23 @@
+- category: mandatory
+  customVariables: []
+  description: The expected project artifact's extension is `jar`
+  effort: 1
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: The project artifact's current extension (i.e. `<packaging>` tag value)
+    is `{{notJar}}` but the expected value should be `jar`
+  ruleID: javaee-pom-to-quarkus-00000
+  when:
+    builtin.xml:
+      filepaths:
+      - pom.xml
+      namespaces:
+        m: http://maven.apache.org/POM/4.0.0
+      xpath: /m:project/m:packaging/text()[matches(self::node(), '^(pom|maven-plugin|ejb|war|ear|rar)$')]
 - category: mandatory
   customVariables: []
   description: Adopt Quarkus BOM
@@ -6,20 +26,20 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
   - title: Quarkus - Releases
     url: https://quarkus.io/blog/tag/release/
-  message: "\n \n Use the Quarkus BOM to omit the version of the different Quarkus
-    dependencies. \n Add the following sections to the `pom.xml` file: \n\n ```xml\n
-    <properties> \n <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-    \n <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    \n <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>\n </properties>
+  message: "Use the Quarkus BOM to omit the version of the different Quarkus dependencies.
+    \n Add the following sections to the `pom.xml` file: \n\n ```xml\n <properties>
+    \n <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id> \n
+    <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id> \n
+    <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>\n </properties>
     \n <dependencyManagement> \n <dependencies> \n <dependency> \n <groupId>${{quarkus.platform.group-id}}</groupId>
     \n <artifactId>${{quarkus.platform.artifact-id}}</artifactId> \n <version>${{quarkus.platform.version}}</version>
     \n <type>pom</type> \n <scope>import</scope> \n </dependency> \n </dependencies>
     \n </dependencyManagement> \n ```\n Check the latest Quarkus version available
-    from the `Quarkus - Releases` link below.\n \n "
+    from the `Quarkus - Releases` link below."
   ruleID: javaee-pom-to-quarkus-00010
   when:
     builtin.xml:
@@ -38,16 +58,16 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n \n Use the Quarkus Maven plugin adding the following sections to the
-    `pom.xml` file: \n\n ```xml\n <properties> \n <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: "Use the Quarkus Maven plugin adding the following sections to the `pom.xml`
+    file: \n\n ```xml\n <properties> \n <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     \n <quarkus.platform.version>3.1.0.Final</quarkus.platform.version>\n </properties>
     \n <build>\n <plugins>\n <plugin>\n <groupId>${{quarkus.platform.group-id}}</groupId>\n
     <artifactId>quarkus-maven-plugin</artifactId>\n <version>${{quarkus.platform.version}}</version>\n
     <extensions>true</extensions>\n <executions>\n <execution>\n <goals>\n <goal>build</goal>\n
     <goal>generate-code</goal>\n <goal>generate-code-tests</goal>\n </goals>\n </execution>\n
-    </executions>\n </plugin>\n </plugins>\n </build>\n ```\n \n "
+    </executions>\n </plugin>\n </plugins>\n </build>\n ```"
   ruleID: javaee-pom-to-quarkus-00020
   when:
     builtin.xml:
@@ -64,14 +84,14 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n \n Use the Maven Compiler plugin adding the following sections to the
-    `pom.xml` file: \n\n ```xml\n <properties> \n <compiler-plugin.version>3.10.1</compiler-plugin.version>\n
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: "Use the Maven Compiler plugin adding the following sections to the `pom.xml`
+    file: \n\n ```xml\n <properties> \n <compiler-plugin.version>3.10.1</compiler-plugin.version>\n
     <maven.compiler.release>11</maven.compiler.release>\n </properties> \n <build>\n
     <plugins>\n <plugin>\n <artifactId>maven-compiler-plugin</artifactId>\n <version>${{compiler-plugin.version}}</version>\n
     <configuration>\n <compilerArgs>\n <arg>-parameters</arg>\n </compilerArgs>\n
-    </configuration>\n </plugin>\n </plugins>\n </build>\n ```\n \n "
+    </configuration>\n </plugin>\n </plugins>\n </build>\n ```"
   ruleID: javaee-pom-to-quarkus-00030
   when:
     builtin.xml:
@@ -90,15 +110,15 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n \n Use the Maven Surefire plugin adding the following sections to the
-    `pom.xml` file: \n\n ```xml\n <properties> \n <surefire-plugin.version>3.0.0</compiler-plugin.version>\n
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: "Use the Maven Surefire plugin adding the following sections to the `pom.xml`
+    file: \n\n ```xml\n <properties> \n <surefire-plugin.version>3.0.0</compiler-plugin.version>\n
     </properties> \n <build>\n <plugins>\n <plugin>\n <artifactId>maven-surefire-plugin</artifactId>\n
     <version>${{surefire-plugin.version}}</version>\n <configuration>\n <systemPropertyVariables>\n
     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>\n
     <maven.home>${{maven.home}}</maven.home>\n </systemPropertyVariables>\n </configuration>\n
-    </plugin>\n </plugins>\n </build>\n ```\n \n "
+    </plugin>\n </plugins>\n </build>\n ```"
   ruleID: javaee-pom-to-quarkus-00040
   when:
     builtin.xml:
@@ -117,17 +137,17 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n \n Use the Maven Failsafe plugin adding the following sections to the
-    `pom.xml` file: \n\n ```xml\n <properties> \n <surefire-plugin.version>3.0.0</compiler-plugin.version>\n
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: "Use the Maven Failsafe plugin adding the following sections to the `pom.xml`
+    file: \n\n ```xml\n <properties> \n <surefire-plugin.version>3.0.0</compiler-plugin.version>\n
     </properties> \n <build>\n <plugins>\n <plugin>\n <artifactId>maven-failsafe-plugin</artifactId>\n
     <version>${{surefire-plugin.version}}</version>\n <executions>\n <execution>\n
     <goals>\n <goals>integration-test</goal>\n <goals>verify</goal>\n </goals>\n <configuration>\n
     <systemPropertyVariables>\n <native.image.path>${{project.build.directory}}/${{project.build.finalName}}-runner</native.image.path>\n
     <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>\n
     <maven.home>${{maven.home}}</maven.home>\n </systemPropertyVariables>\n </configuration>\n
-    </execution>\n </executions>\n </plugin>\n </plugins>\n </build>\n ```\n \n "
+    </execution>\n </executions>\n </plugin>\n </plugins>\n </build>\n ```"
   ruleID: javaee-pom-to-quarkus-00050
   when:
     builtin.xml:
@@ -146,13 +166,13 @@
   - konveyor.io/source=java-ee
   - konveyor.io/target=quarkus
   links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n \n Leverage a Maven profile to run the Quarkus native build adding
-    the following section to the `pom.xml` file: \n\n ```xml\n <profiles>\n <profile>\n
-    <id>native</id>\n <activation>\n <property>\n <name>native</name>\n </property>\n
-    </activation>\n <properties>\n <skipITs>false</skipITs>\n <quarkus.package.type>native</quarkus.package.type>\n
-    </properties>\n </profile>\n </profiles>\n ```\n \n "
+  - title: Quarkus - Guide;
+    url: https://quarkus.io/guides/maven-tooling#build-tool-maven;
+  message: "Leverage a Maven profile to run the Quarkus native build adding the following
+    section to the `pom.xml` file: \n\n ```xml\n <profiles>\n <profile>\n <id>native</id>\n
+    <activation>\n <property>\n <name>native</name>\n </property>\n </activation>\n
+    <properties>\n <skipITs>false</skipITs>\n <quarkus.package.type>native</quarkus.package.type>\n
+    </properties>\n </profile>\n </profiles>\n ```"
   ruleID: javaee-pom-to-quarkus-00060
   when:
     builtin.xml:
@@ -172,12 +192,12 @@
   links:
   - title: Using hibernate-orm and jakarta persistence
     url: https://quarkus.io/guides/hibernate-orm
-  message: "\n \n Configure Quarkus 'hibernate-orm` and jakarta persistence. \n Add
-    the `quarkus-hibernate-orm` section and one for your preferred jdbc solution to
-    the `pom.xml` file, eg for postgres: \n\n ```\n <!-- Hibernate ORM specific dependencies
+  message: "Configure Quarkus 'hibernate-orm` and jakarta persistence. \n Add the
+    `quarkus-hibernate-orm` section and one for your preferred jdbc solution to the
+    `pom.xml` file, eg for postgres: \n\n ```\n <!-- Hibernate ORM specific dependencies
     -->\n <dependency>\n <groupId>io.quarkus</groupId>\n <artifactId>quarkus-hibernate-orm</artifactId>\n
     </dependency>\n \n <!-- JDBC driver dependencies -->\n <dependency>\n <groupId>io.quarkus</groupId>\n
-    <artifactId>quarkus-jdbc-postgresql</artifactId>\n </dependency> \n ```\n \n "
+    <artifactId>quarkus-jdbc-postgresql</artifactId>\n </dependency> \n ```"
   ruleID: javaee-pom-to-quarkus-00070
   when:
     or:
@@ -205,9 +225,9 @@
     url: https://quarkus.io/guides/getting-started-testing
   - title: Testing your Quarkus application with JUnit
     url: https://access.redhat.com/documentation/en-us/red_hat_build_of_quarkus/1.3/html/getting_started_with_quarkus/proc-quarkus-junit-testing_quarkus-getting-started
-  message: "\n \n Use Quarkus junit artifact: \n\n ```\n <!-- Quarkus junit specific
-    dependency -->\n <dependency>\n <groupId>io.quarkus</groupId>\n <artifactId>quarkus-junit5</artifactId>\n
-    <scope>test</scope>\n </dependency>\n ```\n \n "
+  message: "Use Quarkus junit artifact: \n\n ```\n <!-- Quarkus junit specific dependency
+    -->\n <dependency>\n <groupId>io.quarkus</groupId>\n <artifactId>quarkus-junit5</artifactId>\n
+    <scope>test</scope>\n </dependency>\n ```"
   ruleID: javaee-pom-to-quarkus-00080
   when:
     java.dependency:
diff --git a/resources/rulesets/quarkus/205-jaxrs-to-quarkus.windup.yaml b/resources/rulesets/quarkus/217-jaxrs-to-quarkus.windup.yaml
similarity index 76%
rename from resources/rulesets/quarkus/205-jaxrs-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/217-jaxrs-to-quarkus.windup.yaml
index f702d9c..9f08658 100644
--- a/resources/rulesets/quarkus/205-jaxrs-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/217-jaxrs-to-quarkus.windup.yaml
@@ -8,8 +8,8 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides/resteasy-reactive
-  message: "\n Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has
-    to be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact.\n "
+  message: Dependency `org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec` has to
+    be replaced with `io.quarkus:quarkus-resteasy-reactive` artifact.
   ruleID: jaxrs-to-quarkus-00000
   when:
     java.dependency:
@@ -25,8 +25,8 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides/resteasy-reactive
-  message: "\n Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive`
-    artifact.\n "
+  message: Dependency `javax.ws.rs:javax.ws.rs-api` has to be replaced with `io.quarkus:quarkus-resteasy-reactive`
+    artifact.
   ruleID: jaxrs-to-quarkus-00010
   when:
     java.dependency:
@@ -42,8 +42,8 @@
   links:
   - title: Quarkus - Guide
     url: https://quarkus.io/guides/resteasy-reactive#declaring-endpoints-uri-mapping
-  message: "\n JAX-RS activation is no longer necessary. You can set a root path like
-    this but you don't have to.\n "
+  message: JAX-RS activation is no longer necessary. You can set a root path like
+    this but you don't have to.
   ruleID: jaxrs-to-quarkus-00020
   when:
     and:
diff --git a/resources/rulesets/quarkus/218-jms-to-reactive-quarkus.windup.yaml b/resources/rulesets/quarkus/218-jms-to-reactive-quarkus.windup.yaml
new file mode 100644
index 0000000..061df09
--- /dev/null
+++ b/resources/rulesets/quarkus/218-jms-to-reactive-quarkus.windup.yaml
@@ -0,0 +1,152 @@
+- category: mandatory
+  customVariables: []
+  description: JMS is not supported in Quarkus
+  effort: 5
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  - title: Smallrye Reactive - Connectors
+    url: https://smallrye.io/smallrye-reactive-messaging/smallrye-reactive-messaging/3.4/connectors/connectors.html
+  message: "Usage of JMS is not supported in Quarkus. It is recommended to use Quarkus'
+    SmallRye Reactive Messaging instead of JMS.\n Replace the JavaEE/Jakarta JMS dependency
+    with Smallrye Reactive:\n \n ```\n <dependency>\n <groupId>io.quarkus</groupId>\n
+    <artifactId>quarkus-smallrye-reactive-messaging</artifactId>\n </dependency>\n
+    \n ```\n \n Take a look at the Smallrye Reactive Connectors link below to know
+    more about how to interact with different technologies (AMQP, Apache Camel, ...)"
+  ruleID: jms-to-reactive-quarkus-00000
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: jakarta.jms.jakarta.jms-api
+    - java.dependency:
+        lowerbound: 0.0.0
+        name: javax.jms.javax.jms-api
+- category: mandatory
+  customVariables: []
+  description: '@MessageDriven - EJBs are not supported in Quarkus'
+  effort: 3
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  message: |-
+    Enterprise Java Beans (EJBs) are not supported in Quarkus. CDI must be used.
+     Please replace the `@MessageDriven` annotation with a CDI scope annotation like `@ApplicationScoped`.
+  ruleID: jms-to-reactive-quarkus-00010
+  when:
+    or:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.ejb.MessageDriven
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.ejb.MessageDriven
+- category: mandatory
+  customVariables: []
+  description: Configure message listener method with @Incoming
+  effort: 3
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  - title: Incoming (SmallRye Reactive Messaging API)
+    url: https://smallrye.io/smallrye-reactive-messaging/2.5.0/apidocs/org/eclipse/microprofile/reactive/messaging/Incoming.html
+  message: "The `destinationLookup` property can be migrated by annotating a message
+    handler method (potentially `onMessage`) with the\n `org.eclipse.microprofile.reactive.messaging.Incoming`
+    annotation, indicating the name of the queue as a value:\n \n Before:\n ```\n
+    @MessageDriven(name = \"HelloWorldQueueMDB\", activationConfig = {{\n @ActivationConfigProperty(propertyName
+    = \"destinationLookup\", propertyValue = \"queue/HELLOWORLDMDBQueue\")\n }}\n
+    public class MessageListenerImpl implements MessageListener {{\n public void onMessage(Message
+    msg) {{\n // ...handler code\n }}\n }}\n ```\n \n After:\n ```\n public class
+    MessageListenerImpl implements MessageListener {{\n @Incoming(\"HELLOWORLDMDBQueue\")\n
+    public void onMessage(String message) {{\n // ...handler code\n }}\n }}\n ```"
+  ruleID: jms-to-reactive-quarkus-00020
+  when:
+    or:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.ejb.ActivationConfigProperty
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.ejb.ActivationConfigProperty
+- category: mandatory
+  customVariables: []
+  description: JMS' Queue must be replaced with an Emitter
+  effort: 3
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  - title: Emitter (Microprofile Reactive Streams Messaging)
+    url: https://smallrye.io/smallrye-reactive-messaging/2.0.2/apidocs/org/eclipse/microprofile/reactive/messaging/Emitter.html
+  message: "JMS `Queue`s should be replaced with Micrometer `Emitter`s feeding a Channel.
+    See the following example of migrating\n a Queue to an Emitter:\n \n Before:\n
+    ```\n @Resource(lookup = \"java:/queue/HELLOWORLDMDBQueue\")\n private Queue queue;\n
+    ```\n \n After:\n ```\n @Inject\n @Channel(\"HELLOWORLDMDBQueue\")\n Emitter<String>
+    queueEmitter;\n ```"
+  ruleID: jms-to-reactive-quarkus-00030
+  when:
+    or:
+    - java.referenced:
+        location: FIELD_DECLARATION
+        pattern: javax.jms.Queue
+    - java.referenced:
+        location: FIELD_DECLARATION
+        pattern: jakarta.jms.Queue
+- category: mandatory
+  customVariables: []
+  description: JMS' Topic must be replaced with an Emitter
+  effort: 3
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  - title: Emitter (Microprofile Reactive Streams Messaging)
+    url: https://smallrye.io/smallrye-reactive-messaging/2.0.2/apidocs/org/eclipse/microprofile/reactive/messaging/Emitter.html
+  message: "JMS `Topic`s should be replaced with Micrometer `Emitter`s feeding a Channel.
+    See the following example of migrating\n a Topic to an Emitter:\n \n Before:\n
+    ```\n @Resource(lookup = \"java:/topic/HELLOWORLDMDBTopic\")\n private Topic topic;\n
+    ```\n \n After:\n ```\n @Inject\n @Channel(\"HELLOWORLDMDBTopic\")\n Emitter<String>
+    topicEmitter;\n ```"
+  ruleID: jms-to-reactive-quarkus-00040
+  when:
+    or:
+    - java.referenced:
+        location: FIELD_DECLARATION
+        pattern: javax.jms.Topic
+    - java.referenced:
+        location: FIELD_DECLARATION
+        pattern: jakarta.jms.Topic
+- category: mandatory
+  customVariables: []
+  description: JMS is not supported in Quarkus
+  effort: 5
+  labels:
+  - konveyor.io/source=java-ee
+  - konveyor.io/target=quarkus
+  links:
+  - title: Quarkus - Guide
+    url: https://quarkus.io/guides
+  message: References to JavaEE/JakartaEE JMS elements should be removed and replaced
+    with their Quarkus SmallRye/Microprofile equivalents.
+  ruleID: jms-to-reactive-quarkus-00050
+  when:
+    or:
+    - java.referenced:
+        location: PACKAGE
+        pattern: javax.jms*
+    - java.referenced:
+        location: PACKAGE
+        pattern: jakarta.jms*
diff --git a/resources/rulesets/quarkus/166-springboot-actuator-to-quarkus.windup.yaml b/resources/rulesets/quarkus/219-springboot-actuator-to-quarkus.windup.yaml
similarity index 84%
rename from resources/rulesets/quarkus/166-springboot-actuator-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/219-springboot-actuator-to-quarkus.windup.yaml
index 7b4456b..ee78512 100644
--- a/resources/rulesets/quarkus/166-springboot-actuator-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/219-springboot-actuator-to-quarkus.windup.yaml
@@ -9,8 +9,8 @@
   links:
   - title: Quarkus - Smallrye Health
     url: https://quarkus.io/guides/smallrye-health
-  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 "
+  message: "Replace the Spring Boot Actuator dependency with Quarkus Smallrye Health
+    extension. \n It has to be replaced by `io.quarkus:quarkus-smallrye-health` artifact."
   ruleID: springboot-actuator-to-quarkus-0100
   when:
     or:
@@ -36,7 +36,7 @@
   links:
   - title: Quarkus Guide - Smallrye Health
     url: https://quarkus.io/guides/smallrye-health
-  message: "\n Replace `management.endpoints.web.exposure.include=health` with `quarkus.smallrye-health.root-path=/actuator/health`\n "
+  message: Replace `management.endpoints.web.exposure.include=health` with `quarkus.smallrye-health.root-path=/actuator/health`
   ruleID: springboot-actuator-to-quarkus-0200
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/quarkus/22-picocli-to-quarkus.windup.yaml b/resources/rulesets/quarkus/22-picocli-to-quarkus.windup.yaml
deleted file mode 100644
index a2e587e..0000000
--- a/resources/rulesets/quarkus/22-picocli-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'picocli' dependency with Quarkus 'quarkus-picocli' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=picocli
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `info.picocli:picocli` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-picocli` \n Further information in the link below.\n "
-  ruleID: quarkus-picocli-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: info.picocli.picocli
-- category: mandatory
-  customVariables: []
-  description: Replace the 'picocli' dependency with Quarkus 'quarkus-picocli' extension
-  effort: 1
-  labels:
-  - konveyor.io/source=picocli
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/picocli
-  message: "\n Replace the `info.picocli:picocli` dependency with the Quarkus dependency
-    `io.quarkus:quarkus-picocli` \n Further information in the link below.\n "
-  ruleID: quarkus-picocli-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: info.picocli.picocli
diff --git a/resources/rulesets/quarkus/167-springboot-annotations-to-quarkus.windup.yaml b/resources/rulesets/quarkus/220-springboot-annotations-to-quarkus.windup.yaml
similarity index 91%
rename from resources/rulesets/quarkus/167-springboot-annotations-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/220-springboot-annotations-to-quarkus.windup.yaml
index 3ee52c3..aeb91ef 100644
--- a/resources/rulesets/quarkus/167-springboot-annotations-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/220-springboot-annotations-to-quarkus.windup.yaml
@@ -6,7 +6,7 @@
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: "\n Remove the SpringBoot @SpringBootApplication annotation.\n\n A Spring
+  message: "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\n to remove the \"main\" class associated with the annotation,
@@ -14,7 +14,7 @@
     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 "
+    also need to maintain a Spring version along with the Quarkus application."
   ruleID: springboot-annotations-to-quarkus-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/quarkus/168-springboot-cache-to-quarkus.windup.yaml b/resources/rulesets/quarkus/221-springboot-cache-to-quarkus.windup.yaml
similarity index 78%
rename from resources/rulesets/quarkus/168-springboot-cache-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/221-springboot-cache-to-quarkus.windup.yaml
index 2cf8b13..aecdfdf 100644
--- a/resources/rulesets/quarkus/168-springboot-cache-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/221-springboot-cache-to-quarkus.windup.yaml
@@ -8,8 +8,10 @@
   links:
   - title: Quarkus Extension for Spring Cache API Guide
     url: https://quarkus.io/guides/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 "
+  message: |-
+    Replace the SpringBoot Cache module artifact with Quarkus `spring-cache` extension
+
+     Add Quarkus dependency `io.quarkus:quarkus-spring-cache`
   ruleID: springboot-cache-to-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml b/resources/rulesets/quarkus/222-springboot-cloud-config-client-to-quarkus.windup.yaml
similarity index 88%
rename from resources/rulesets/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/222-springboot-cloud-config-client-to-quarkus.windup.yaml
index a4df305..ac1854d 100644
--- a/resources/rulesets/quarkus/169-springboot-cloud-config-client-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/222-springboot-cloud-config-client-to-quarkus.windup.yaml
@@ -11,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: "\n Replace the Spring Cloud Config Client artifact with Quarkus `quarkus-spring-cloud-config-client`
+  message: "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 "
+    \n A change may also be required to the code and configuration."
   ruleID: springboot-cloud-config-client-to-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml b/resources/rulesets/quarkus/223-springboot-data-jpa-to-quarkus.windup.yaml
similarity index 69%
rename from resources/rulesets/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/223-springboot-data-jpa-to-quarkus.windup.yaml
index 7ca1d72..1d37c18 100644
--- a/resources/rulesets/quarkus/170-springboot-data-jpa-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/223-springboot-data-jpa-to-quarkus.windup.yaml
@@ -9,10 +9,9 @@
   links:
   - title: Quarkus JPA Guide
     url: https://quarkus.io/guides/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 "
+  message: "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`"
   ruleID: springboot-jpa-to-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/171-springboot-devtools-to-quarkus.windup.yaml b/resources/rulesets/quarkus/224-springboot-devtools-to-quarkus.windup.yaml
similarity index 79%
rename from resources/rulesets/quarkus/171-springboot-devtools-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/224-springboot-devtools-to-quarkus.windup.yaml
index 20eaac1..80139ba 100644
--- a/resources/rulesets/quarkus/171-springboot-devtools-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/224-springboot-devtools-to-quarkus.windup.yaml
@@ -8,8 +8,9 @@
   links:
   - title: Quarkus development tools
     url: https://quarkus.io/guides/tooling
-  message: "\n Remove the spring-boot-devtools dependency.\n Quarkus has its own set
-    of development tools integrated by default.\n "
+  message: |-
+    Remove the spring-boot-devtools dependency.
+     Quarkus has its own set of development tools integrated by default.
   ruleID: springboot-devtools-to-quarkus-0000
   when:
     builtin.xml:
diff --git a/resources/rulesets/quarkus/172-springboot-di-to-quarkus.windup.yaml b/resources/rulesets/quarkus/225-springboot-di-to-quarkus.windup.yaml
similarity index 90%
rename from resources/rulesets/quarkus/172-springboot-di-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/225-springboot-di-to-quarkus.windup.yaml
index 3db1900..c28e605 100644
--- a/resources/rulesets/quarkus/172-springboot-di-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/225-springboot-di-to-quarkus.windup.yaml
@@ -9,9 +9,11 @@
   links:
   - title: Quarkus DI Guide
     url: https://quarkus.io/guides/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 "
+  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`
   ruleID: springboot-di-to-quarkus-00000
   when:
     java.dependency:
diff --git a/resources/rulesets/quarkus/173-springboot-generic-catchall.windup.yaml b/resources/rulesets/quarkus/226-springboot-generic-catchall.windup.yaml
similarity index 91%
rename from resources/rulesets/quarkus/173-springboot-generic-catchall.windup.yaml
rename to resources/rulesets/quarkus/226-springboot-generic-catchall.windup.yaml
index 91e5a1f..dc8fbee 100644
--- a/resources/rulesets/quarkus/173-springboot-generic-catchall.windup.yaml
+++ b/resources/rulesets/quarkus/226-springboot-generic-catchall.windup.yaml
@@ -8,7 +8,7 @@
   - springboot
   - catchall
   links: []
-  message: "\n If the application declares explicitly or uses any of the feature provided
+  message: "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
@@ -16,7 +16,7 @@
     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 "
+    Spring component will be removed, this issue will be fixed as well."
   ruleID: springboot-generic-catchall-00100
   when:
     java.dependency:
diff --git a/resources/rulesets/quarkus/174-springboot-integration-to-quarkus.windup.yaml b/resources/rulesets/quarkus/227-springboot-integration-to-quarkus.windup.yaml
similarity index 78%
rename from resources/rulesets/quarkus/174-springboot-integration-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/227-springboot-integration-to-quarkus.windup.yaml
index 04b92c1..51493ee 100644
--- a/resources/rulesets/quarkus/174-springboot-integration-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/227-springboot-integration-to-quarkus.windup.yaml
@@ -8,8 +8,8 @@
   links:
   - title: Quarkus Apache Camel
     url: https://quarkus.io/guides/camel
-  message: "\n SpringBoot Integration flows are not supported. A migration to Apache
-    Camel route is mandatory.\n "
+  message: SpringBoot Integration flows are not supported. A migration to Apache Camel
+    route is mandatory.
   ruleID: springboot-integration-to-quarkus-00010
   when:
     builtin.xml:
@@ -26,8 +26,8 @@
   links:
   - title: Quarkus Apache Camel
     url: https://quarkus.io/guides/camel
-  message: "\n SpringBoot IntegrationFlow class usage is not supported. A migration
-    to Apache Camel route using From is mandatory.\n "
+  message: SpringBoot IntegrationFlow class usage is not supported. A migration to
+    Apache Camel route using From is mandatory.
   ruleID: springboot-integration-to-quarkus-00020
   when:
     java.referenced:
diff --git a/resources/rulesets/quarkus/175-springboot-jmx-to-quarkus.windup.yaml b/resources/rulesets/quarkus/228-springboot-jmx-to-quarkus.windup.yaml
similarity index 65%
rename from resources/rulesets/quarkus/175-springboot-jmx-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/228-springboot-jmx-to-quarkus.windup.yaml
index 967d78b..85ef762 100644
--- a/resources/rulesets/quarkus/175-springboot-jmx-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/228-springboot-jmx-to-quarkus.windup.yaml
@@ -6,9 +6,11 @@
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  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 "
+  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.
   ruleID: springboot-jmx-to-quarkus-00000
   when:
     builtin.xml:
@@ -23,9 +25,11 @@
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  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 "
+  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.
   ruleID: springboot-jmx-to-quarkus-00001
   when:
     java.referenced:
diff --git a/resources/rulesets/quarkus/176-springboot-metrics-to-quarkus.windup.yaml b/resources/rulesets/quarkus/229-springboot-metrics-to-quarkus.windup.yaml
similarity index 79%
rename from resources/rulesets/quarkus/176-springboot-metrics-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/229-springboot-metrics-to-quarkus.windup.yaml
index 4e7a1f9..14cdf11 100644
--- a/resources/rulesets/quarkus/176-springboot-metrics-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/229-springboot-metrics-to-quarkus.windup.yaml
@@ -9,9 +9,9 @@
   links:
   - title: Quarkus metrics
     url: https://quarkus.io/guides/microprofile-metrics
-  message: "\n Replace the Micrometer dependency with Quarkus Microprofile 'metrics'
+  message: "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 "
+    and has to be replaced by `io.quarkus:quarkus-smallrye-metrics` artifact"
   ruleID: springboot-metrics-to-quarkus-0100
   when:
     java.dependency:
@@ -25,7 +25,7 @@
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links: []
-  message: "\n Replace the Micrometer code with Microprofile Metrics code\n "
+  message: Replace the Micrometer code with Microprofile Metrics code
   ruleID: springboot-metrics-to-quarkus-0200
   when:
     java.dependency:
@@ -40,9 +40,8 @@
   - konveyor.io/target=quarkus
   links:
   - title: Quarkus Guide - Micrometer Metrics
-    url: https://quarkus.io/guides/micrometer
-  message: "\n Replace `management.endpoints.web.exposure.include=prometheus` with
-    `quarkus.micrometer.export.prometheus.path=/actuator/prometheus`\n "
+    url: https://quarkus.io/guides/telemetry-micrometer
+  message: Replace `management.endpoints.web.exposure.include=prometheus` with `quarkus.micrometer.export.prometheus.path=/actuator/prometheus`
   ruleID: springboot-metrics-to-quarkus-0300
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/quarkus/23-resteasy-to-quarkus.windup.yaml b/resources/rulesets/quarkus/23-resteasy-to-quarkus.windup.yaml
deleted file mode 100644
index 914d43b..0000000
--- a/resources/rulesets/quarkus/23-resteasy-to-quarkus.windup.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- category: mandatory
-  customVariables: []
-  description: Replace the 'resteasy-multipart-provider' dependency with Quarkus 'quarkus-resteasy-multipart'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=resteasy
-  - konveyor.io/target=quarkus
-  links: []
-  message: "\n Replace the `org.jboss.resteasy:resteasy-multipart-provider` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-resteasy-multipart` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-resteasy-multipart-00000
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.resteasy.resteasy-multipart-provider
-- category: mandatory
-  customVariables: []
-  description: Replace the 'resteasy-multipart-provider' dependency with Quarkus 'quarkus-resteasy-multipart'
-    extension
-  effort: 1
-  labels:
-  - konveyor.io/source=resteasy
-  - konveyor.io/target=quarkus
-  links:
-  - title: Quarkus - Guide
-    url: https://quarkus.io/guides/rest-json#multipart-support
-  message: "\n Replace the `org.jboss.resteasy:resteasy-multipart-provider` dependency
-    with the Quarkus dependency `io.quarkus:quarkus-resteasy-multipart` \n Further
-    information in the link below.\n "
-  ruleID: quarkus-resteasy-multipart-00010
-  when:
-    java.dependency:
-      lowerbound: 0.0.0
-      name: org.jboss.resteasy.resteasy-multipart-provider
diff --git a/resources/rulesets/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml b/resources/rulesets/quarkus/230-springboot-parent-pom-to-quarkus.windup.yaml
similarity index 90%
rename from resources/rulesets/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/230-springboot-parent-pom-to-quarkus.windup.yaml
index 42b0ac4..46c0e8d 100644
--- a/resources/rulesets/quarkus/177-springboot-parent-pom-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/230-springboot-parent-pom-to-quarkus.windup.yaml
@@ -8,9 +8,9 @@
   links:
   - title: Quarkus - Building applications with Maven Guide
     url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  message: "\n Replace the Spring Parent POM with Quarkus BOM in `<dependencyManagement>`
+  message: "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 "
+    this change."
   ruleID: springboot-parent-pom-to-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/178-springboot-plugins-to-quarkus.windup.yaml b/resources/rulesets/quarkus/231-springboot-plugins-to-quarkus.windup.yaml
similarity index 66%
rename from resources/rulesets/quarkus/178-springboot-plugins-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/231-springboot-plugins-to-quarkus.windup.yaml
index 5ab8ccd..f3e6cb3 100644
--- a/resources/rulesets/quarkus/178-springboot-plugins-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/231-springboot-plugins-to-quarkus.windup.yaml
@@ -1,16 +1,16 @@
 - category: mandatory
   customVariables: []
   description: Replace the spring-boot-maven-plugin dependency
-  effort: 2
+  effort: 1
   labels:
   - konveyor.io/source=springboot
   - konveyor.io/target=quarkus
   links:
   - title: Building Quarkus with maven
     url: https://quarkus.io/guides/maven-tooling#build-tool-maven
-  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.\n "
+  message: |-
+    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.
   ruleID: springboot-plugins-to-quarkus-0000
   when:
     builtin.xml:
diff --git a/resources/rulesets/quarkus/179-springboot-properties-to-quarkus.windup.yaml b/resources/rulesets/quarkus/232-springboot-properties-to-quarkus.windup.yaml
similarity index 71%
rename from resources/rulesets/quarkus/179-springboot-properties-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/232-springboot-properties-to-quarkus.windup.yaml
index f96ec72..501e683 100644
--- a/resources/rulesets/quarkus/179-springboot-properties-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/232-springboot-properties-to-quarkus.windup.yaml
@@ -9,10 +9,11 @@
   links:
   - title: Quarkus Spring Configuration Properties Guide
     url: https://quarkus.io/guides/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 "
+  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`
   ruleID: springboot-properties-to-quarkus-00000
   when:
     java.dependency:
@@ -31,9 +32,11 @@
     url: https://quarkus.io/guides/config#configuration-profiles
   - title: Quarkus Configuration Reference Guide
     url: https://quarkus.io/guides/config-reference#configuration_profiles
-  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 "
+  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
   ruleID: springboot-properties-to-quarkus-00001
   when:
     builtin.file:
@@ -48,9 +51,10 @@
   links:
   - title: Quarkus Datasources Guide
     url: https://quarkus.io/guides/datasource
-  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 "
+  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.
   ruleID: springboot-properties-to-quarkus-00002
   when:
     builtin.filecontent:
@@ -66,9 +70,10 @@
   links:
   - title: Quarkus Configuring Logging Guide
     url: https://quarkus.io/guides/logging#runtime-configuration
-  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 "
+  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.
   ruleID: springboot-properties-to-quarkus-00003
   when:
     builtin.filecontent:
@@ -84,7 +89,7 @@
   links:
   - title: Quarkus Hibernate ORM and JPA Guide
     url: https://quarkus.io/guides/hibernate-orm
-  message: "\n Replace `spring.jpa.hibernate.ddl-auto=create-drop` with `quarkus.hibernate-orm.database.generation=drop-and-create`\n "
+  message: Replace `spring.jpa.hibernate.ddl-auto=create-drop` with `quarkus.hibernate-orm.database.generation=drop-and-create`
   ruleID: springboot-properties-to-quarkus-00004
   when:
     builtin.filecontent:
@@ -100,9 +105,9 @@
   links:
   - title: Quarkus Guide - using OpenAPI and Swagger
     url: https://quarkus.io/guides/openapi-swaggerui
-  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 "
+  message: "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."
   ruleID: springboot-properties-to-quarkus-00005
   when:
     builtin.filecontent:
@@ -118,8 +123,7 @@
   links:
   - title: Quarkus Guide - using OpenAPI and Swagger
     url: https://quarkus.io/guides/openapi-swaggerui
-  message: "\n Replace `springdoc.api-docs.path` with `quarkus.smallrye-openapi.path`\n
-    \n "
+  message: Replace `springdoc.api-docs.path` with `quarkus.smallrye-openapi.path`
   ruleID: springboot-properties-to-quarkus-00006
   when:
     builtin.filecontent:
diff --git a/resources/rulesets/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml b/resources/rulesets/quarkus/233-springboot-scheduled-to-quarkus.windup.yaml
similarity index 62%
rename from resources/rulesets/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/233-springboot-scheduled-to-quarkus.windup.yaml
index cb07914..8b79c1a 100644
--- a/resources/rulesets/quarkus/180-springboot-scheduled-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/233-springboot-scheduled-to-quarkus.windup.yaml
@@ -9,10 +9,11 @@
   links:
   - title: Quarkus Spring Scheduled Guide
     url: https://quarkus.io/guides/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 "
+  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`
   ruleID: springboot-scheduled-to-quarkus-00000
   when:
     java.referenced:
diff --git a/resources/rulesets/quarkus/181-springboot-security-to-quarkus.windup.yaml b/resources/rulesets/quarkus/234-springboot-security-to-quarkus.windup.yaml
similarity index 86%
rename from resources/rulesets/quarkus/181-springboot-security-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/234-springboot-security-to-quarkus.windup.yaml
index 847a8f3..fa72d39 100644
--- a/resources/rulesets/quarkus/181-springboot-security-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/234-springboot-security-to-quarkus.windup.yaml
@@ -9,10 +9,10 @@
   links:
   - title: Quarkus Extension for Spring Security API Guide
     url: https://quarkus.io/guides/spring-security
-  message: "\n Replace the SpringBoot Security artifact with Quarkus `spring-security`
+  message: "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 "
+    Quarkus dependency `io.quarkus:quarkus-spring-security`"
   ruleID: springboot-security-to-quarkus-00000
   when:
     or:
diff --git a/resources/rulesets/quarkus/182-springboot-shell-to-quarkus.windup.yaml b/resources/rulesets/quarkus/235-springboot-shell-to-quarkus.windup.yaml
similarity index 61%
rename from resources/rulesets/quarkus/182-springboot-shell-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/235-springboot-shell-to-quarkus.windup.yaml
index 3a572c6..330157e 100644
--- a/resources/rulesets/quarkus/182-springboot-shell-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/235-springboot-shell-to-quarkus.windup.yaml
@@ -10,10 +10,13 @@
     url: https://quarkus.io/guides/picocli
   - title: Spring Shell Guide
     url: https://spring.io/projects/spring-shell/
-  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 "
+  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.
   ruleID: springboot-shell-to-quarkus-00000
   when:
     java.dependency:
diff --git a/resources/rulesets/quarkus/183-springboot-web-to-quarkus.windup.yaml b/resources/rulesets/quarkus/236-springboot-web-to-quarkus.windup.yaml
similarity index 83%
rename from resources/rulesets/quarkus/183-springboot-web-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/236-springboot-web-to-quarkus.windup.yaml
index b938541..289a1d0 100644
--- a/resources/rulesets/quarkus/183-springboot-web-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/236-springboot-web-to-quarkus.windup.yaml
@@ -10,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: "\n Replace the Spring Web artifact with Quarkus `spring-web` extension\n\n
+  message: "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 "
+    reasons,\n the `quarkus-resteasy-reactive-jackson` dependency should be used."
   ruleID: springboot-web-to-quarkus-00000
   when:
     or:
@@ -37,10 +37,11 @@
   links:
   - title: Quarkus Migration Guide 2.5
     url: https://github.com/quarkusio/quarkus/wiki/Migration-Guide-2.5#spring-web
-  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 "
+  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."
   ruleID: springboot-web-to-quarkus-00010
   when:
     or:
diff --git a/resources/rulesets/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml b/resources/rulesets/quarkus/237-springboot-webmvc-to-quarkus.windup.yaml
similarity index 79%
rename from resources/rulesets/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml
rename to resources/rulesets/quarkus/237-springboot-webmvc-to-quarkus.windup.yaml
index 0592c0f..38c09db 100644
--- a/resources/rulesets/quarkus/184-springboot-webmvc-to-quarkus.windup.yaml
+++ b/resources/rulesets/quarkus/237-springboot-webmvc-to-quarkus.windup.yaml
@@ -8,8 +8,10 @@
   links:
   - title: Quarkus - Supported Spring Web functionalities
     url: https://quarkus.io/guides/spring-web#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 "
+  message: |-
+    Spring MVC is not supported by Quarkus
+
+     Use the following link to figure out the supported Spring Web functionalities.
   ruleID: springboot-webmvc-to-quarkus-00000
   when:
     java.referenced:
@@ -27,8 +29,10 @@
     url: https://quarkus.io/guides/vertx
   - title: Quarkus - Using Reactive Routes
     url: https://quarkus.io/guides/reactive-routes
-  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 "
+  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.
   ruleID: springboot-webmvc-to-quarkus-01000
   when:
     or:
diff --git a/resources/rulesets/rhr/185-springboot-associated-artifacts.rhamt.yaml b/resources/rulesets/rhr/238-springboot-associated-artifacts.rhamt.yaml
similarity index 92%
rename from resources/rulesets/rhr/185-springboot-associated-artifacts.rhamt.yaml
rename to resources/rulesets/rhr/238-springboot-associated-artifacts.rhamt.yaml
index 7694091..657d491 100644
--- a/resources/rulesets/rhr/185-springboot-associated-artifacts.rhamt.yaml
+++ b/resources/rulesets/rhr/238-springboot-associated-artifacts.rhamt.yaml
@@ -139,9 +139,9 @@
   - 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.\n "
+    in the link.
   ruleID: springboot-associated-00008
   when:
     as: dependencies-block
@@ -161,9 +161,9 @@
   - 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.\n "
+    in the link.
   ruleID: springboot-associated-00009
   when:
     as: dependencies-block
@@ -182,9 +182,9 @@
   - 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.\n "
+    in the link.
   ruleID: springboot-associated-00010
   when:
     as: dependencies-block
@@ -203,9 +203,9 @@
   - 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.\n "
+    in the link.
   ruleID: springboot-associated-00011
   when:
     as: dependencies-block
@@ -225,9 +225,9 @@
   - 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.\n "
+    in the link.
   ruleID: springboot-associated-00012
   when:
     as: dependencies-block
@@ -247,9 +247,9 @@
   - 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.\n "
+    link.
   ruleID: springboot-associated-00013
   when:
     as: dependencies-block
@@ -268,9 +268,9 @@
   - 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.\n "
+    link.
   ruleID: springboot-associated-00014
   when:
     as: dependencies-block
@@ -289,9 +289,9 @@
   - 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.\n "
+    provided in the link.
   ruleID: springboot-associated-00015
   when:
     as: dependencies-block
diff --git a/resources/rulesets/rhr/186-springboot.rhamt.yaml b/resources/rulesets/rhr/239-springboot-rhr.rhamt.yaml
similarity index 96%
rename from resources/rulesets/rhr/186-springboot.rhamt.yaml
rename to resources/rulesets/rhr/239-springboot-rhr.rhamt.yaml
index 87cc0d6..3fd532e 100644
--- a/resources/rulesets/rhr/186-springboot.rhamt.yaml
+++ b/resources/rulesets/rhr/239-springboot-rhr.rhamt.yaml
@@ -10,7 +10,7 @@
     url: https://access.redhat.com/articles/3348731
   message: 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
-  ruleID: springboot-00001
+  ruleID: springboot-rhr-00001
   when:
     java.dependency:
       nameregex: org\.springframework\.boot\..*
@@ -26,7 +26,7 @@
   - title: RHOAR Component Details Overview
     url: https://access.redhat.com/articles/3348731
   message: Spring Boot has to be updated to a version supported by Red Hat Runtimes
-  ruleID: springboot-00002
+  ruleID: springboot-rhr-00002
   when:
     or:
     - java.dependency:
@@ -66,5 +66,5 @@
         nameregex: org\.springframework\.boot\..*
         upperbound: 2.7.7
     - java.dependency:
-        lowerbound: 2.7.9
+        lowerbound: 3.0.0
         nameregex: org\.springframework\.boot\..*
diff --git a/resources/rulesets/technology-usage/03-web-technology-usage.windup.yaml b/resources/rulesets/technology-usage/03-web-technology-usage.windup.yaml
new file mode 100644
index 0000000..5417405
--- /dev/null
+++ b/resources/rulesets/technology-usage/03-web-technology-usage.windup.yaml
@@ -0,0 +1,181 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01000
+  tag:
+  - View=JSF Page
+  - Web=JSF Page
+  - Java EE=JSF Page
+  when:
+    builtin.hasTags:
+    - JSF
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01100
+  tag:
+  - View=JSP Page
+  - Web=JSP Page
+  - Java EE=JSP Page
+  when:
+    builtin.hasTags:
+    - JSP
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01200
+  tag:
+  - View=Web XML File
+  - Web=Web XML File
+  - Java EE=Web XML File
+  when:
+    builtin.hasTags:
+    - WebXML
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01300
+  tag:
+  - View=WebSocket
+  - Web=WebSocket
+  - Java EE=WebSocket
+  when:
+    builtin.hasTags:
+    - WebSocket
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01400
+  tag:
+  - View=Applet
+  - Rich=Applet
+  - Java EE=Applet
+  when:
+    or:
+    - builtin.hasTags:
+      - Applet
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01500
+  tag:
+  - View=JNLP
+  - Rich=JNLP
+  - Java EE=JNLP
+  when:
+    builtin.hasTags:
+    - JNLP
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01600
+  tag:
+  - View=JNLP
+  - Rich=JNLP
+  - Embedded=JNLP
+  when:
+    builtin.hasTags:
+    - JNLP
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01700
+  tag:
+  - View=Swing
+  - Rich=Swing
+  - Embedded=Swing
+  when:
+    builtin.hasTags:
+    - Swing
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01800
+  tag:
+  - View=MiGLayout
+  - Rich=MiGLayout
+  - Embedded=MiGLayout
+  when:
+    builtin.hasTags:
+    - MiGLayout
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-01900
+  tag:
+  - View=JGoodies
+  - Rich=JGoodies
+  - Embedded=JGoodies
+  when:
+    builtin.hasTags:
+    - JGoodies
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-02000
+  tag:
+  - View=FormLayoutMaker
+  - Rich=FormLayoutMaker
+  - Embedded=FormLayoutMaker
+  when:
+    builtin.hasTags:
+    - FormLayoutMaker
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-02100
+  tag:
+  - View=Magicgrouplayout
+  - Rich=Magicgrouplayout
+  - Embedded=Magicgrouplayout
+  when:
+    builtin.hasTags:
+    - Magicgrouplayout
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-02200
+  tag:
+  - View=Standard Widget Toolkit (SWT)
+  - Rich=Standard Widget Toolkit (SWT)
+  - Embedded=Standard Widget Toolkit (SWT)
+  when:
+    builtin.hasTags:
+    - SWT
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-02300
+  tag:
+  - View=JavaFX
+  - Rich=JavaFX
+  - Embedded=JavaFX
+  when:
+    builtin.hasTags:
+    - JavaFX
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-web-02400
+  tag:
+  - View=Eclipse RCP
+  - Rich=Eclipse RCP
+  - Embedded=Eclipse RCP
+  when:
+    builtin.hasTags:
+    - Eclipse RCP
diff --git a/resources/rulesets/technology-usage/04-test-frameworks-technology-usage.windup.yaml b/resources/rulesets/technology-usage/05-test-frameworks-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/04-test-frameworks-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/05-test-frameworks-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/07-security-technology-usage.windup.yaml b/resources/rulesets/technology-usage/08-security-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/07-security-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/08-security-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/09-observability-technology-usage.windup.yaml b/resources/rulesets/technology-usage/10-observability-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/09-observability-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/10-observability-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml b/resources/rulesets/technology-usage/11-non-xml-rules-technology-usage.rhamt.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/10-non-xml-rules-technology-usage.rhamt.yaml
rename to resources/rulesets/technology-usage/11-non-xml-rules-technology-usage.rhamt.yaml
diff --git a/resources/rulesets/technology-usage/12-mvc-technology-usage.windup.yaml b/resources/rulesets/technology-usage/13-mvc-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/12-mvc-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/13-mvc-technology-usage.windup.yaml
diff --git a/resources/rulesets/eap6/58-websphere-ignore-references.windup.yaml b/resources/rulesets/technology-usage/14-messaging-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/eap6/58-websphere-ignore-references.windup.yaml
rename to resources/rulesets/technology-usage/14-messaging-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/14-markup-technology-usage.windup.yaml b/resources/rulesets/technology-usage/15-markup-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/14-markup-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/15-markup-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/16-logging-technology-usage.windup.yaml b/resources/rulesets/technology-usage/17-logging-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/16-logging-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/17-logging-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/18-jta-technology-usage.windup.yaml b/resources/rulesets/technology-usage/19-jta-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/18-jta-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/19-jta-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/197-discovery-target.windup.yaml b/resources/rulesets/technology-usage/197-discovery-target.windup.yaml
deleted file mode 100644
index fe51488..0000000
--- a/resources/rulesets/technology-usage/197-discovery-target.windup.yaml
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/resources/rulesets/technology-usage/20-javase-technology-usage.windup.yaml b/resources/rulesets/technology-usage/21-javase-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/20-javase-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/21-javase-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/21-javaee-technology-usage.windup.yaml b/resources/rulesets/technology-usage/22-javaee-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/21-javaee-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/22-javaee-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/24-http-technology-usage.windup.yaml b/resources/rulesets/technology-usage/24-http-technology-usage.windup.yaml
deleted file mode 100644
index fe51488..0000000
--- a/resources/rulesets/technology-usage/24-http-technology-usage.windup.yaml
+++ /dev/null
@@ -1 +0,0 @@
-[]
diff --git a/resources/rulesets/technology-usage/241-3rd-party-spring.windup.yaml b/resources/rulesets/technology-usage/241-3rd-party-spring.windup.yaml
new file mode 100644
index 0000000..9813d92
--- /dev/null
+++ b/resources/rulesets/technology-usage/241-3rd-party-spring.windup.yaml
@@ -0,0 +1,31 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: 3rd-party-spring-03001
+  tag:
+  - Spring Boot Configuration
+  - Spring Boot Auto-configuration
+  - Spring Boot Component Scan
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: org.springframework.boot.autoconfigure.SpringBootApplication
+- customVariables: []
+  description: Embedded framework - Spring Deployable War
+  labels:
+  - konveyor.io/include=always
+  links: []
+  message: The Spring application can start from War
+  ruleID: 3rd-party-spring-03002
+  tag:
+  - Spring Deployable War
+  - Embedded framework - Spring Deployable War
+  when:
+    or:
+    - java.referenced:
+        location: INHERITANCE
+        pattern: org.springframework.boot.web.servlet.support.SpringBootServletInitializer
+    - builtin.xml:
+        namespaces: {}
+        xpath: //*[local-name() = 'servlet-class' and text() = 'org.springframework.web.servlet.DispatcherServlet']
diff --git a/resources/rulesets/technology-usage/188-3rd-party.windup.yaml b/resources/rulesets/technology-usage/243-3rd-party.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/188-3rd-party.windup.yaml
rename to resources/rulesets/technology-usage/243-3rd-party.windup.yaml
diff --git a/resources/rulesets/technology-usage/245-apm.windup.yaml b/resources/rulesets/technology-usage/245-apm.windup.yaml
new file mode 100644
index 0000000..b5926fd
--- /dev/null
+++ b/resources/rulesets/technology-usage/245-apm.windup.yaml
@@ -0,0 +1,73 @@
+- customVariables: []
+  description: Application Performance Management (APM) tool - Application Insights
+  labels:
+  - konveyor.io/include=always
+  - apm
+  links: []
+  message: The application uses Application Insights.
+  ruleID: apm-00000
+  tag:
+  - Application Insights
+  - Application Performance Management (APM) tool - Application Insights
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: com\.microsoft\.azure\..*applicationinsights.*
+    - builtin.file:
+        pattern: applicationinsights.*\.jar
+- customVariables: []
+  description: Application Performance Management (APM) tool - New Relic
+  labels:
+  - konveyor.io/include=always
+  - apm
+  links: []
+  message: The application uses New Relic.
+  ruleID: apm-00001
+  tag:
+  - New Relic
+  - Application Performance Management (APM) tool - New Relic
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: .*newrelic.*
+    - builtin.file:
+        pattern: newrelic.*\.jar
+- customVariables: []
+  description: Application Performance Management (APM) tool - Elastic APM
+  labels:
+  - konveyor.io/include=always
+  - apm
+  links: []
+  message: The application uses Elastic APM.
+  ruleID: apm-00002
+  tag:
+  - Elastic APM
+  - Application Performance Management (APM) tool - Elastic APM
+  when:
+    or:
+    - java.dependency:
+        lowerbound: 0.0.0
+        nameregex: .*elastic\.apm.*
+    - builtin.file:
+        pattern: elastic-apm.*\.jar
+- customVariables: []
+  description: Application Performance Management (APM) tool - Dynatrace
+  labels:
+  - konveyor.io/include=always
+  - apm
+  links: []
+  message: The application uses Dynatrace.
+  ruleID: apm-00003
+  tag:
+  - Dynatrace
+  - Application Performance Management (APM) tool - Dynatrace
+  when:
+    or:
+    - builtin.file:
+        pattern: dynatrace.*\.jar
+    - builtin.file:
+        pattern: liboneagent\.so
+    - builtin.file:
+        pattern: dtjavaagent\.jar
diff --git a/resources/rulesets/technology-usage/190-clustering.windup.yaml b/resources/rulesets/technology-usage/247-clustering.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/190-clustering.windup.yaml
rename to resources/rulesets/technology-usage/247-clustering.windup.yaml
diff --git a/resources/rulesets/technology-usage/192-configuration-management.windup.yaml b/resources/rulesets/technology-usage/249-configuration-management.windup.yaml
similarity index 91%
rename from resources/rulesets/technology-usage/192-configuration-management.windup.yaml
rename to resources/rulesets/technology-usage/249-configuration-management.windup.yaml
index 7eff09e..068ed52 100644
--- a/resources/rulesets/technology-usage/192-configuration-management.windup.yaml
+++ b/resources/rulesets/technology-usage/249-configuration-management.windup.yaml
@@ -26,7 +26,7 @@
   - Application properties file detected
   when:
     builtin.file:
-      pattern: application.*\.(properties|yml|yaml)
+      pattern: application.*\.properties
 - customVariables: []
   description: Spring datasource properties detected
   labels:
@@ -38,7 +38,7 @@
   - Spring datasource properties detected
   when:
     builtin.filecontent:
-      filePattern: application.*\.(properties|yml|yaml)
+      filePattern: application.*\.properties
       pattern: spring.datasource
 - customVariables: []
   description: Spring logging properties detected
@@ -51,7 +51,7 @@
   - Spring logging properties detected
   when:
     builtin.filecontent:
-      filePattern: application.*\.(properties|yml|yaml)
+      filePattern: application.*\.properties
       pattern: logging.level.org.springframework
 - customVariables: []
   description: Spring configuration properties annotation detected
diff --git a/resources/rulesets/technology-usage/23-integration-technology-usage.windup.yaml b/resources/rulesets/technology-usage/25-integration-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/23-integration-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/25-integration-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/194-connect.windup.yaml b/resources/rulesets/technology-usage/251-connect.groovy.windup.yaml
similarity index 53%
rename from resources/rulesets/technology-usage/194-connect.windup.yaml
rename to resources/rulesets/technology-usage/251-connect.groovy.windup.yaml
index b2b7699..563cf42 100644
--- a/resources/rulesets/technology-usage/194-connect.windup.yaml
+++ b/resources/rulesets/technology-usage/251-connect.groovy.windup.yaml
@@ -14,11 +14,7 @@
   description: Embedded library - ActiveMQ
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-01500
   tag:
   - ActiveMQ
@@ -54,11 +50,7 @@
   description: Embedded library - RabbitMQ Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-01800
   tag:
   - RabbitMQ Client
@@ -79,11 +71,7 @@
   description: Embedded library - Spring Messaging Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-01900
   tag:
   - Spring Messaging Client
@@ -98,11 +86,7 @@
   description: Embedded library - Camel Messaging Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02000
   tag:
   - Camel Messaging Client
@@ -114,11 +98,7 @@
   description: Embedded library - Amazon SQS Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02100
   tag:
   - Amazon SQS Client
@@ -130,11 +110,7 @@
   description: Embedded library - HornetQ Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02200
   tag:
   - HornetQ Client
@@ -146,14 +122,10 @@
   description: Embedded library - AMQP Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02300
   tag:
-  - AMQP Client
+  - ' Client'
   - Embedded library - AMQP Client
   when:
     builtin.file:
@@ -162,14 +134,10 @@
   description: Embedded library - RocketMQ Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02400
   tag:
-  - RocketMQ Client
+  - ' Client'
   - Embedded library - RocketMQ Client
   when:
     builtin.file:
@@ -178,11 +146,7 @@
   description: Embedded library - 0MQ Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02500
   tag:
   - 0MQ Client
@@ -197,11 +161,7 @@
   description: Embedded library - JBossMQ Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02600
   tag:
   - JBossMQ Client
@@ -213,11 +173,7 @@
   description: Embedded library - Zbus Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02700
   tag:
   - Zbus Client
@@ -229,11 +185,7 @@
   description: Embedded library - Qpid Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: connect-02800
   tag:
   - Qpid Client
@@ -241,3 +193,18 @@
   when:
     builtin.file:
       pattern: .*qpid.*
+- customVariables: []
+  description: Embedded library - Kafka Client
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: connect-02900
+  tag:
+  - Kafka Client
+  - Embedded library - Kafka Client
+  when:
+    or:
+    - builtin.file:
+        pattern: .*kafka-clients.*
+    - builtin.file:
+        pattern: .*spring-kafka.*
diff --git a/resources/rulesets/technology-usage/196-database.windup.yaml b/resources/rulesets/technology-usage/253-database.groovy.windup.yaml
similarity index 53%
rename from resources/rulesets/technology-usage/196-database.windup.yaml
rename to resources/rulesets/technology-usage/253-database.groovy.windup.yaml
index f2a4ac7..a4fa1f7 100644
--- a/resources/rulesets/technology-usage/196-database.windup.yaml
+++ b/resources/rulesets/technology-usage/253-database.groovy.windup.yaml
@@ -2,11 +2,7 @@
   description: Embedded HSQLDB Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: database-01400
   tag:
   - HSQLDB Driver
@@ -18,11 +14,7 @@
   description: Embedded MySQL Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: database-01500
   tag:
   - MySQL Driver
@@ -34,11 +26,7 @@
   description: Embedded Derby Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: database-01600
   tag:
   - Derby Driver
@@ -50,11 +38,7 @@
   description: Embedded PostgreSQL Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: database-01700
   tag:
   - PostgreSQL Driver
@@ -66,11 +50,7 @@
   description: Embedded H2 Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
+  links: []
   ruleID: database-01800
   tag:
   - H2 Driver
@@ -82,12 +62,8 @@
   description: Embedded Microsoft SQL Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-01900
+  links: []
+  ruleID: database-01805
   tag:
   - Microsoft SQL Driver
   - Embedded Microsoft SQL Driver
@@ -101,12 +77,8 @@
   description: Embedded SQLite Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02000
+  links: []
+  ruleID: database-01900
   tag:
   - SQLite Driver
   - Embedded SQLite Driver
@@ -117,12 +89,8 @@
   description: Embedded Oracle DB Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02100
+  links: []
+  ruleID: database-02000
   tag:
   - Oracle DB Driver
   - Embedded Oracle DB Driver
@@ -136,17 +104,15 @@
   description: Embedded Cassandra Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02200
+  links: []
+  ruleID: database-02100
   tag:
   - Cassandra Client
   - Embedded Cassandra Client
   when:
     or:
+    - builtin.file:
+        pattern: .*sqlite-jdbc.*\.jar
     - builtin.file:
         pattern: .*cassandra.*\.jar
     - builtin.file:
@@ -167,12 +133,8 @@
   description: Embedded Axion Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02300
+  links: []
+  ruleID: database-02200
   tag:
   - Axion Driver
   - Embedded Axion Driver
@@ -183,12 +145,8 @@
   description: Embedded MckoiSQLDB Driver
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02400
+  links: []
+  ruleID: database-02300
   tag:
   - MckoiSQLDB Driver
   - Embedded MckoiSQLDB Driver
@@ -199,12 +157,8 @@
   description: Embedded MongoDB Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02500
+  links: []
+  ruleID: database-02400
   tag:
   - MongoDB Client
   - Embedded MongoDB Client
@@ -227,7 +181,7 @@
   labels:
   - konveyor.io/include=always
   links: []
-  ruleID: database-02600
+  ruleID: database-02500
   tag:
   - Spring Data
   - Embedded framework - Spring Data
@@ -238,12 +192,8 @@
   description: Embedded framework - Morphia
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02700
+  links: []
+  ruleID: database-02600
   tag:
   - Morphia
   - Embedded framework - Morphia
@@ -254,12 +204,8 @@
   description: Embedded LevelDB Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02800
+  links: []
+  ruleID: database-02700
   tag:
   - LevelDB Client
   - Embedded LevelDB Client
@@ -270,12 +216,8 @@
   description: Embedded Apache HBase Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-02900
+  links: []
+  ruleID: database-02800
   tag:
   - Apache HBase Client
   - Embedded Apache HBase Client
@@ -286,12 +228,8 @@
   description: Embedded Apache Accumulo Client
   labels:
   - konveyor.io/include=always
-  links:
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 6 Supported Configurations
-    url: https://access.redhat.com/articles/111663
-  - title: Red Hat JBoss Enterprise Application Platform (EAP) 7 Supported Configurations
-    url: https://access.redhat.com/articles/2026253
-  ruleID: database-03100
+  links: []
+  ruleID: database-02900
   tag:
   - Apache Accumulo Client
   - Embedded Apache Accumulo Client
@@ -303,7 +241,7 @@
   labels:
   - konveyor.io/include=always
   links: []
-  ruleID: database-03200
+  ruleID: database-03000
   tag:
   - Spring Data JPA
   - Embedded Spring Data JPA
@@ -318,3 +256,16 @@
     - java.dependency:
         lowerbound: 0.0.0
         name: org.springframework.data.spring-data-jpa
+- customVariables: []
+  description: Embedded MariaDB Driver
+  labels:
+  - konveyor.io/include=always
+  links: []
+  message: The application embeds an MariaDB Driver library.
+  ruleID: database-03100
+  tag:
+  - MariaDB Driver
+  - Embedded MariaDB Driver
+  when:
+    builtin.file:
+      pattern: .*mariadb.*\.jar
diff --git a/resources/rulesets/eap7/93-java-wsdl-mapping.yaml b/resources/rulesets/technology-usage/254-discovery-target.windup.yaml
similarity index 100%
rename from resources/rulesets/eap7/93-java-wsdl-mapping.yaml
rename to resources/rulesets/technology-usage/254-discovery-target.windup.yaml
diff --git a/resources/rulesets/technology-usage/199-ejb.windup.yaml b/resources/rulesets/technology-usage/256-ejb.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/199-ejb.windup.yaml
rename to resources/rulesets/technology-usage/256-ejb.windup.yaml
diff --git a/resources/rulesets/cloud-readiness/155-embedded-cache-libraries.windup.yaml b/resources/rulesets/technology-usage/257-embedded-cache-libraries.windup.yaml
similarity index 53%
rename from resources/rulesets/cloud-readiness/155-embedded-cache-libraries.windup.yaml
rename to resources/rulesets/technology-usage/257-embedded-cache-libraries.windup.yaml
index e641373..f2f301e 100644
--- a/resources/rulesets/cloud-readiness/155-embedded-cache-libraries.windup.yaml
+++ b/resources/rulesets/technology-usage/257-embedded-cache-libraries.windup.yaml
@@ -1,195 +1,180 @@
 - customVariables: []
-  description: Caching - Ehcache embedded library
+  description: Ehcache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-01000
   tag:
   - Ehcache
-  - Caching - Ehcache embedded library
+  - Ehcache embedded library
   when:
     builtin.file:
       pattern: .*ehcache.*\.jar$
 - customVariables: []
-  description: Caching - Coherence embedded library
+  description: Coherence embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-02000
   tag:
   - Coherence
-  - Caching - Coherence embedded library
+  - Coherence embedded library
   when:
     builtin.file:
       pattern: .*coherence.*\.jar$
 - customVariables: []
-  description: Caching - Apache Commons JCS embedded library
+  description: Apache Commons JCS embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-03000
   tag:
   - Apache Commons JCS
-  - Caching - Apache Commons JCS embedded library
+  - Apache Commons JCS embedded library
   when:
     builtin.file:
       pattern: .*commons-jcs.*\.jar$
 - customVariables: []
-  description: Caching - Dynacache embedded library
+  description: Dynacache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-04000
   tag:
   - Dynacache
-  - Caching - Dynacache embedded library
+  - Dynacache embedded library
   when:
     builtin.file:
       pattern: .*dynacache.*\.jar$
 - customVariables: []
-  description: Caching - Embedded library
+  description: Embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-05000
   tag:
   - Cache API
-  - Caching - Embedded library
+  - Embedded library
   when:
     builtin.file:
       pattern: .*cache-api.*\.jar$
 - customVariables: []
-  description: Caching - Hazelcast embedded library
+  description: Hazelcast embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-06000
   tag:
   - Hazelcast
-  - Caching - Hazelcast embedded library
+  - Hazelcast embedded library
   when:
     builtin.file:
       pattern: .*hazelcast.*\.jar$
 - customVariables: []
-  description: Caching - Apache Ignite embedded library
+  description: Apache Ignite embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-07000
   tag:
   - Apache Ignite
-  - Caching - Apache Ignite embedded library
+  - Apache Ignite embedded library
   when:
     builtin.file:
       pattern: .*ignite.*\.jar$
 - customVariables: []
-  description: Caching - Infinispan embedded library
+  description: Infinispan embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-08000
   tag:
   - Infinispan
-  - Caching - Infinispan embedded library
+  - Infinispan embedded library
   when:
     builtin.file:
       pattern: .*infinispan.*\.jar$
 - customVariables: []
-  description: Caching - JBoss Cache embedded library
+  description: JBoss Cache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-09000
   tag:
   - JBoss Cache
-  - Caching - JBoss Cache embedded library
+  - JBoss Cache embedded library
   when:
     builtin.file:
       pattern: .*jbosscache.*\.jar$
 - customVariables: []
-  description: Caching - JCache embedded library
+  description: JCache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-10000
   tag:
   - JCache
-  - Caching - JCache embedded library
+  - JCache embedded library
   when:
     builtin.file:
       pattern: .*jcache.*\.jar$
 - customVariables: []
-  description: Caching - Memcached client embedded library
+  description: Memcached client embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-11000
   tag:
   - Memcached client
-  - Caching - Memcached client embedded library
+  - Memcached client embedded library
   when:
     builtin.file:
       pattern: .*memcached.*\.jar$
 - customVariables: []
-  description: Caching - Oscache embedded library
+  description: Oscache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-12000
   tag:
   - Oscache
-  - Caching - Oscache embedded library
+  - Oscache embedded library
   when:
     builtin.file:
       pattern: .*oscache.*\.jar$
 - customVariables: []
-  description: Caching - ShiftOne (Java Object Cache) embedded library
+  description: ShiftOne (Java Object Cache) embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-13000
   tag:
   - ShiftOne
-  - Caching - ShiftOne (Java Object Cache) embedded library
+  - ShiftOne (Java Object Cache) embedded library
   when:
     builtin.file:
       pattern: .*shiftone.*\.jar$
 - customVariables: []
-  description: Caching - SwarmCache embedded library
+  description: SwarmCache embedded library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-14000
   tag:
   - SwarmCache
-  - Caching - SwarmCache embedded library
+  - SwarmCache embedded library
   when:
     builtin.file:
       pattern: .*swarmcache.*\.jar$
 - customVariables: []
-  description: Caching - Spring Boot Cache library
+  description: Spring Boot Cache library
   labels:
-  - konveyor.io/target=cloud-readiness
-  - konveyor.io/source
+  - konveyor.io/include=always
   links: []
   ruleID: embedded-cache-libraries-15000
   tag:
   - Spring Boot Cache
-  - Caching - Spring Boot Cache library
+  - Spring Boot Cache library
   when:
     or:
     - java.dependency:
@@ -198,3 +183,15 @@
     - java.dependency:
         lowerbound: 0.0.0
         name: org.springframework.boot.spring-boot-starter-cache
+- customVariables: []
+  description: Redis Cache library
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: embedded-cache-libraries-16000
+  tag:
+  - Redis
+  - Redis Cache library
+  when:
+    builtin.file:
+      pattern: .*redis.*\.jar
diff --git a/resources/rulesets/technology-usage/201-embedded-framework.windup.yaml b/resources/rulesets/technology-usage/259-embedded-framework.windup.yaml
similarity index 98%
rename from resources/rulesets/technology-usage/201-embedded-framework.windup.yaml
rename to resources/rulesets/technology-usage/259-embedded-framework.windup.yaml
index 1b13f19..5095988 100644
--- a/resources/rulesets/technology-usage/201-embedded-framework.windup.yaml
+++ b/resources/rulesets/technology-usage/259-embedded-framework.windup.yaml
@@ -739,18 +739,6 @@
   when:
     builtin.file:
       pattern: feign-.*\.jar
-- customVariables: []
-  description: Embedded framework - Redis
-  labels:
-  - konveyor.io/include=always
-  links: []
-  ruleID: embedded-framework-09200
-  tag:
-  - Redis
-  - Embedded framework - Redis
-  when:
-    builtin.file:
-      pattern: .*redis.*\.jar
 - customVariables: []
   description: Embedded framework - Eureka
   labels:
diff --git a/resources/rulesets/technology-usage/13-messaging-technology-usage.windup.yaml b/resources/rulesets/technology-usage/26-http-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/13-messaging-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/26-http-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/204-integration.windup.yaml b/resources/rulesets/technology-usage/262-integration.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/204-integration.windup.yaml
rename to resources/rulesets/technology-usage/262-integration.windup.yaml
diff --git a/resources/rulesets/technology-usage/263-javaee-technology-tag.groovy.windup.yaml b/resources/rulesets/technology-usage/263-javaee-technology-tag.groovy.windup.yaml
new file mode 100644
index 0000000..1cbedc4
--- /dev/null
+++ b/resources/rulesets/technology-usage/263-javaee-technology-tag.groovy.windup.yaml
@@ -0,0 +1,13 @@
+- customVariables: []
+  description: Embedded library - HSQLDB Driver
+  labels:
+  - konveyor.io/include=always
+  links: []
+  message: The application embeds an HSQLDB Driver library.
+  ruleID: database-01400
+  tag:
+  - HSQLDB Driver
+  - Embedded library - HSQLDB Driver
+  when:
+    builtin.file:
+      pattern: .*hsqldb.*\.jar
diff --git a/resources/rulesets/technology-usage/207-javase.windup.yaml b/resources/rulesets/technology-usage/266-javase.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/207-javase.windup.yaml
rename to resources/rulesets/technology-usage/266-javase.windup.yaml
diff --git a/resources/rulesets/technology-usage/209-jta.windup.yaml b/resources/rulesets/technology-usage/268-jta.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/209-jta.windup.yaml
rename to resources/rulesets/technology-usage/268-jta.windup.yaml
diff --git a/resources/rulesets/technology-usage/211-logging-usage.windup.yaml b/resources/rulesets/technology-usage/270-logging-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/211-logging-usage.windup.yaml
rename to resources/rulesets/technology-usage/270-logging-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/215-mvc.windup.yaml b/resources/rulesets/technology-usage/274-mvc.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/215-mvc.windup.yaml
rename to resources/rulesets/technology-usage/274-mvc.windup.yaml
diff --git a/resources/rulesets/technology-usage/218-observability.windup.yaml b/resources/rulesets/technology-usage/277-observability.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/218-observability.windup.yaml
rename to resources/rulesets/technology-usage/277-observability.windup.yaml
diff --git a/resources/rulesets/technology-usage/220-security.windup.yaml b/resources/rulesets/technology-usage/279-security.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/220-security.windup.yaml
rename to resources/rulesets/technology-usage/279-security.windup.yaml
diff --git a/resources/rulesets/technology-usage/26-embedded-framework-technology-usage.windup.yaml b/resources/rulesets/technology-usage/28-embedded-framework-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/26-embedded-framework-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/28-embedded-framework-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/221-spring-catchall.windup.yaml b/resources/rulesets/technology-usage/280-spring-catchall.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/221-spring-catchall.windup.yaml
rename to resources/rulesets/technology-usage/280-spring-catchall.windup.yaml
diff --git a/resources/rulesets/technology-usage/223-test-frameworks-usage.windup.yaml b/resources/rulesets/technology-usage/282-test-frameworks-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/223-test-frameworks-usage.windup.yaml
rename to resources/rulesets/technology-usage/282-test-frameworks-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/02-web-technology-usage.windup.yaml b/resources/rulesets/technology-usage/284-web.windup.yaml
similarity index 69%
rename from resources/rulesets/technology-usage/02-web-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/284-web.windup.yaml
index 42a2a1a..ef6d1da 100644
--- a/resources/rulesets/technology-usage/02-web-technology-usage.windup.yaml
+++ b/resources/rulesets/technology-usage/284-web.windup.yaml
@@ -1,25 +1,25 @@
 - customVariables: []
+  description: Embedded technology - Java Server Faces
   labels:
   - konveyor.io/include=always
   links: []
-  ruleID: technology-usage-web-01000
+  ruleID: web-01000
   tag:
-  - View=JSF Page
-  - Web=JSF Page
-  - Java EE=JSF Page
+  - JSF
+  - Embedded technology - Java Server Faces
   when:
     builtin.filecontent:
       filePattern: .*\.(jsp|xhtml|jspx)
       pattern: (java\.sun\.com/jsf/)|(xmlns\.jcp\.org/jsf)
 - customVariables: []
+  description: Embedded technology - Java Server Pages
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01100
   tag:
-  - View=JSP Page
-  - Web=JSP Page
-  - Java EE=JSP Page
+  - JSP
+  - Embedded technology - Java Server Pages
   when:
     or:
     - builtin.filecontent:
@@ -29,27 +29,27 @@
         filePattern: .*\.(jsp|jspx|tag|tagx)
         pattern: <%@\s*taglib\s+[^>]*\s*uri\s*=\s*['"]([^'"]+)['"].*?%>
 - customVariables: []
+  description: Embedded technology - WebSocket
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01300
   tag:
-  - View=WebSocket
-  - Web=WebSocket
-  - Java EE=WebSocket
+  - WebSocket
+  - Embedded technology - WebSocket
   when:
     java.referenced:
       location: ANNOTATION
       pattern: javax.websocket.server.ServerEndpoint
 - customVariables: []
+  description: Embedded technology - Applet
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01400
   tag:
-  - View=Applet
-  - Rich=Applet
-  - Java EE=Applet
+  - Applet
+  - Embedded technology - Applet
   when:
     or:
     - java.referenced:
@@ -58,26 +58,26 @@
     - builtin.file:
         pattern: .*applet.*\.jar
 - customVariables: []
+  description: Embedded technology - JNLP
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01500
   tag:
-  - View=JNLP
-  - Rich=JNLP
-  - Java EE=JNLP
+  - JNLP
+  - Embedded technology - JNLP
   when:
     builtin.file:
       pattern: .*\.jnlp
 - customVariables: []
+  description: Embedded technology - JNLP
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01600
   tag:
-  - View=JNLP
-  - Rich=JNLP
-  - Embedded=JNLP
+  - JNLP
+  - Embedded technology - JNLP
   when:
     or:
     - builtin.file:
@@ -85,98 +85,98 @@
     - builtin.file:
         pattern: .*webstart.*\.jar
 - customVariables: []
+  description: Embedded technology - Swing
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01700
   tag:
-  - View=Swing
-  - Rich=Swing
-  - Embedded=Swing
+  - Swing
+  - Embedded technology - Swing
   when:
     builtin.file:
       pattern: .*swing.*\.jar
 - customVariables: []
+  description: Embedded technology - MiGLayout
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01800
   tag:
-  - View=MiGLayout
-  - Rich=MiGLayout
-  - Embedded=MiGLayout
+  - MiGLayout
+  - Embedded technology - MiGLayout
   when:
     builtin.file:
       pattern: .*miglayout.*\.jar
 - customVariables: []
+  description: Embedded technology - JGoodies
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-01900
   tag:
-  - View=JGoodies
-  - Rich=JGoodies
-  - Embedded=JGoodies
+  - JGoodies
+  - Embedded technology - JGoodies
   when:
     builtin.file:
       pattern: .*jgoodies.*\.jar
 - customVariables: []
+  description: Embedded technology - FormLayoutMaker
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-02000
   tag:
-  - View=FormLayoutMaker
-  - Rich=FormLayoutMaker
-  - Embedded=FormLayoutMaker
+  - FormLayoutMaker
+  - Embedded technology - FormLayoutMaker
   when:
     builtin.file:
       pattern: .*formlayoutmakerx.*\.jar
 - customVariables: []
+  description: Embedded technology - MagicGroupLayout
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-02100
   tag:
-  - View=Magicgrouplayout
-  - Rich=Magicgrouplayout
-  - Embedded=Magicgrouplayout
+  - Magicgrouplayout
+  - Embedded technology - MagicGroupLayout
   when:
     builtin.file:
       pattern: .*magicgrouplayout.*\.jar
 - customVariables: []
+  description: Embedded technology - Standard Widget Toolkit (SWT)
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-02200
   tag:
-  - View=Standard Widget Toolkit (SWT)
-  - Rich=Standard Widget Toolkit (SWT)
-  - Embedded=Standard Widget Toolkit (SWT)
+  - SWT
+  - Embedded technology - Standard Widget Toolkit (SWT)
   when:
     builtin.file:
       pattern: .*swt.*\.jar
 - customVariables: []
+  description: Embedded technology - JavaFX
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-02300
   tag:
-  - View=JavaFX
-  - Rich=JavaFX
-  - Embedded=JavaFX
+  - JavaFX
+  - Embedded technology - JavaFX
   when:
     builtin.file:
       pattern: .*javafx.*\.jar
 - customVariables: []
+  description: Embedded technology - Eclipse RCP
   labels:
   - konveyor.io/include=always
   links: []
   ruleID: technology-usage-web-02400
   tag:
-  - View=Eclipse RCP
-  - Rich=Eclipse RCP
-  - Embedded=Eclipse RCP
+  - Eclipse RCP
+  - Embedded technology - Eclipse RCP
   when:
     or:
     - builtin.file:
diff --git a/resources/rulesets/technology-usage/28-ejb-technology-usage.windup.yaml b/resources/rulesets/technology-usage/31-ejb-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/28-ejb-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/31-ejb-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/31-database-technology-usage.windup.yaml b/resources/rulesets/technology-usage/34-database-technology-usage.windup.yaml
similarity index 61%
rename from resources/rulesets/technology-usage/31-database-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/34-database-technology-usage.windup.yaml
index 32bed1e..ab295ed 100644
--- a/resources/rulesets/technology-usage/31-database-technology-usage.windup.yaml
+++ b/resources/rulesets/technology-usage/34-database-technology-usage.windup.yaml
@@ -1,3 +1,102 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-01000
+  tag:
+  - Store=JDBC datasources
+  - Database=JDBC datasources
+  - Java EE=JDBC datasources
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: javax.annotation.sql.DataSourceDefinition
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-01001
+  tag:
+  - Store=JDBC XA datasources
+  - Database=JDBC XA datasources
+  - Java EE=JDBC XA datasources
+  when:
+    java.referenced:
+      location: ANNOTATION
+      pattern: javax.annotation.sql.DataSourceDefinition
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-01100
+  tag:
+  - Store=JPA entities
+  - Persistence=JPA entities
+  - Java EE=JPA entities
+  when:
+    or:
+    - builtin.filecontent:
+        filePattern: .*\.xml
+        pattern: http://java.sun.com/xml/ns/persistence
+    - builtin.filecontent:
+        filePattern: .*\.xml
+        pattern: http://xmlns.jcp.org/xml/ns/persistence
+    - builtin.filecontent:
+        filePattern: .*\.xml
+        pattern: https://jakarta.ee/xml/ns/persistence
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-01200
+  tag:
+  - Store=JPA named queries
+  - Persistence=JPA named queries
+  - Java EE=JPA named queries
+  when:
+    or:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.persistence.Entity
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.persistence.Table
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.persistence.NamedQuery
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.persistence.NamedQueries
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.persistence.DiscriminatorValue
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.persistence.Entity
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.persistence.Table
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.persistence.NamedQuery
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.persistence.NamedQueries
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.persistence.DiscriminatorValue
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-01300
+  tag:
+  - Store=Persistence units
+  - Persistence=Persistence units
+  - Java EE=Persistence units
+  when:
+    builtin.file:
+      pattern: persistence\.xml
 - customVariables: []
   labels:
   - konveyor.io/include=always
@@ -194,7 +293,7 @@
   labels:
   - konveyor.io/include=always
   links: []
-  ruleID: technology-usage-database-03100
+  ruleID: technology-usage-database-03000
   tag:
   - Store=Apache Accumulo Client
   - Database Driver=Apache Accumulo Client
@@ -206,7 +305,7 @@
   labels:
   - konveyor.io/include=always
   links: []
-  ruleID: technology-usage-database-03200
+  ruleID: technology-usage-database-03100
   tag:
   - Store=Spring Data JPA
   - Persistence=Spring Data JPA
@@ -214,3 +313,15 @@
   when:
     builtin.hasTags:
     - Spring Data JPA
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-database-03200
+  tag:
+  - Store=MariaDB Driver
+  - Database Driver=MariaDB Driver
+  - Embedded=MariaDB Driver
+  when:
+    builtin.hasTags:
+    - MariaDB Driver
diff --git a/resources/rulesets/technology-usage/33-connect-technology-usage.windup.yaml b/resources/rulesets/technology-usage/36-connect-technology-usage.windup.yaml
similarity index 91%
rename from resources/rulesets/technology-usage/33-connect-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/36-connect-technology-usage.windup.yaml
index 1cae194..a9c96bb 100644
--- a/resources/rulesets/technology-usage/33-connect-technology-usage.windup.yaml
+++ b/resources/rulesets/technology-usage/36-connect-technology-usage.windup.yaml
@@ -1,3 +1,20 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-connect-01000
+  tag:
+  - Connect=RMI
+  - Other=RMI
+  - Java EE=RMI
+  when:
+    or:
+    - java.referenced:
+        location: ANNOTATION
+        pattern: javax.ws.rs.Path
+    - java.referenced:
+        location: ANNOTATION
+        pattern: jakarta.ws.rs.Path
 - customVariables: []
   labels:
   - konveyor.io/include=always
@@ -284,3 +301,15 @@
   when:
     builtin.hasTags:
     - Qpid Client
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-connect-02900
+  tag:
+  - Connect=Kafka Client
+  - Embedded=Kafka Client
+  - Streaming=Kafka Client
+  when:
+    builtin.hasTags:
+    - Kafka Client
diff --git a/resources/rulesets/technology-usage/35-configuration-management-technology-usage.windup.yaml b/resources/rulesets/technology-usage/38-configuration-management-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/35-configuration-management-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/38-configuration-management-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/37-clustering-technology-usage.windup.yaml b/resources/rulesets/technology-usage/40-clustering-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/37-clustering-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/40-clustering-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/42-apm-technology-usage.windup.yaml b/resources/rulesets/technology-usage/42-apm-technology-usage.windup.yaml
new file mode 100644
index 0000000..0014a04
--- /dev/null
+++ b/resources/rulesets/technology-usage/42-apm-technology-usage.windup.yaml
@@ -0,0 +1,48 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-apm-00010
+  tag:
+  - Sustain=Application Insights
+  - Observability=Application Insights
+  - Embedded=Application Insights
+  when:
+    builtin.hasTags:
+    - Application Insights
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-apm-00020
+  tag:
+  - Sustain=New Relic
+  - Observability=New Relic
+  - Embedded=New Relic
+  when:
+    builtin.hasTags:
+    - New Relic
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-apm-00030
+  tag:
+  - Sustain=Elastic APM
+  - Observability=Elastic APM
+  - Embedded=Elastic APM
+  when:
+    builtin.hasTags:
+    - Elastic APM
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-apm-00040
+  tag:
+  - Sustain=Dynatrace
+  - Observability=Dynatrace
+  - Embedded=Dynatrace
+  when:
+    builtin.hasTags:
+    - Dynatrace
diff --git a/resources/rulesets/technology-usage/39-3rd-party-technology-usage.windup.yaml b/resources/rulesets/technology-usage/44-3rd-party-technology-usage.windup.yaml
similarity index 100%
rename from resources/rulesets/technology-usage/39-3rd-party-technology-usage.windup.yaml
rename to resources/rulesets/technology-usage/44-3rd-party-technology-usage.windup.yaml
diff --git a/resources/rulesets/technology-usage/46-3rd-party-spring-technology-usage.windup.yaml b/resources/rulesets/technology-usage/46-3rd-party-spring-technology-usage.windup.yaml
new file mode 100644
index 0000000..8c02ea1
--- /dev/null
+++ b/resources/rulesets/technology-usage/46-3rd-party-spring-technology-usage.windup.yaml
@@ -0,0 +1,48 @@
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-3rd-party-spring-03001-0
+  tag:
+  - Sustain=Spring Boot Configuration
+  - Embedded=Spring Boot Configuration
+  - Configuration Management=Spring Boot Configuration
+  when:
+    builtin.hasTags:
+    - Spring Boot Configuration
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-3rd-party-spring-03001-1
+  tag:
+  - Sustain=Spring Boot Auto-configuration
+  - Embedded=Spring Boot Auto-configuration
+  - Configuration Management=Spring Boot Auto-configuration
+  when:
+    builtin.hasTags:
+    - Spring Boot Auto-configuration
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-3rd-party-spring-03001-2
+  tag:
+  - Sustain=Spring Boot Component Scan
+  - Embedded=Spring Boot Component Scan
+  - Configuration Management=Spring Boot Component Scan
+  when:
+    builtin.hasTags:
+    - Spring Boot Component Scan
+- customVariables: []
+  labels:
+  - konveyor.io/include=always
+  links: []
+  ruleID: technology-usage-3rd-party-spring-03002
+  tag:
+  - Execute=Spring Deployable War
+  - Embedded=Spring Deployable War
+  - 3rd party=Spring Deployable War
+  when:
+    builtin.hasTags:
+    - Spring Deployable War