Update junit5 monorepo {patch} (minor) (#787)

* Update junit5 monorepo {patch} Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Updating dependency checksums {patch} (#791) Signed-off-by: Esta Nagy <[email protected]> * Fix failing build - Uses the store of the test instance to save the stopwatch in Jupiter {patch} Signed-off-by: Esta Nagy <[email protected]> --------- Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Signed-off-by: Esta Nagy <[email protected]> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Esta Nagy <[email protected]>
nagyesta · Aug 14, 2024 · 2253f09 · 2253f09
1 parent 3a186ac
commit 2253f09
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 21 deletions.
diff --git a/...ava/com/github/nagyesta/abortmission/booster/jupiter/extension/AbortMissionExtension.java b/...ava/com/github/nagyesta/abortmission/booster/jupiter/extension/AbortMissionExtension.java
@@ -174,17 +174,25 @@ private Set<MissionHealthCheckEvaluator> findEvaluators(final Class<?> testClass
     }
 
     private Optional<StageTimeStopwatch> optionalStopwatch(final ExtensionContext context, final String key) {
-        return Optional.ofNullable(context.getStore(NAMESPACE).getOrDefault(key, StageTimeStopwatch.class, null));
+        return Optional.ofNullable(getTestInstanceContext(context).getStore(NAMESPACE).getOrDefault(key, StageTimeStopwatch.class, null));
     }
 
     @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
     private void putOptionalStopwatch(final ExtensionContext context, final Optional<StageTimeStopwatch> stopwatch, final String key) {
         LOGGER.trace("Storing stopwatch for key: {} with launchId: {}",
                 key, stopwatch.map(StageTimeStopwatch::getLaunchId).orElse(null));
         if (stopwatch.isPresent()) {
-            context.getStore(NAMESPACE).put(key, stopwatch.get());
+            getTestInstanceContext(context).getStore(NAMESPACE).put(key, stopwatch.get());
         } else {
-            context.getStore(NAMESPACE).remove(key);
+            getTestInstanceContext(context).getStore(NAMESPACE).remove(key);
         }
     }
+
+    private ExtensionContext getTestInstanceContext(final ExtensionContext context) {
+        ExtensionContext result = context;
+        if (context.getTestMethod().isPresent() && context.getParent().isPresent()) {
+            result = context.getParent().get();
+        }
+        return result;
+    }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,8 +15,8 @@ lombok = "1.18.34"
 findbugs = "3.0.2"
 
 junit4 = "4.13.2"
-jupiter = "5.10.3"
-jupiterPlatform = "1.10.3"
+jupiter = "5.11.0"
+jupiterPlatform = "1.11.0"
 mockitoCore = "5.12.0"
 cucumber = "7.18.1"
 testNg = "7.10.2"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -1241,6 +1241,14 @@
             <sha256 value="d5639f8fe27cead33e6a4c789fad8e65f328f62bb79dad2bdd7ae6cc93b9454c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.bytebuddy" name="byte-buddy" version="1.14.18">
+         <artifact name="byte-buddy-1.14.18.jar">
+            <sha256 value="52117af1696a53aa77c131353074ada25ccbdf2df511f2af33fad6704fa95104" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="byte-buddy-1.14.18.pom">
+            <sha256 value="22fb19078fe70648ab60549266c7146996847226aa6e6f7e88fecc0814724939" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.bytebuddy" name="byte-buddy-agent" version="1.14.12">
          <artifact name="byte-buddy-agent-1.14.12.jar">
             <sha256 value="2b309a9300092e0b696f7c471fd51d9969001df784c8ab9f07997437d757ad6d" origin="Generated by Gradle"/>
@@ -1272,6 +1280,11 @@
             <sha256 value="26eaef08651ffa58ba290092ce3281782e29c0628a1b79fa5a3784f908b418ac" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.bytebuddy" name="byte-buddy-parent" version="1.14.18">
+         <artifact name="byte-buddy-parent-1.14.18.pom">
+            <sha256 value="769c5d0b1115e73f68452bbaaa356bad9b737d5fe07b83d4c9e483975b81fe3c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.gpedro.integrations.slack" name="slack-webhook" version="1.4.0">
          <artifact name="slack-webhook-1.4.0.jar">
             <sha256 value="b9a660e20beab43392847d922c13045c5319eccabf4292b96ff91a74ee8d9865" origin="Generated by Gradle"/>
@@ -2111,6 +2124,14 @@
             <sha256 value="3917230eaa33bcf13ea33dd337acafa9d326c739660bf4b6fc56c88d78feb9f2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.assertj" name="assertj-core" version="3.26.3">
+         <artifact name="assertj-core-3.26.3.jar">
+            <sha256 value="4c2f86418ff47ee6b67fbc6adb194e80219b793281b3bda28799d4425bc9a0bd" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="assertj-core-3.26.3.pom">
+            <sha256 value="7d75c510abbb7dcb91fb35ce2f1406e8000ffab9ee18faa9aadf315f19738166" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.attoparser" name="attoparser" version="2.0.7.RELEASE">
          <artifact name="attoparser-2.0.7.RELEASE.jar">
             <sha256 value="75dd1c045492bff8e1963aabb28bfe903c2064e11e27fe2f0f0aff1ad3d84476" origin="Generated by Gradle"/>
@@ -2545,6 +2566,11 @@
             <sha256 value="10937d44c425984cb8739225d34712e1a3145641ca93ac3f7ef186fa25f6babc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit" name="junit-bom" version="5.11.0">
+         <artifact name="junit-bom-5.11.0.pom">
+            <sha256 value="e67459d4882424ac6374f40db1c8f4a2e88946b340ba072c80be932a2be4644d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit" name="junit-bom" version="5.11.0-M1">
          <artifact name="junit-bom-5.11.0-M1.pom">
             <sha256 value="b50975f5cba86204abda3dcd6f097af919fe22e21ef69478dd6b919f6c740d85" origin="Generated by Gradle"/>
@@ -2573,6 +2599,14 @@
             <sha256 value="25dec082f02467cd62290ef1389bf4b2686ef5054a1a8eddfb1b5b7d54de1991" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.11.0">
+         <artifact name="junit-jupiter-5.11.0.jar">
+            <sha256 value="234fe3f9118628d6de625ecc3d69140515e786fdf3cef037fc6ec94823c23ab6" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-5.11.0.pom">
+            <sha256 value="be9b264be85150eab63c9d111c7a130f5d6beb5c145a34ae3ed64ad48d0f07a9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.10.3">
          <artifact name="junit-jupiter-api-5.10.3.jar">
             <sha256 value="6efe6e01ca1ff79b7bf4c6f1eed0b29292e166c27eaf7b00ac981a14d4de61aa" origin="Generated by Gradle"/>
@@ -2581,6 +2615,14 @@
             <sha256 value="734a1c68c34c5adf3bd2f5bca4bf498cbb4f49c489d7c24d80cf0e2102be6f14" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.11.0">
+         <artifact name="junit-jupiter-api-5.11.0.jar">
+            <sha256 value="42aa202fc862f76cc5af65b47b1c0b1961cdd79cd2216405a6dfa2bd20b20974" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-api-5.11.0.pom">
+            <sha256 value="7139a03f4985ac9a18cfa894c981e499f0e4c3720519368ca264ea8647364ded" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.10.3">
          <artifact name="junit-jupiter-engine-5.10.3.jar">
             <sha256 value="bbd3ce8dc11e9925071ef9691d68af1ab6e712faa6851f7c5275bc8aafc88673" origin="Generated by Gradle"/>
@@ -2589,6 +2631,14 @@
             <sha256 value="83ef0fd68b60bf6bc79a78feb11882c625c482ef69d62bfe2d117040a6448144" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.11.0">
+         <artifact name="junit-jupiter-engine-5.11.0.jar">
+            <sha256 value="7012423383d0c79d0347c5cf2bd1996c30a12240fb729e0cdfa954852ec693cc" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-engine-5.11.0.pom">
+            <sha256 value="c2234a67feb0c6fea91656c6e68bd269e246a253748c4f8d050c938fe30a9fc0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.10.3">
          <artifact name="junit-jupiter-params-5.10.3.jar">
             <sha256 value="7c3ed8cefb12496b76c53c3da986ea8f0bf3f426781869475551ae3a506c1ad8" origin="Generated by Gradle"/>
@@ -2597,6 +2647,14 @@
             <sha256 value="6cd9df906a62fe64cc301c3d600797f624dbd4225f7fa505a5a8edb31ff98906" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.11.0">
+         <artifact name="junit-jupiter-params-5.11.0.jar">
+            <sha256 value="92ccae2d72e8cc7ac4d3a912fd1a8fecc5e3040a62ac6c667a07a6f55b8023eb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-jupiter-params-5.11.0.pom">
+            <sha256 value="cfc48da9d25aa8f84625939ef89687d335059225674f16a0fc543357e2d15381" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.10.3">
          <artifact name="junit-platform-commons-1.10.3.jar">
             <sha256 value="9787f04d49db59397cdd7555d421a5bd2d1445666997d327b94f85e38bed57f1" origin="Generated by Gradle"/>
@@ -2605,6 +2663,14 @@
             <sha256 value="7597572c59f1975262f8d8fcf88ec6783376854bf08ce8a93d99dbdc89ee43f9" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.11.0">
+         <artifact name="junit-platform-commons-1.11.0.jar">
+            <sha256 value="609333a4545f9018eb0c59071efd30663a9e9fdce528121b65a04c27e5fc26a7" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-commons-1.11.0.pom">
+            <sha256 value="0c9fdc50e5c64f42e1179faaf9a605457389a82ebfe8087dbacd4a82095fd0b1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.10.3">
          <artifact name="junit-platform-engine-1.10.3.jar">
             <sha256 value="df7c32bf75cf47c4c8ddd1942091027947a7d765d30b731fe00830115fafa133" origin="Generated by Gradle"/>
@@ -2613,30 +2679,38 @@
             <sha256 value="6f9b99bca0c17ddc19f51bc037e3b17cab0fc7e6f1da70387a30ab4e05207228" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-launcher" version="1.10.3">
-         <artifact name="junit-platform-launcher-1.10.3.jar">
-            <sha256 value="deaeede2f011eaf94f5bc681e04eee2f4a0f6d69771e1a79aa950d898b405d8d" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.11.0">
+         <artifact name="junit-platform-engine-1.11.0.jar">
+            <sha256 value="a7e67279c651c516949512b506916475a6d9e284cd4f4c30d029b4ad73a944d8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="junit-platform-engine-1.11.0.pom">
+            <sha256 value="b8bd7cbe26993105104a1a348cbdd17ea99c7b06f87c9738f7bd6f5bb7bf6cf2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.11.0">
+         <artifact name="junit-platform-launcher-1.11.0.jar">
+            <sha256 value="a44535e639814236844e2247204f89247d13af0cebdea53a42314100dfde19ce" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="junit-platform-launcher-1.10.3.pom">
-            <sha256 value="70134cb9fc0727562065d5fe7da58f105e4a1c7877e899d49149b5d3f8fd6d17" origin="Generated by Gradle"/>
+         <artifact name="junit-platform-launcher-1.11.0.pom">
+            <sha256 value="4b39882a579bdf5e99ed3c920017147671b8eceb13de5690951fe1c7cbc1a5df" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-reporting" version="1.10.3">
-         <artifact name="junit-platform-reporting-1.10.3.jar">
-            <sha256 value="04e12038995ed4a72579cdc3f25337c97e46e1a09d10b5114fabb602d917e8dd" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-reporting" version="1.11.0">
+         <artifact name="junit-platform-reporting-1.11.0.jar">
+            <sha256 value="e46b5a6420dfd25d7c18ab0c0d1cc0616fc5e057949bb877a847c8afbfa64cd6" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="junit-platform-reporting-1.10.3.pom">
-            <sha256 value="4c64bb8c693b378a104eea4fe6a62c1c8aa74e2a743773c0bb88bd5d92003c7a" origin="Generated by Gradle"/>
+         <artifact name="junit-platform-reporting-1.11.0.pom">
+            <sha256 value="9b6364abb7b05afea3f3085c841bb4f8653e1c869e3be9c8a7f98acc47cc2efb" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-testkit" version="1.10.3">
-         <artifact name="junit-platform-testkit-1.10.3.jar">
-            <sha256 value="82b65de37f94e2405e0f8a7105e06f840e0e3cb7ebea0378948a1ec3e07f3667" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-testkit" version="1.11.0">
+         <artifact name="junit-platform-testkit-1.11.0.jar">
+            <sha256 value="a4e881e13053097c01d8e5d191dbe8db903b3acf84481fce8e6bcbdae2334afc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.vintage" name="junit-vintage-engine" version="5.10.3">
-         <artifact name="junit-vintage-engine-5.10.3.jar">
-            <sha256 value="d60288d3e850ba9f2af4701203a5171ef30634efd34da40ab47facebd2c65d6c" origin="Generated by Gradle"/>
+      <component group="org.junit.vintage" name="junit-vintage-engine" version="5.11.0">
+         <artifact name="junit-vintage-engine-5.11.0.jar">
+            <sha256 value="ce50ffc70b37fbbd4b9c84fb132bf1b004475ed6af45121499a750fae85a6a60" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.mockito" name="mockito-bom" version="4.11.0">