From 0e5574954daadb5cef4af914c5c6b23f5fa138b3 Mon Sep 17 00:00:00 2001
From: kthatipally <99229993+kthatipally@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:30:09 -0500
Subject: [PATCH 1/3] Fix embedded-cache-libraries rule and test

---
 .../technology-usage/embedded-cache-libraries.windup.xml      | 4 +---
 .../tests/embedded-cache-libraries.windup.test.xml            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rules/rules-reviewed/technology-usage/embedded-cache-libraries.windup.xml b/rules/rules-reviewed/technology-usage/embedded-cache-libraries.windup.xml
index aee689f8..b1fdebe2 100644
--- a/rules/rules-reviewed/technology-usage/embedded-cache-libraries.windup.xml
+++ b/rules/rules-reviewed/technology-usage/embedded-cache-libraries.windup.xml
@@ -13,9 +13,7 @@
     <rules>
         <rule id="embedded-cache-libraries-01000">
             <when>
-                <graph-query discriminator="JarArchiveModel">
-                    <property name="fileName" searchType="regex">.*ehcache.*\.jar$</property>
-                </graph-query>
+                <file filename="{*}ehcache{*}.jar"/>
             </when>
             <perform>
                 <hint title="EHCache library" category-id="potential" effort="5">
diff --git a/rules/rules-reviewed/technology-usage/tests/embedded-cache-libraries.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/embedded-cache-libraries.windup.test.xml
index f0b7794c..cca648ef 100644
--- a/rules/rules-reviewed/technology-usage/tests/embedded-cache-libraries.windup.test.xml
+++ b/rules/rules-reviewed/technology-usage/tests/embedded-cache-libraries.windup.test.xml
@@ -9,7 +9,7 @@
                 <when>
                     <not>
                         <iterable-filter size="1">
-                         <hint-exists message="The application embeds an Ehcache library" />
+                            <hint-exists message="The application uses EHCache" />
                         </iterable-filter>
                     </not>
                 </when>

From 08f11e255babd6f5e523bc5ff766e452afc727c4 Mon Sep 17 00:00:00 2001
From: kthatipally <99229993+kthatipally@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:32:10 -0500
Subject: [PATCH 2/3] Fix web-technology-usage test

---
 .../technology-usage/tests/web-technology-usage.windup.test.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml
index 480e5bd3..9658693f 100644
--- a/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml
+++ b/rules/rules-reviewed/technology-usage/tests/web-technology-usage.windup.test.xml
@@ -93,7 +93,7 @@
             <rule id="technology-usage-web-01700-test">
                <when>
                   <not>
-                     <technology-statistics-exists name="Swing" number-found="1">
+                     <technology-statistics-exists name="Swing" number-found="2">
                         <tag name="View"/>
                         <tag name="Rich"/>
                         <tag name="Embedded"/>

From b6f9c1502ef1c5461cc8d52e7d08cf1501b68895 Mon Sep 17 00:00:00 2001
From: kthatipally <99229993+kthatipally@users.noreply.github.com>
Date: Mon, 28 Oct 2024 21:34:52 -0500
Subject: [PATCH 3/3] Fix configuration-management-test and
 configuration-management-technology-usage-test

---
 .../configuration-management-technology-usage.windup.test.xml | 2 +-
 .../tests/configuration-management.windup.test.xml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/rules-reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml
index 70f1f14c..998ca545 100644
--- a/rules/rules-reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml
+++ b/rules/rules-reviewed/technology-usage/tests/configuration-management-technology-usage.windup.test.xml
@@ -14,7 +14,7 @@
          <rule id="configuration-management-technology-usage-0100-test">
             <when>
                <not>
-                  <technology-statistics-exists name="Spring Cloud Config" number-found="3">
+                  <technology-statistics-exists name="Spring Cloud Config" number-found="4">
                      <tag name="Sustain"/>
                      <tag name="Configuration Management"/>
                      <tag name="Embedded"/>
diff --git a/rules/rules-reviewed/technology-usage/tests/configuration-management.windup.test.xml b/rules/rules-reviewed/technology-usage/tests/configuration-management.windup.test.xml
index cf5f18fd..e756365e 100644
--- a/rules/rules-reviewed/technology-usage/tests/configuration-management.windup.test.xml
+++ b/rules/rules-reviewed/technology-usage/tests/configuration-management.windup.test.xml
@@ -12,8 +12,8 @@
          <rule id="configuration-management-0100-test">
             <when>
                <not>
-                  <iterable-filter size="3">
-                        <hint-exists message="The application embeds Spring Cloud" />
+                  <iterable-filter size="4">
+                        <hint-exists message="The application embeds Spring Cloud Config" />
                   </iterable-filter>
                   <technology-tag-exists technology-tag="Spring Cloud Config"/>
                </not>