Skip to content

Commit 11c68fa

Browse files
committed
Upgrade spotless to latest - 7.0.2
1 parent cc6e84e commit 11c68fa

File tree

3 files changed

+112
-6
lines changed

3 files changed

+112
-6
lines changed

gradle/build.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.
4444
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
4545
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
4646
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
47-
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
47+
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.2"
4848
wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
4949
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"

gradle/verification-metadata.xml

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,11 @@
229229
<sha256 value="81e2b639a7e4be6dc9b7245713cf06f5cab51f29db2e16b9b57645c96fde2884" origin="Generated by Gradle"/>
230230
</artifact>
231231
</component>
232+
<component group="com.diffplug.durian" name="durian-swt.os" version="4.3.1">
233+
<artifact name="durian-swt.os-4.3.1.jar">
234+
<sha256 value="8fcf4f4fecb6c0b4f1ef8de4c979bd5bcfb886b689b48556cbf33cf181ad4464" origin="Generated by Gradle"/>
235+
</artifact>
236+
</component>
232237
<component group="com.diffplug.spotless" name="spotless-eclipse-base" version="3.5.2">
233238
<artifact name="spotless-eclipse-base-3.5.2.jar">
234239
<sha256 value="e381d6996a3d7f41c02d79bd0b1dff077aaec40b55fa15971c1bb45ab16f5a20" origin="Generated by Gradle"/>
@@ -249,6 +254,11 @@
249254
<sha256 value="caa88246e4f3b4d26e4c4b24b31db33a6758747429f6429702ab8dd75bd58e90" origin="Generated by Gradle"/>
250255
</artifact>
251256
</component>
257+
<component group="com.diffplug.spotless" name="spotless-lib" version="3.0.2">
258+
<artifact name="spotless-lib-3.0.2.jar">
259+
<sha256 value="3f9a7fdfc5b03ac20894834170910c15c4f2b84ed4ce3677898a307ad589837c" origin="Generated by Gradle"/>
260+
</artifact>
261+
</component>
252262
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.45.0">
253263
<artifact name="spotless-lib-extra-2.45.0.jar">
254264
<sha256 value="602cbbcd3828ee9cfb2e30a7f9b30335c6927130771414d4cdd294d21fe5cb67" origin="Generated by Gradle"/>
@@ -259,6 +269,11 @@
259269
<sha256 value="58e3ddd55199ad74c28fa6490bad1e2b707d7aa4694d3611af2394af77fa2212" origin="Generated by Gradle"/>
260270
</artifact>
261271
</component>
272+
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.2">
273+
<artifact name="spotless-lib-extra-3.0.2.jar">
274+
<sha256 value="b0e77746d633d445e78489ac3d08ad2ea1b3537c4d064e4abe46cc42d62303eb" origin="Generated by Gradle"/>
275+
</artifact>
276+
</component>
262277
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.25.0">
263278
<artifact name="spotless-plugin-gradle-6.25.0.jar">
264279
<sha256 value="f5eb908a4c5da46299e7543faada0402d2c4b77d58c7b432d4b6e59349b280a3" origin="Generated by Gradle"/>
@@ -269,6 +284,11 @@
269284
<sha256 value="a3609eeb7173837a589a4ad865e6feaf71ee6139d061eae2e698401485f7589c" origin="Generated by Gradle"/>
270285
</artifact>
271286
</component>
287+
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.2">
288+
<artifact name="spotless-plugin-gradle-7.0.2.jar">
289+
<sha256 value="59a34c4f84a48d4c8d929e2f89906369e65476ec0499a43de87c3e4127977cd5" origin="Generated by Gradle"/>
290+
</artifact>
291+
</component>
272292
<component group="com.ethlo.time" name="itu" version="1.7.0">
273293
<artifact name="itu-1.7.0.jar">
274294
<sha256 value="55ceb418c9e8138c4fcf62e213c4c814d89e8a84c827d395407cbecba5d791e7" origin="Generated by Gradle"/>
@@ -1366,6 +1386,11 @@
13661386
<sha256 value="cc272e742da41a326623a83ec1b086832fe80869cbf0a19627887f1fb128312c" origin="Generated by Gradle"/>
13671387
</artifact>
13681388
</component>
1389+
<component group="dev.equo.ide" name="solstice" version="1.8.1">
1390+
<artifact name="solstice-1.8.1.jar">
1391+
<sha256 value="6e5ba2cce813be1d71ccdc2ecf3e49271b14e691bfbbb1a114cf3a30e773b10d" origin="Generated by Gradle"/>
1392+
</artifact>
1393+
</component>
13691394
<component group="dnsjava" name="dnsjava" version="2.1.7">
13701395
<artifact name="dnsjava-2.1.7.jar">
13711396
<sha256 value="2c52a6fabd5af9331d73fc7787dafc32a56bd8019c49f89749c2eeef244e303c" origin="Generated by Gradle"/>
@@ -1754,6 +1779,11 @@
17541779
<sha256 value="8ce969116cac95bd61b07a8d5e07174b352e63301473caac72c395e3c08488d2" origin="Generated by Gradle"/>
17551780
</artifact>
17561781
</component>
1782+
<component group="net.java.dev.jna" name="jna-platform" version="5.15.0">
1783+
<artifact name="jna-platform-5.15.0.jar">
1784+
<sha256 value="18b7f6e7d34ce89309a6d9052ae1a987e8e64057e2f683e01e50f2f2b59cd153" origin="Generated by Gradle"/>
1785+
</artifact>
1786+
</component>
17571787
<component group="net.java.dev.jna" name="jna-platform" version="5.7.0">
17581788
<artifact name="jna-platform-5.7.0.jar">
17591789
<sha256 value="42e020705692eddbd285e2b72ef0ff468f51a926382569c45f4e9cea4602ad1e" origin="Generated by Gradle"/>
@@ -2352,6 +2382,11 @@
23522382
<sha256 value="dd9d920101890ecd0565a8e48bf3f80bbe3d398cdf0f1970a19eec4f54c8d4e1" origin="Generated by Gradle"/>
23532383
</artifact>
23542384
</component>
2385+
<component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.12">
2386+
<artifact name="org.apache.felix.scr-2.2.12.jar">
2387+
<sha256 value="c35bdaa7e366cf7f8806305105890e2731f29d173e593e441f401cfbf1017696" origin="Generated by Gradle"/>
2388+
</artifact>
2389+
</component>
23552390
<component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.6">
23562391
<artifact name="org.apache.felix.scr-2.2.6.jar">
23572392
<sha256 value="24c0b2d8081cbc9624e60a1c19f1dd0d104e014cdba4038d9b1aed0ab63721c6" origin="Generated by Gradle"/>
@@ -3613,6 +3648,11 @@
36133648
<sha256 value="97c566b120009c203a2fc8b291f4a9adbc171cf1ccb70f06f6b4e1828c00ce8e" origin="Generated by Gradle"/>
36143649
</artifact>
36153650
</component>
3651+
<component group="org.eclipse.jdt" name="ecj" version="3.40.0">
3652+
<artifact name="ecj-3.40.0.jar">
3653+
<sha256 value="05cc22a24e7982970f63a405fc6c820bc80b806f27f3c5a6236fc475f8f7152b" origin="Generated by Gradle"/>
3654+
</artifact>
3655+
</component>
36163656
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.35.0">
36173657
<artifact name="org.eclipse.jdt.core-3.35.0.jar">
36183658
<sha256 value="8f5bcb00355b271638b9d82a8cccd0e733225cb74c4a3f0f55a7b75d43ee442a" origin="Generated by Gradle"/>
@@ -3623,6 +3663,11 @@
36233663
<sha256 value="f0387e80ed4327d39f1f63da8773ee460af4edd78f7c2efecb4ba9bc0628bf60" origin="Generated by Gradle"/>
36243664
</artifact>
36253665
</component>
3666+
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.40.0">
3667+
<artifact name="org.eclipse.jdt.core-3.40.0.jar">
3668+
<sha256 value="aa9cd22885bd514b18b5eee7a2b3ef8a06e1d83b2adcc4148dc2c31ef81c0525" origin="Generated by Gradle"/>
3669+
</artifact>
3670+
</component>
36263671
<component group="org.eclipse.jetty" name="jetty-annotations" version="9.4.40.v20210413">
36273672
<artifact name="jetty-annotations-9.4.40.v20210413.jar">
36283673
<sha256 value="faccdc2113daf5ace9157cacd98751a41280fec94f584fd571b7fc26ff84742d" origin="Generated by Gradle"/>
@@ -3753,6 +3798,11 @@
37533798
<sha256 value="443adcdec30c0563e4d7bafe6f7eeca704749e4b5a8620d18626fb1d640b41f7" origin="Generated by Gradle"/>
37543799
</artifact>
37553800
</component>
3801+
<component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.12.200">
3802+
<artifact name="org.eclipse.core.commands-3.12.200.jar">
3803+
<sha256 value="ed66bd24d74e7b3aacd2e6f1cfe4087690b579a409fae7b8c57fb2cb9df46cf4" origin="Generated by Gradle"/>
3804+
</artifact>
3805+
</component>
37563806
<component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.9.100">
37573807
<artifact name="org.eclipse.core.contenttype-3.9.100.jar">
37583808
<sha256 value="707e81707e8f2843be90f621aa3b7ff318dd3244e6f4a2982af55f66faf55987" origin="Generated by Gradle"/>
@@ -3763,6 +3813,11 @@
37633813
<sha256 value="7622d903f85e8c11afe6ae662ffa1a2c33a5f694c6510758299f070ec520d4ca" origin="Generated by Gradle"/>
37643814
</artifact>
37653815
</component>
3816+
<component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.9.600">
3817+
<artifact name="org.eclipse.core.contenttype-3.9.600.jar">
3818+
<sha256 value="d8a2974f5ec3d7cfb8e3e177aa7303babed0a1565dbe5416084a751044255002" origin="Generated by Gradle"/>
3819+
</artifact>
3820+
</component>
37663821
<component group="org.eclipse.platform" name="org.eclipse.core.expressions" version="3.9.100">
37673822
<artifact name="org.eclipse.core.expressions-3.9.100.jar">
37683823
<sha256 value="72736638d17cef9183659590d99fd7262a601ed2e3723295737a638db24e23fd" origin="Generated by Gradle"/>
@@ -3783,6 +3838,11 @@
37833838
<sha256 value="7cfc4f8aee8c1b399dcbe105e10e096a9e2f21dc56b28a3c7aa42cf0a5023682" origin="Generated by Gradle"/>
37843839
</artifact>
37853840
</component>
3841+
<component group="org.eclipse.platform" name="org.eclipse.core.filesystem" version="1.11.100">
3842+
<artifact name="org.eclipse.core.filesystem-1.11.100.jar">
3843+
<sha256 value="e97dced18aac77726d8fce40c5a398146a995af7cf8caec1f7fc4a8afbc7a810" origin="Generated by Gradle"/>
3844+
</artifact>
3845+
</component>
37863846
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.0">
37873847
<artifact name="org.eclipse.core.jobs-3.15.0.jar">
37883848
<sha256 value="857df690c6424a6558b5c96732958f03b9c209258562caf93d9fcbc13242fa11" origin="Generated by Gradle"/>
@@ -3793,6 +3853,11 @@
37933853
<sha256 value="ad6db9d0e7d8579d01b750fdced6d6e1d410919047d4bfd3b7d6a65627e5063a" origin="Generated by Gradle"/>
37943854
</artifact>
37953855
</component>
3856+
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.400">
3857+
<artifact name="org.eclipse.core.jobs-3.15.400.jar">
3858+
<sha256 value="2be3d118c967756858c612d834cc121393e6c2743e83f1559fd3ae867a82d7b9" origin="Generated by Gradle"/>
3859+
</artifact>
3860+
</component>
37963861
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.19.100">
37973862
<artifact name="org.eclipse.core.resources-3.19.100.jar">
37983863
<sha256 value="537af88de2c0e602446ab0fa9dcfec29c617f0891b96fc4cc3fba1655edcc91b" origin="Generated by Gradle"/>
@@ -3803,6 +3868,11 @@
38033868
<sha256 value="8b51dd0c72e54ecfd4b56a160769ca00a0d944ace10d47ef372fa4e103698b13" origin="Generated by Gradle"/>
38043869
</artifact>
38053870
</component>
3871+
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.22.0">
3872+
<artifact name="org.eclipse.core.resources-3.22.0.jar">
3873+
<sha256 value="366789a319a4c6c911e0f1a5777ff3bad712139fb795e4ced89ed79aa45444c2" origin="Generated by Gradle"/>
3874+
</artifact>
3875+
</component>
38063876
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.29.0">
38073877
<artifact name="org.eclipse.core.runtime-3.29.0.jar">
38083878
<sha256 value="096373dff05c425cb37e4924b25b3532a8f8c2992f36d4b6266b0e05a19af814" origin="Generated by Gradle"/>
@@ -3813,6 +3883,11 @@
38133883
<sha256 value="aa484a9f9ecb6a2575d19d1a73bd943dbc9b2292751f4874109b7ac67fd904a8" origin="Generated by Gradle"/>
38143884
</artifact>
38153885
</component>
3886+
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.32.0">
3887+
<artifact name="org.eclipse.core.runtime-3.32.0.jar">
3888+
<sha256 value="faf6b6584b82420609a20f7bf18cbe67c890a7d3b69b6158110e9d3c38fb36cc" origin="Generated by Gradle"/>
3889+
</artifact>
3890+
</component>
38163891
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.300">
38173892
<artifact name="org.eclipse.equinox.app-1.6.300.jar">
38183893
<sha256 value="eaeb288c9bc78916027d3933d7d1f78c1b8675d54a55a7abdea161b001b7adf1" origin="Generated by Gradle"/>
@@ -3823,6 +3898,11 @@
38233898
<sha256 value="7ebd054bc03da4d61abc166d22df41cfa0e49963a5b0c4b32dbe0b769b6c216d" origin="Generated by Gradle"/>
38243899
</artifact>
38253900
</component>
3901+
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.7.200">
3902+
<artifact name="org.eclipse.equinox.app-1.7.200.jar">
3903+
<sha256 value="4584f6a46013aa3ecaf5b1ac67ac6e1bdc5ce7ba89ce61d857047cff30bd92f4" origin="Generated by Gradle"/>
3904+
</artifact>
3905+
</component>
38263906
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.18.100">
38273907
<artifact name="org.eclipse.equinox.common-3.18.100.jar">
38283908
<sha256 value="7c15db46dda5f6f1ff9ecac10eb6ffa9ed1cbd0ed5e6996cb95f0e390902700e" origin="Generated by Gradle"/>
@@ -3833,6 +3913,11 @@
38333913
<sha256 value="77da20b3d040b9a00509add8583c659243a62e9f9633bc3f82b55e96b0a09427" origin="Generated by Gradle"/>
38343914
</artifact>
38353915
</component>
3916+
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.19.200">
3917+
<artifact name="org.eclipse.equinox.common-3.19.200.jar">
3918+
<sha256 value="e7d5c60fde47984fb4f0e17ad572792e9f852e49973570fd92c3d72b08136d0f" origin="Generated by Gradle"/>
3919+
</artifact>
3920+
</component>
38363921
<component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.6.200">
38373922
<artifact name="org.eclipse.equinox.event-1.6.200.jar">
38383923
<sha256 value="b83c7f7023a3c30daa75e112f3ad2c6d8c30108e19bbe84ec2d25b8bad0efe7a" origin="Generated by Gradle"/>
@@ -3853,6 +3938,11 @@
38533938
<sha256 value="2dece57392142293cd35b58132b7f6bb0ac599a35f2ce734fd2551440ec27b47" origin="Generated by Gradle"/>
38543939
</artifact>
38553940
</component>
3941+
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.11.200">
3942+
<artifact name="org.eclipse.equinox.preferences-3.11.200.jar">
3943+
<sha256 value="80bbf8d76313b0136ee95fa883fc16f958a52bec453bb9b4c794ab24dbde8097" origin="Generated by Gradle"/>
3944+
</artifact>
3945+
</component>
38563946
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.300">
38573947
<artifact name="org.eclipse.equinox.registry-3.11.300.jar">
38583948
<sha256 value="3acbb9c857bae9093f3308aff5abe72be5eabcb23e2791139d3571cade659da0" origin="Generated by Gradle"/>
@@ -3863,6 +3953,11 @@
38633953
<sha256 value="23ded56b950ae846e006870f836c29b8d545f3a7bf9ced28baf41b5a2e5e8dbb" origin="Generated by Gradle"/>
38643954
</artifact>
38653955
</component>
3956+
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.12.200">
3957+
<artifact name="org.eclipse.equinox.registry-3.12.200.jar">
3958+
<sha256 value="2a80f6dcb1bfc594e8653db59ef6843b8ae17909759303687779dafa9b29a5d6" origin="Generated by Gradle"/>
3959+
</artifact>
3960+
</component>
38663961
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.10.700">
38673962
<artifact name="org.eclipse.equinox.supplement-1.10.700.jar">
38683963
<sha256 value="5df4309856c79492807c17f116ca112ea83c7dd04c2c01049f5d3b4811135068" origin="Generated by Gradle"/>
@@ -3873,6 +3968,11 @@
38733968
<sha256 value="6edca163c9e251e8500765206b5728f91a929f664b692d6a5affb1ef644614ab" origin="Generated by Gradle"/>
38743969
</artifact>
38753970
</component>
3971+
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.11.100">
3972+
<artifact name="org.eclipse.equinox.supplement-1.11.100.jar">
3973+
<sha256 value="86ef86bd058c91a35ad09a53573191ebe9ab62959f13c0090a089c9aea067ff2" origin="Generated by Gradle"/>
3974+
</artifact>
3975+
</component>
38763976
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.18.300">
38773977
<artifact name="org.eclipse.osgi-3.18.300.jar">
38783978
<sha256 value="bab943e58edd17309238672dba7a45aec9e2dacbdddb818a8cf17723ea13fa22" origin="Generated by Gradle"/>
@@ -3888,6 +3988,11 @@
38883988
<sha256 value="11e61736689f0c1af46c9a852420058e10c6072f936c8308b6eca50e46dd38ef" origin="Generated by Gradle"/>
38893989
</artifact>
38903990
</component>
3991+
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.22.0">
3992+
<artifact name="org.eclipse.osgi-3.22.0.jar">
3993+
<sha256 value="e73e2ed1110f18e663dbe6a86048df586ee4d2ad70c38af726a1b5df0fb9f87a" origin="Generated by Gradle"/>
3994+
</artifact>
3995+
</component>
38913996
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.13.100">
38923997
<artifact name="org.eclipse.text-3.13.100.jar">
38933998
<sha256 value="89afa204e8e686eaa5f1464a6ceb65ac1b341ad1d0326cab6716c6733ecaf5ac" origin="Generated by Gradle"/>
@@ -3898,6 +4003,11 @@
38984003
<sha256 value="7c9791768a715b1fef29dec8ba6a15a968bcc1cf7a766d439273fe52362eec65" origin="Generated by Gradle"/>
38994004
</artifact>
39004005
</component>
4006+
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.14.200">
4007+
<artifact name="org.eclipse.text-3.14.200.jar">
4008+
<sha256 value="312e5e1c013f109b9e1c0d77e9611bb7a9567d0f2a079ce1bd851c043085713e" origin="Generated by Gradle"/>
4009+
</artifact>
4010+
</component>
39014011
<component group="org.eclipse.sisu" name="org.eclipse.sisu.inject" version="0.3.3">
39024012
<artifact name="org.eclipse.sisu.inject-0.3.3.jar">
39034013
<sha256 value="c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b" origin="Generated by Gradle"/>

x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/support/SecurityMigrationExecutorTests.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,7 @@ public int minMappingVersion() {
213213
}))
214214
);
215215

216-
securityMigrationExecutor.nodeOperation(
217-
mockTask,
218-
new SecurityMigrationTaskParams(0, true),
219-
mock(PersistentTaskState.class)
220-
);
216+
securityMigrationExecutor.nodeOperation(mockTask, new SecurityMigrationTaskParams(0, true), mock(PersistentTaskState.class));
221217
verify(mockTask, times(1)).markAsFailed(any());
222218
verify(mockTask, times(0)).markAsCompleted();
223219
}

0 commit comments

Comments
 (0)