WINDUPRULE-983 Update versions of SpringBoot supported by RHR (#934)

windup · May 2, 2023 · 9806de1 · 9806de1
1 parent 883d31a
commit 9806de1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/...iewed/rhr/springboot/springboot.rhamt.xml → ...d/rhr/springboot/springboot-rhr.rhamt.xml b/...iewed/rhr/springboot/springboot.rhamt.xml → ...d/rhr/springboot/springboot-rhr.rhamt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset id="springboot" xmlns="http://windup.jboss.org/schema/jboss-ruleset"
+<ruleset id="springboot-rhr" xmlns="http://windup.jboss.org/schema/jboss-ruleset"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
     <metadata>
@@ -16,7 +16,7 @@
         <targetTechnology id="rhr"/>
     </metadata>
     <rules>
-        <rule id="springboot-00001">
+        <rule id="springboot-rhr-00001">
             <!-- rule condition, when it could be fired -->
             <when>
                 <dependency groupId="org.springframework.boot" artifactId="{*}" toVersion="2.2.5.RELEASE" />
@@ -29,7 +29,7 @@
                 </hint>
             </perform>
         </rule>
-        <rule id="springboot-00002">
+        <rule id="springboot-rhr-00002">
             <!-- rule condition, when it could be fired -->
             <when>
                 <or>
@@ -42,7 +42,7 @@
                     <dependency groupId="org.springframework.boot" artifactId="{*}" fromVersion="2.5.11"         toVersion="2.5.11" />
                     <dependency groupId="org.springframework.boot" artifactId="{*}" fromVersion="2.5.13"         toVersion="2.7.1" />
                     <dependency groupId="org.springframework.boot" artifactId="{*}" fromVersion="2.7.3"          toVersion="2.7.7" />
-                    <dependency groupId="org.springframework.boot" artifactId="{*}" fromVersion="2.7.9" />
+                    <dependency groupId="org.springframework.boot" artifactId="{*}" fromVersion="3.0.0" />
                 </or>
             </when>
             <!-- rule operation, what to do if it is fired -->

diff --git a/...-reviewed/rhr/springboot/tests/.windup/cache/nexus-indexer-data/test.archive-metadata.txt b/...-reviewed/rhr/springboot/tests/.windup/cache/nexus-indexer-data/test.archive-metadata.txt
@@ -30,3 +30,4 @@ c183297ff6406cb3d1c6f4094ee8124ac5899154 org.keycloak:keycloak-spring-boot-start
 5268808f2a7428bd1f77500297379bb0e224be50 io.opentracing.contrib:opentracing-spring-jaeger-web-starter:0.2.2
 3165dc304b50b606ecc31bdb7ea3cc224c5d4f03 org.jboss.resteasy:resteasy-spring-boot-starter:2.0.0.Final
 8be4bbd647972d110e9996239394f07a9125dc7d org.springframework.boot:spring-boot-jarmode-layertools:2.7.9
+e69c0d1a40289103d1788a2419ce8cd9a66f8327 org.springframework.boot:spring-boot-starter-web:3.0.0
diff --git a/rules/rules-reviewed/rhr/springboot/tests/data/spring-boot-starter-web-3.0.0.jar b/rules/rules-reviewed/rhr/springboot/tests/data/spring-boot-starter-web-3.0.0.jar
diff --git a/...pringboot/tests/springboot.rhamt.test.xml → ...gboot/tests/springboot-rhr.rhamt.test.xml b/...pringboot/tests/springboot.rhamt.test.xml → ...gboot/tests/springboot-rhr.rhamt.test.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
-<ruletest id="springboot-test"
+<ruletest id="springboot-rhr-test"
           xmlns="http://windup.jboss.org/schema/jboss-ruleset"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
     <testDataPath>data</testDataPath>
-    <rulePath>../springboot.rhamt.xml</rulePath>
+    <rulePath>../springboot-rhr.rhamt.xml</rulePath>
     <ruleset>
         <rules>
-            <rule id="springboot-00001-test">
+            <rule id="springboot-rhr-00001-test">
                 <when>
                     <not>
                         <iterable-filter size="18">
@@ -15,10 +15,10 @@
                     </not>
                 </when>
                 <perform>
-                    <fail message="[springboot-00001] Spring Boot update to v2.0 pre-migration hint was not found!" />
+                    <fail message="[springboot-rhr-00001] Spring Boot update to v2.0 pre-migration hint was not found!" />
                 </perform>
             </rule>
-            <rule id="springboot-00002-test">
+            <rule id="springboot-rhr-00002-test">
                 <when>
                     <not>
                         <iterable-filter size="4">
@@ -27,7 +27,7 @@
                     </not>
                 </when>
                 <perform>
-                    <fail message="[springboot-00002] Spring Boot update for RHR support hint was not found!" />
+                    <fail message="[springboot-rhr-00002] Spring Boot update for RHR support hint was not found!" />
                 </perform>
             </rule>
         </rules>