Rebase on main

bazel-contrib · Nov 7, 2023 · bdaea57 · bdaea57
1 parent 430bb3f
commit bdaea57
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 23 deletions.
diff --git a/contrib_rules_jvm_tests_install.json b/contrib_rules_jvm_tests_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": 1426844574,
-  "__RESOLVED_ARTIFACTS_HASH": -1215151708,
+  "__INPUT_ARTIFACTS_HASH": -579211453,
+  "__RESOLVED_ARTIFACTS_HASH": -1476897549,
   "artifacts": {
     "junit:junit": {
       "shasums": {
@@ -87,6 +87,34 @@
       },
       "version": "1.8.2"
     },
+    "org.junit.platform:junit-platform-suite": {
+      "shasums": {
+        "jar": "31e6b625c870941fd5d57789d7d4eead0ad3e1fc1d64c54c82aa24de2b259b3e",
+        "sources": "73308a5b8ed6f4cb15020baf41f8f226e141d1fd9dc99a2dc4fa2b3d1a616e98"
+      },
+      "version": "1.8.2"
+    },
+    "org.junit.platform:junit-platform-suite-api": {
+      "shasums": {
+        "jar": "94ef343b05b875bb2e4ef94a7cc62e610e1b9cd78247e2b2ec43ed618a1ed0a7",
+        "sources": "53ce9bde5e3222355fa8deb17cb568629827ccedf57efce07ba1077e79feaaa0"
+      },
+      "version": "1.8.2"
+    },
+    "org.junit.platform:junit-platform-suite-commons": {
+      "shasums": {
+        "jar": "7f690bc34916796ef0b84b6d63c9b3892d6f9d2e89b6ee774039771a08b159c4",
+        "sources": "eb7216b81dbdc24c633544c385f0d80e128e5339898e8c037046e87feb3780cd"
+      },
+      "version": "1.8.2"
+    },
+    "org.junit.platform:junit-platform-suite-engine": {
+      "shasums": {
+        "jar": "69c81182c532024ffcceef6d8c0c98a49b555216d0ea65c7f45977185c4d7fdb",
+        "sources": "b075b0ecd1755fee39ca01e136aac11b38d44c0a741e95eb63b8a0ec6b680960"
+      },
+      "version": "1.8.2"
+    },
     "org.junit.vintage:junit-vintage-engine": {
       "shasums": {
         "jar": "ebd567b84e380d5373c47de3c9616d84f7bef91f9f8a8e7fc925be68240c1ba4",
@@ -150,6 +178,26 @@
       "org.apiguardian:apiguardian-api",
       "org.junit.platform:junit-platform-launcher"
     ],
+    "org.junit.platform:junit-platform-suite": [
+      "org.junit.platform:junit-platform-suite-api",
+      "org.junit.platform:junit-platform-suite-engine"
+    ],
+    "org.junit.platform:junit-platform-suite-api": [
+      "org.apiguardian:apiguardian-api",
+      "org.junit.platform:junit-platform-commons"
+    ],
+    "org.junit.platform:junit-platform-suite-commons": [
+      "org.apiguardian:apiguardian-api",
+      "org.junit.platform:junit-platform-engine",
+      "org.junit.platform:junit-platform-launcher",
+      "org.junit.platform:junit-platform-suite-api"
+    ],
+    "org.junit.platform:junit-platform-suite-engine": [
+      "org.apiguardian:apiguardian-api",
+      "org.junit.platform:junit-platform-engine",
+      "org.junit.platform:junit-platform-suite-api",
+      "org.junit.platform:junit-platform-suite-commons"
+    ],
     "org.junit.vintage:junit-vintage-engine": [
       "junit:junit",
       "org.apiguardian:apiguardian-api",
@@ -323,6 +371,15 @@
       "org.junit.platform.reporting.legacy",
       "org.junit.platform.reporting.legacy.xml"
     ],
+    "org.junit.platform:junit-platform-suite-api": [
+      "org.junit.platform.suite.api"
+    ],
+    "org.junit.platform:junit-platform-suite-commons": [
+      "org.junit.platform.suite.commons"
+    ],
+    "org.junit.platform:junit-platform-suite-engine": [
+      "org.junit.platform.suite.engine"
+    ],
     "org.junit.vintage:junit-vintage-engine": [
       "org.junit.vintage.engine",
       "org.junit.vintage.engine.descriptor",
@@ -438,6 +495,14 @@
       "org.junit.platform:junit-platform-launcher:jar:sources",
       "org.junit.platform:junit-platform-reporting",
       "org.junit.platform:junit-platform-reporting:jar:sources",
+      "org.junit.platform:junit-platform-suite",
+      "org.junit.platform:junit-platform-suite-api",
+      "org.junit.platform:junit-platform-suite-api:jar:sources",
+      "org.junit.platform:junit-platform-suite-commons",
+      "org.junit.platform:junit-platform-suite-commons:jar:sources",
+      "org.junit.platform:junit-platform-suite-engine",
+      "org.junit.platform:junit-platform-suite-engine:jar:sources",
+      "org.junit.platform:junit-platform-suite:jar:sources",
       "org.junit.vintage:junit-vintage-engine",
       "org.junit.vintage:junit-vintage-engine:jar:sources",
       "org.mockito:mockito-core",

diff --git a/frozen_deps_install.json b/frozen_deps_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -568385146,
-  "__RESOLVED_ARTIFACTS_HASH": -529316539,
+  "__INPUT_ARTIFACTS_HASH": 1400433093,
+  "__RESOLVED_ARTIFACTS_HASH": -608433237,
   "conflict_resolution": {
     "com.google.errorprone:error_prone_annotations:2.11.0": "com.google.errorprone:error_prone_annotations:2.18.0",
     "com.google.guava:guava:30.1.1-jre": "com.google.guava:guava:31.1-jre",
@@ -752,52 +752,52 @@
     },
     "org.junit.jupiter:junit-jupiter-api": {
       "shasums": {
-        "jar": "ce3374a7efba605e2d2b69a3fef90134032bab3ecc3ed8579a4871b1c2c4729c",
-        "sources": "e21e2f0ba66f786619420fb6d274b28ca7b5e62cc108fb7c034c4d7a4efb162f"
+        "jar": "1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801",
+        "sources": "cb38569ae9005eb54c7cbc181b842e6eb01be57ae0d785f9167d9e019b44a670"
       },
-      "version": "5.8.1"
+      "version": "5.8.2"
     },
     "org.junit.jupiter:junit-jupiter-engine": {
       "shasums": {
-        "jar": "4689bc902255a19fe98277683ba3231c094d107c54c8d35f2b6f9c97d226418e",
+        "jar": "753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e",
         "sources": "9ed4edf417cbc6028c634a0b407061433327c9ef4235fca35b9183da855e2e8f"
       },
-      "version": "5.8.1"
+      "version": "5.8.2"
     },
     "org.junit.platform:junit-platform-commons": {
       "shasums": {
-        "jar": "fa4fa68c8bd54dd0cb49c3fcbe9b2e42f4da6bedbe7e7ccf2a05f1a1e609b593",
+        "jar": "d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050",
         "sources": "7ae3683c452ee4259b2d205d56c7172fd178180b02d20b4430368ef6ee501c3b"
       },
-      "version": "1.8.1"
+      "version": "1.8.2"
     },
     "org.junit.platform:junit-platform-engine": {
       "shasums": {
-        "jar": "702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047",
-        "sources": "f9139af4f7efb614457e941614762a486891489b2832300a2925fb90f2ad4648"
+        "jar": "0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59",
+        "sources": "4cfda26b1dc0812fcf0a14b0bb5612b7c697e50afd79819d2e07b1faef9c239b"
       },
-      "version": "1.8.1"
+      "version": "1.8.2"
     },
     "org.junit.platform:junit-platform-launcher": {
       "shasums": {
-        "jar": "83a9ed68adcb76e60316a4d682fc48507865df2f0ab35f82695cc9995410e05e",
-        "sources": "635113abe0af42fd925d4bad1756c7f612d3567aa94fa9b799d5064870e4bb5b"
+        "jar": "822156409fd83e682e4c5199b3460054299b538a058c2c6d0f5c9b6a5bdb7594",
+        "sources": "ee8440e84c23e52519b57e77a30627f80d91ac148244162ee2eea1ba809c1bdc"
       },
-      "version": "1.8.1"
+      "version": "1.8.2"
     },
     "org.junit.platform:junit-platform-reporting": {
       "shasums": {
-        "jar": "d35ff7484c35d5700cdfb2b242665d3d1d3071372232d9a6babc5b670bfbd9e9",
+        "jar": "d28048333b378d166f9ad38c2a8e34ac0fa1a29cc016cb279df53c8b54628fc3",
         "sources": "489df906d84675ba6d078e076a5ffd8c8feec62e390539d6d61938de98b269f4"
       },
-      "version": "1.8.1"
+      "version": "1.8.2"
     },
     "org.junit.vintage:junit-vintage-engine": {
       "shasums": {
-        "jar": "176b53cd1bdbf9233e96c8b0c7a9e5b864282fbbdeba43b5ceafdedb29a49156",
+        "jar": "ebd567b84e380d5373c47de3c9616d84f7bef91f9f8a8e7fc925be68240c1ba4",
         "sources": "f2873fcb606ad338934d11d7e7d005e7c08b373bf09c886f9b9d03d21423d63d"
       },
-      "version": "5.8.1"
+      "version": "5.8.2"
     },
     "org.opentest4j:opentest4j": {
       "shasums": {

diff --git a/java/private/contrib_rules_jvm_deps.zip b/java/private/contrib_rules_jvm_deps.zip
diff --git a/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOuputListenerTest.java b/java/test/com/github/bazel_contrib/contrib_rules_jvm/junit5/BazelJUnitOuputListenerTest.java
@@ -224,8 +224,7 @@ private Document generateTestXml(TestPlan testPlan, TestData testCase) {
 
   private Document generateTestXml(
       TestPlan testPlan, TestData suite, Collection<TestData> testCases) {
-    return generateDocument(
-        xml -> new TestSuiteXmlRenderer(testPlan).toXml(xml, suite, testCases));
+    return generateDocument(xml -> new TestSuiteXmlRenderer(testPlan).toXml(xml, suite, testCases));
   }
 
   private Document generateDocument(XmlGenerator renderer) {