Skip to content

Commit 8c8590b

Browse files
gabizougabizou
committed
chore(git): merge upstream api-18 into update/26.1
2 parents 5d08674 + 5686ae7 commit 8c8590b

File tree

2 files changed

+153
-2
lines changed

2 files changed

+153
-2
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
format = { version = "1.1" }
33

44
[versions]
5-
adventure = "4.24.0"
5+
adventure = "4.26.1"
66
caffeine = "3.1.8"
77
checker = "3.42.0"
88
checkstyle = "10.12.7"
@@ -13,7 +13,7 @@ guice = "5.0.1"
1313
ideaExt = "1.1.8"
1414
indra = "3.1.3"
1515
junit = "5.13.4"
16-
log4j = "2.22.1"
16+
log4j = "2.25.2"
1717
math = "2.0.1"
1818
mockito = "5.21.0"
1919
pluginSpi = "0.4.0"

‎gradle/verification-metadata.xml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<trusted-artifacts>
77
<trust file=".*-javadoc[.]jar" regex="true"/>
88
<trust file=".*-sources[.]jar" regex="true"/>
9+
<trust file=".*[.]pom" regex="true"/>
10+
<trust file=".*[.]module" regex="true"/>
911
</trusted-artifacts>
1012
</configuration>
1113
<components>
@@ -17,6 +19,14 @@
1719
<sha256 value="26e82330157d6b844b67a8064945e206581e772977183e3e31fec6058aa9a59b" origin="Generated by Gradle"/>
1820
</artifact>
1921
</component>
22+
<component group="biz.aQute.bnd" name="biz.aQute.bnd.annotation" version="7.1.0">
23+
<artifact name="biz.aQute.bnd.annotation-7.1.0.jar">
24+
<sha256 value="f69c2de3a695c113d125ac8053c92a680a3ce9d02ea25845095cf2d4626a7663" origin="Generated by Gradle"/>
25+
</artifact>
26+
<artifact name="biz.aQute.bnd.annotation-7.1.0.pom">
27+
<sha256 value="5822df49183df922ba59ae773a2d8cceb86ae1e20f41f19873131dd182494f7a" origin="Generated by Gradle"/>
28+
</artifact>
29+
</component>
2030
<component group="com.diffplug.durian" name="durian-collect" version="1.2.0">
2131
<artifact name="durian-collect-1.2.0.jar">
2232
<sha256 value="b194c0b88021cc116c21c1dc76f49c2c1fe175af5bcb74c8ba67b9dbbf9a48cc" origin="Generated by Gradle"/>
@@ -159,6 +169,14 @@
159169
<sha256 value="ed971f009354e68c09414c964fbe1a2c85c2c8bbd460122b7497a7b8c5d4f388" origin="Generated by Gradle"/>
160170
</artifact>
161171
</component>
172+
<component group="com.github.spotbugs" name="spotbugs-annotations" version="4.8.6">
173+
<artifact name="spotbugs-annotations-4.8.6.jar">
174+
<sha256 value="4548b74a815ed44f5480ca4f06204a8b00809dc7e5f6a825a9edf18f40377b65" origin="Generated by Gradle"/>
175+
</artifact>
176+
<artifact name="spotbugs-annotations-4.8.6.module">
177+
<sha256 value="db27bda741855a819cd50e9d61230c42fe2aa2a644b94d73313c05217ae05239" origin="Generated by Gradle"/>
178+
</artifact>
179+
</component>
162180
<component group="com.google" name="google" version="1">
163181
<artifact name="google-1.pom">
164182
<sha256 value="cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81" origin="Generated by Gradle"/>
@@ -336,6 +354,14 @@
336354
<sha256 value="95be73f9a87876c95aef10dcc54938e1f1c45a2850c316c33fbdecd590f51280" origin="Generated by Gradle"/>
337355
</artifact>
338356
</component>
357+
<component group="com.google.errorprone" name="error_prone_annotations" version="2.38.0">
358+
<artifact name="error_prone_annotations-2.38.0.jar">
359+
<sha256 value="6661d5335090a5fc61dd869d2095bc6c1e2156e3aa47a6e4ababdf64c99a7889" origin="Generated by Gradle"/>
360+
</artifact>
361+
<artifact name="error_prone_annotations-2.38.0.pom">
362+
<sha256 value="3007bef8aff3ae8ea12d81c3feacb4f15979b2cf5c3e38fc9189a98dea141167" origin="Generated by Gradle"/>
363+
</artifact>
364+
</component>
339365
<component group="com.google.errorprone" name="error_prone_annotations" version="2.6.0">
340366
<artifact name="error_prone_annotations-2.6.0.jar">
341367
<sha256 value="94b131949e313af32d98538acdb80c8fd495131f0cd0e747e7dcca7866ff7283" origin="Generated by Gradle"/>
@@ -407,6 +433,11 @@
407433
<sha256 value="40495b437a60d2398f0fdfc054b89d9c394a82347a274a0721c2e950a4302186" origin="Generated by Gradle"/>
408434
</artifact>
409435
</component>
436+
<component group="com.google.errorprone" name="error_prone_parent" version="2.38.0">
437+
<artifact name="error_prone_parent-2.38.0.pom">
438+
<sha256 value="e62458a6a3e63081bc7c57b3c0fac9f04f76ce32f606532db69fe2b3d47b934c" origin="Generated by Gradle"/>
439+
</artifact>
440+
</component>
410441
<component group="com.google.errorprone" name="error_prone_parent" version="2.45.0">
411442
<artifact name="error_prone_parent-2.45.0.pom">
412443
<sha256 value="ce008b959652d910ee54781cbc6c6c53c063d2aa083a30078f4a43fc97456668" origin="Generated by Gradle"/>
@@ -1036,6 +1067,14 @@
10361067
<sha256 value="734e974632e36621feed97b74e1acb49797ea73c3711447ca7e2c604b98b1055" origin="Generated by Gradle"/>
10371068
</artifact>
10381069
</component>
1070+
<component group="net.kyori" name="adventure-api" version="4.26.1">
1071+
<artifact name="adventure-api-4.26.1.jar">
1072+
<sha256 value="551e536b9ea868f30e72c7900a309b35124ee7d4889fa3b3aed0910299751a26" origin="Generated by Gradle"/>
1073+
</artifact>
1074+
<artifact name="adventure-api-4.26.1.module">
1075+
<sha256 value="f9758c168027086c99d9a26673764ea8b80d536f20c26c598dc17052b13acafa" origin="Generated by Gradle"/>
1076+
</artifact>
1077+
</component>
10391078
<component group="net.kyori" name="adventure-bom" version="4.16.0">
10401079
<artifact name="adventure-bom-4.16.0.module">
10411080
<sha256 value="7bb0ff16b5787d447294343d96cae826946c78ff3dff47487d4a65a2fe5b58ff" origin="Generated by Gradle"/>
@@ -1076,6 +1115,14 @@
10761115
<sha256 value="d7ebadc65beb0af4a0f54a5335673bcff630a911f540a0f44c7ff7f02c4f3885" origin="Generated by Gradle"/>
10771116
</artifact>
10781117
</component>
1118+
<component group="net.kyori" name="adventure-bom" version="4.26.1">
1119+
<artifact name="adventure-bom-4.26.1.module">
1120+
<sha256 value="98d1f5cbcf5a80677262bc2bc705fc4c0b52365e98ba4c20473b3963b1366c71" origin="Generated by Gradle"/>
1121+
</artifact>
1122+
<artifact name="adventure-bom-4.26.1.pom">
1123+
<sha256 value="296b21955ff65b8b50898b4a7d59cb183703007aa31bf7617d529132e5275223" origin="Generated by Gradle"/>
1124+
</artifact>
1125+
</component>
10791126
<component group="net.kyori" name="adventure-key" version="4.16.0">
10801127
<artifact name="adventure-key-4.16.0-javadoc.jar">
10811128
<sha256 value="79e45459b03781d6c4bb487306b5fda22be88eada46331ba47a2e070a9a30c01" origin="Generated by Gradle"/>
@@ -1125,6 +1172,14 @@
11251172
<sha256 value="d2023bf8e7f4a8af8f08ae43a483cc3a4f36eb5b15ac6f25d0d8741d96ba12f0" origin="Generated by Gradle"/>
11261173
</artifact>
11271174
</component>
1175+
<component group="net.kyori" name="adventure-key" version="4.26.1">
1176+
<artifact name="adventure-key-4.26.1.jar">
1177+
<sha256 value="eec172d63db77b40eb7abeeb25f65eedea89bd30264d057b68b12fecb731be5e" origin="Generated by Gradle"/>
1178+
</artifact>
1179+
<artifact name="adventure-key-4.26.1.module">
1180+
<sha256 value="a3bdd4d75cf0c5e53c7f8b1e61b189f8ef4aae59d131b5f97d4ef29438337b10" origin="Generated by Gradle"/>
1181+
</artifact>
1182+
</component>
11281183
<component group="net.kyori" name="adventure-text-minimessage" version="4.16.0">
11291184
<artifact name="adventure-text-minimessage-4.16.0-javadoc.jar">
11301185
<sha256 value="7a101cb27dcc27c99e96018e0a06e2e149e57849fde98be973b84b7297d7f42a" origin="Generated by Gradle"/>
@@ -1174,6 +1229,14 @@
11741229
<sha256 value="6af08da3aadb8fe873e10faa515735c9b37a2d65826cb1898735a6e197893d76" origin="Generated by Gradle"/>
11751230
</artifact>
11761231
</component>
1232+
<component group="net.kyori" name="adventure-text-minimessage" version="4.26.1">
1233+
<artifact name="adventure-text-minimessage-4.26.1.jar">
1234+
<sha256 value="1d43451e9af473252dc8af3e8084238d5ce68ad43af0e3b7383eb3d4b63fff9f" origin="Generated by Gradle"/>
1235+
</artifact>
1236+
<artifact name="adventure-text-minimessage-4.26.1.module">
1237+
<sha256 value="1a3b2384c47104c82f27eeeb7a38ff03cf3b03e507e1c7b0528387bbc13d149e" origin="Generated by Gradle"/>
1238+
</artifact>
1239+
</component>
11771240
<component group="net.kyori" name="adventure-text-serializer-commons" version="4.21.0">
11781241
<artifact name="adventure-text-serializer-commons-4.21.0.jar">
11791242
<sha256 value="2eeb26605c723a57e5b63d24c2dd64182153a1486ca8e9f30bcba42d207f2c2a" origin="Generated by Gradle"/>
@@ -1190,6 +1253,14 @@
11901253
<sha256 value="665b9a1fd22b30f1a7289185b8e93cceced9ad68dd53557939b4075dd309c71d" origin="Generated by Gradle"/>
11911254
</artifact>
11921255
</component>
1256+
<component group="net.kyori" name="adventure-text-serializer-commons" version="4.26.1">
1257+
<artifact name="adventure-text-serializer-commons-4.26.1.jar">
1258+
<sha256 value="66527fef559da4d91cda692491034f903d5b01e835de1b091edfbb6b51cee5a2" origin="Generated by Gradle"/>
1259+
</artifact>
1260+
<artifact name="adventure-text-serializer-commons-4.26.1.module">
1261+
<sha256 value="3c7d73197040007b6d88eaf76d582dca082c40b698499454729714dff28a6f07" origin="Generated by Gradle"/>
1262+
</artifact>
1263+
</component>
11931264
<component group="net.kyori" name="adventure-text-serializer-gson" version="4.16.0">
11941265
<artifact name="adventure-text-serializer-gson-4.16.0-javadoc.jar">
11951266
<sha256 value="2681bc1e76f7a382c9a961815a56065aa24391dc3f05a355ab3664e4e3657c48" origin="Generated by Gradle"/>
@@ -1239,6 +1310,14 @@
12391310
<sha256 value="2c8c5635e4278e58ab35f142403eb5bb5fac05788362907c553a5af69f0334dd" origin="Generated by Gradle"/>
12401311
</artifact>
12411312
</component>
1313+
<component group="net.kyori" name="adventure-text-serializer-gson" version="4.26.1">
1314+
<artifact name="adventure-text-serializer-gson-4.26.1.jar">
1315+
<sha256 value="e4a908dedc4acb4305083d916d362ddc2b21ecf452d577a0be665280bddae9fc" origin="Generated by Gradle"/>
1316+
</artifact>
1317+
<artifact name="adventure-text-serializer-gson-4.26.1.module">
1318+
<sha256 value="0a211629416e356dbd1fd011724aeb9098b4c0bcf3a0525fd38fcb21abf478b0" origin="Generated by Gradle"/>
1319+
</artifact>
1320+
</component>
12421321
<component group="net.kyori" name="adventure-text-serializer-json" version="4.16.0">
12431322
<artifact name="adventure-text-serializer-json-4.16.0-javadoc.jar">
12441323
<sha256 value="f90c521ef81035beae06b5c5a5de3e636e03a5b85ede2af9e468cc6b67e57f57" origin="Generated by Gradle"/>
@@ -1288,6 +1367,14 @@
12881367
<sha256 value="6aabd4d997d158997f51fd8f86e7bb6f5fa228d701fa09110084e7f5df4e67b9" origin="Generated by Gradle"/>
12891368
</artifact>
12901369
</component>
1370+
<component group="net.kyori" name="adventure-text-serializer-json" version="4.26.1">
1371+
<artifact name="adventure-text-serializer-json-4.26.1.jar">
1372+
<sha256 value="55c64b4333d5d2968a0125b8f29dae7cfba15392d5f99f78dbaea711cb0d4dc2" origin="Generated by Gradle"/>
1373+
</artifact>
1374+
<artifact name="adventure-text-serializer-json-4.26.1.module">
1375+
<sha256 value="725e47910ab01b4a59d29a93c3ff2d0a47b1760c0c1b6c384f86c2a959b30792" origin="Generated by Gradle"/>
1376+
</artifact>
1377+
</component>
12911378
<component group="net.kyori" name="adventure-text-serializer-legacy" version="4.16.0">
12921379
<artifact name="adventure-text-serializer-legacy-4.16.0-javadoc.jar">
12931380
<sha256 value="0c309b1e595fda068dd876cf2d06f1781bc8508be08b964d8c447aa3e01b17f7" origin="Generated by Gradle"/>
@@ -1337,6 +1424,14 @@
13371424
<sha256 value="bb006fe20f89fea38464cfddcff482bc35c01a1239c2df0310fe8d0601cd194e" origin="Generated by Gradle"/>
13381425
</artifact>
13391426
</component>
1427+
<component group="net.kyori" name="adventure-text-serializer-legacy" version="4.26.1">
1428+
<artifact name="adventure-text-serializer-legacy-4.26.1.jar">
1429+
<sha256 value="721107bc213572454df1bfbe438dba630e30457550c750b7a154b35dc3264aa8" origin="Generated by Gradle"/>
1430+
</artifact>
1431+
<artifact name="adventure-text-serializer-legacy-4.26.1.module">
1432+
<sha256 value="51e76677d339a56e2b8fb37e3704775ff3e2ffeac3023e54e5b6b2862c5899bd" origin="Generated by Gradle"/>
1433+
</artifact>
1434+
</component>
13401435
<component group="net.kyori" name="adventure-text-serializer-plain" version="4.16.0">
13411436
<artifact name="adventure-text-serializer-plain-4.16.0-javadoc.jar">
13421437
<sha256 value="5fc7a99e8742fd6800aefc385f58e3c332eb7aa2ddbb827768ae9c9b0e4edd9a" origin="Generated by Gradle"/>
@@ -1386,6 +1481,14 @@
13861481
<sha256 value="de2afb5035431cbbc723a5a048160607df721de8872d381e1bb98808246871f8" origin="Generated by Gradle"/>
13871482
</artifact>
13881483
</component>
1484+
<component group="net.kyori" name="adventure-text-serializer-plain" version="4.26.1">
1485+
<artifact name="adventure-text-serializer-plain-4.26.1.jar">
1486+
<sha256 value="39b9bfe5790f645605ff5464382c0e062476f48f9bfb2548801f275f12faf405" origin="Generated by Gradle"/>
1487+
</artifact>
1488+
<artifact name="adventure-text-serializer-plain-4.26.1.module">
1489+
<sha256 value="c8d3361dec1e655185ab2aa871288d78f6749ff24f377cca2af2b82b6e61b48b" origin="Generated by Gradle"/>
1490+
</artifact>
1491+
</component>
13891492
<component group="net.kyori" name="examination-api" version="1.3.0">
13901493
<artifact name="examination-api-1.3.0-javadoc.jar">
13911494
<sha256 value="c5c108f156947f8fa939ca9f5d0eaee772430e0647fee19c063c5718deac0142" origin="Generated by Gradle"/>
@@ -1789,6 +1892,14 @@
17891892
<sha256 value="6d57547771394b3ee18f9ed3effa2159719e2f3634627863d05023ba9fd8e18b" origin="Generated by Gradle"/>
17901893
</artifact>
17911894
</component>
1895+
<component group="org.apache.logging.log4j" name="log4j-api" version="2.25.2">
1896+
<artifact name="log4j-api-2.25.2.jar">
1897+
<sha256 value="9fd66c9fe0bea06fa9666c147989a46cafaa92b4a88753697d3945cc43338cbb" origin="Generated by Gradle"/>
1898+
</artifact>
1899+
<artifact name="log4j-api-2.25.2.module">
1900+
<sha256 value="58f785ebabbacc303f3b0e5a485f755fdab3290f69e49b034f8963d27823655e" origin="Generated by Gradle"/>
1901+
</artifact>
1902+
</component>
17921903
<component group="org.apache.logging.log4j" name="log4j-bom" version="2.19.0">
17931904
<artifact name="log4j-bom-2.19.0.pom">
17941905
<sha256 value="8c6a7ac150a918a22907335fd5566914731ed781369770d525f64c0d07fe87e7" origin="Generated by Gradle"/>
@@ -2193,6 +2304,14 @@
21932304
<sha256 value="bef0b8352b2dfd4cb7155ecc2a39227bf16a3e08667babec650c76b1abbfcecb" origin="Generated by Gradle"/>
21942305
</artifact>
21952306
</component>
2307+
<component group="org.jetbrains" name="annotations" version="26.0.2-1">
2308+
<artifact name="annotations-26.0.2-1.jar">
2309+
<sha256 value="2037be378980d3ba9333e97955f3b2cde392aa124d04ca73ce2eee6657199297" origin="Generated by Gradle"/>
2310+
</artifact>
2311+
<artifact name="annotations-26.0.2-1.module">
2312+
<sha256 value="9fe86aeb64b86323e8e579503b11a038a140694c13b6804343f8a4dc9a3a46b1" origin="Generated by Gradle"/>
2313+
</artifact>
2314+
</component>
21962315
<component group="org.jetbrains.gradle.plugin.idea-ext" name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin" version="1.1.7">
21972316
<artifact name="org.jetbrains.gradle.plugin.idea-ext.gradle.plugin-1.1.7.pom">
21982317
<sha256 value="b953806a04ecd62b1bc87f81da56e809f5f0d7881c181f056554805af8664eb9" origin="Generated by Gradle"/>
@@ -2527,6 +2646,38 @@
25272646
<sha256 value="48bf1d6c8b5dc94f74652bd17900f654deb714350248cf5e8fca27b9090c8e0d" origin="Generated by Gradle"/>
25282647
</artifact>
25292648
</component>
2649+
<component group="org.osgi" name="org.osgi.annotation.bundle" version="2.0.0">
2650+
<artifact name="org.osgi.annotation.bundle-2.0.0.jar">
2651+
<sha256 value="b9c9546ec5be3ebc2e85ba4919150ad76d64594805282fc895133a47d264a7ae" origin="Generated by Gradle"/>
2652+
</artifact>
2653+
<artifact name="org.osgi.annotation.bundle-2.0.0.pom">
2654+
<sha256 value="8b9cf8a4129ebf5278f2634d3509c372283961ad0fdcc85a245bb35d7a22a5c8" origin="Generated by Gradle"/>
2655+
</artifact>
2656+
</component>
2657+
<component group="org.osgi" name="org.osgi.annotation.versioning" version="1.1.2">
2658+
<artifact name="org.osgi.annotation.versioning-1.1.2.jar">
2659+
<sha256 value="f51f235e80df8ffbc30ef1b557b6ea38a696632d675404ec117e952978b8b863" origin="Generated by Gradle"/>
2660+
</artifact>
2661+
<artifact name="org.osgi.annotation.versioning-1.1.2.pom">
2662+
<sha256 value="b1d3012abffa2b7fc4a3d0baee8784494c073986b000d655a788fa617aaa2bc8" origin="Generated by Gradle"/>
2663+
</artifact>
2664+
</component>
2665+
<component group="org.osgi" name="org.osgi.resource" version="1.0.0">
2666+
<artifact name="org.osgi.resource-1.0.0.jar">
2667+
<sha256 value="81fc50f1f1d38a4af28e131907d4afe213249aab05060484edca0e60c4af9b4a" origin="Generated by Gradle"/>
2668+
</artifact>
2669+
<artifact name="org.osgi.resource-1.0.0.pom">
2670+
<sha256 value="83acdf225ffb9a4a7bc582f53a4145a1f2c3bdbb428e033c00966f63c610e820" origin="Generated by Gradle"/>
2671+
</artifact>
2672+
</component>
2673+
<component group="org.osgi" name="org.osgi.service.serviceloader" version="1.0.0">
2674+
<artifact name="org.osgi.service.serviceloader-1.0.0.jar">
2675+
<sha256 value="8f876ce2a9aa4e95b1f1952950255103e2487425050a654f3285447ba601c154" origin="Generated by Gradle"/>
2676+
</artifact>
2677+
<artifact name="org.osgi.service.serviceloader-1.0.0.pom">
2678+
<sha256 value="755751ab6c37a1a31afb5b9e4a595c0dd2efd2b50d703b21255b827c50ed6153" origin="Generated by Gradle"/>
2679+
</artifact>
2680+
</component>
25302681
<component group="org.ow2" name="ow2" version="1.5.1">
25312682
<artifact name="ow2-1.5.1.pom">
25322683
<sha256 value="321ddbb7ee6fe4f53dea6b4cd6db74154d6bfa42391c1f763b361b9f485acf05" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)