Skip to content

Commit 7732fa2

Browse files
breskebybreskeby
committed
Update to spotless 7.0.4
1 parent 5c44148 commit 7732fa2

File tree

5 files changed

+115
-22
lines changed

5 files changed

+115
-22
lines changed

‎gradle/build.versions.toml‎

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

‎gradle/verification-metadata.xml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,16 +221,31 @@
221221
<sha256 value="3f9a7fdfc5b03ac20894834170910c15c4f2b84ed4ce3677898a307ad589837c" origin="Generated by Gradle"/>
222222
</artifact>
223223
</component>
224+
<component group="com.diffplug.spotless" name="spotless-lib" version="3.1.2">
225+
<artifact name="spotless-lib-3.1.2.jar">
226+
<sha256 value="a80e31bf6acb481802988bee55590815b0988d68607b6a586ffc775cdf8a9b3f" origin="Generated by Gradle"/>
227+
</artifact>
228+
</component>
224229
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.2">
225230
<artifact name="spotless-lib-extra-3.0.2.jar">
226231
<sha256 value="b0e77746d633d445e78489ac3d08ad2ea1b3537c4d064e4abe46cc42d62303eb" origin="Generated by Gradle"/>
227232
</artifact>
228233
</component>
234+
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.1.2">
235+
<artifact name="spotless-lib-extra-3.1.2.jar">
236+
<sha256 value="37c9bbde63d5cebb293321c1cfd046fc7a05cd066abda9da52aa63a8ea676f74" origin="Generated by Gradle"/>
237+
</artifact>
238+
</component>
229239
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.2">
230240
<artifact name="spotless-plugin-gradle-7.0.2.jar">
231241
<sha256 value="59a34c4f84a48d4c8d929e2f89906369e65476ec0499a43de87c3e4127977cd5" origin="Generated by Gradle"/>
232242
</artifact>
233243
</component>
244+
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.4">
245+
<artifact name="spotless-plugin-gradle-7.0.4.jar">
246+
<sha256 value="23557cdec130b4bb2ca2d30eda2398325e09dfe6b990d2eacd9d5f39a1dede71" origin="Generated by Gradle"/>
247+
</artifact>
248+
</component>
234249
<component group="com.ethlo.time" name="itu" version="1.7.0">
235250
<artifact name="itu-1.7.0.jar">
236251
<sha256 value="55ceb418c9e8138c4fcf62e213c4c814d89e8a84c827d395407cbecba5d791e7" origin="Generated by Gradle"/>
@@ -1781,6 +1796,11 @@
17811796
<sha256 value="18b7f6e7d34ce89309a6d9052ae1a987e8e64057e2f683e01e50f2f2b59cd153" origin="Generated by Gradle"/>
17821797
</artifact>
17831798
</component>
1799+
<component group="net.java.dev.jna" name="jna-platform" version="5.16.0">
1800+
<artifact name="jna-platform-5.16.0.jar">
1801+
<sha256 value="e5a79523964509757555782bb60283e4902611013f107e4600dc93298f73f382" origin="Generated by Gradle"/>
1802+
</artifact>
1803+
</component>
17841804
<component group="net.java.dev.jna" name="jna-platform" version="5.7.0">
17851805
<artifact name="jna-platform-5.7.0.jar">
17861806
<sha256 value="42e020705692eddbd285e2b72ef0ff468f51a926382569c45f4e9cea4602ad1e" origin="Generated by Gradle"/>
@@ -3636,6 +3656,11 @@
36363656
<sha256 value="05cc22a24e7982970f63a405fc6c820bc80b806f27f3c5a6236fc475f8f7152b" origin="Generated by Gradle"/>
36373657
</artifact>
36383658
</component>
3659+
<component group="org.eclipse.jdt" name="ecj" version="3.41.0">
3660+
<artifact name="ecj-3.41.0.jar">
3661+
<sha256 value="47bda183cd94a8bdb704f5b35690224f75b7d2fb563c8b8f9bbcfab987c3029b" origin="Generated by Gradle"/>
3662+
</artifact>
3663+
</component>
36393664
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.35.0">
36403665
<artifact name="org.eclipse.jdt.core-3.35.0.jar">
36413666
<sha256 value="8f5bcb00355b271638b9d82a8cccd0e733225cb74c4a3f0f55a7b75d43ee442a" origin="Generated by Gradle"/>
@@ -3651,6 +3676,11 @@
36513676
<sha256 value="aa9cd22885bd514b18b5eee7a2b3ef8a06e1d83b2adcc4148dc2c31ef81c0525" origin="Generated by Gradle"/>
36523677
</artifact>
36533678
</component>
3679+
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.41.0">
3680+
<artifact name="org.eclipse.jdt.core-3.41.0.jar">
3681+
<sha256 value="88aff1ec4f6b52105971bdbbb5e1a0636b9046ee1bafc3b25b467172da9a079e" origin="Generated by Gradle"/>
3682+
</artifact>
3683+
</component>
36543684
<component group="org.eclipse.jetty" name="jetty-annotations" version="9.4.40.v20210413">
36553685
<artifact name="jetty-annotations-9.4.40.v20210413.jar">
36563686
<sha256 value="faccdc2113daf5ace9157cacd98751a41280fec94f584fd571b7fc26ff84742d" origin="Generated by Gradle"/>
@@ -3761,6 +3791,11 @@
37613791
<sha256 value="43f92f3adb681a5f3006b979e8d341c12a8cfd8029f287c42bcf0a80377565ae" origin="Generated by Gradle"/>
37623792
</artifact>
37633793
</component>
3794+
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.10.1.202505221210-r">
3795+
<artifact name="org.eclipse.jgit-6.10.1.202505221210-r.jar">
3796+
<sha256 value="8f0135ca45d00c4da8e7ba2e96d44e1ade452bf279d79ca4eb54921e8f27952c" origin="Generated by Gradle"/>
3797+
</artifact>
3798+
</component>
37643799
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.5.0.202303070854-r">
37653800
<artifact name="org.eclipse.jgit-6.5.0.202303070854-r.jar">
37663801
<sha256 value="9b4da8cde1651fa7a9f4d242585fe94343d40165e4c06ad5a722044a2cbe6251" origin="Generated by Gradle"/>
@@ -3786,6 +3821,11 @@
37863821
<sha256 value="ed66bd24d74e7b3aacd2e6f1cfe4087690b579a409fae7b8c57fb2cb9df46cf4" origin="Generated by Gradle"/>
37873822
</artifact>
37883823
</component>
3824+
<component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.12.300">
3825+
<artifact name="org.eclipse.core.commands-3.12.300.jar">
3826+
<sha256 value="c936d69ac4fee9da0d11dd4420d9d622d0c6b5f19e97a47d1f22cfd44d45282a" origin="Generated by Gradle"/>
3827+
</artifact>
3828+
</component>
37893829
<component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.9.100">
37903830
<artifact name="org.eclipse.core.contenttype-3.9.100.jar">
37913831
<sha256 value="707e81707e8f2843be90f621aa3b7ff318dd3244e6f4a2982af55f66faf55987" origin="Generated by Gradle"/>
@@ -3841,6 +3881,11 @@
38413881
<sha256 value="2be3d118c967756858c612d834cc121393e6c2743e83f1559fd3ae867a82d7b9" origin="Generated by Gradle"/>
38423882
</artifact>
38433883
</component>
3884+
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.500">
3885+
<artifact name="org.eclipse.core.jobs-3.15.500.jar">
3886+
<sha256 value="189199cd46a284220b7b97fd59218b533fe9fd8e0ad22258f674a3f2df4de7c9" origin="Generated by Gradle"/>
3887+
</artifact>
3888+
</component>
38443889
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.19.100">
38453890
<artifact name="org.eclipse.core.resources-3.19.100.jar">
38463891
<sha256 value="537af88de2c0e602446ab0fa9dcfec29c617f0891b96fc4cc3fba1655edcc91b" origin="Generated by Gradle"/>
@@ -3856,6 +3901,11 @@
38563901
<sha256 value="366789a319a4c6c911e0f1a5777ff3bad712139fb795e4ced89ed79aa45444c2" origin="Generated by Gradle"/>
38573902
</artifact>
38583903
</component>
3904+
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.22.100">
3905+
<artifact name="org.eclipse.core.resources-3.22.100.jar">
3906+
<sha256 value="0d534030b9c76d0f7b8affc3b22d1a772506b64888e44d6b06806dd400792318" origin="Generated by Gradle"/>
3907+
</artifact>
3908+
</component>
38593909
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.29.0">
38603910
<artifact name="org.eclipse.core.runtime-3.29.0.jar">
38613911
<sha256 value="096373dff05c425cb37e4924b25b3532a8f8c2992f36d4b6266b0e05a19af814" origin="Generated by Gradle"/>
@@ -3871,6 +3921,11 @@
38713921
<sha256 value="faf6b6584b82420609a20f7bf18cbe67c890a7d3b69b6158110e9d3c38fb36cc" origin="Generated by Gradle"/>
38723922
</artifact>
38733923
</component>
3924+
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.33.0">
3925+
<artifact name="org.eclipse.core.runtime-3.33.0.jar">
3926+
<sha256 value="ff59efb6fb7d610d819d44777bd306860ec7926cd31ac95419e729edfb38cc02" origin="Generated by Gradle"/>
3927+
</artifact>
3928+
</component>
38743929
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.300">
38753930
<artifact name="org.eclipse.equinox.app-1.6.300.jar">
38763931
<sha256 value="eaeb288c9bc78916027d3933d7d1f78c1b8675d54a55a7abdea161b001b7adf1" origin="Generated by Gradle"/>
@@ -3886,6 +3941,11 @@
38863941
<sha256 value="4584f6a46013aa3ecaf5b1ac67ac6e1bdc5ce7ba89ce61d857047cff30bd92f4" origin="Generated by Gradle"/>
38873942
</artifact>
38883943
</component>
3944+
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.7.300">
3945+
<artifact name="org.eclipse.equinox.app-1.7.300.jar">
3946+
<sha256 value="ca5d75f9228510f19250ef947e340a7a2cdebd1a888efdf13a3f3a4b114d4d2e" origin="Generated by Gradle"/>
3947+
</artifact>
3948+
</component>
38893949
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.18.100">
38903950
<artifact name="org.eclipse.equinox.common-3.18.100.jar">
38913951
<sha256 value="7c15db46dda5f6f1ff9ecac10eb6ffa9ed1cbd0ed5e6996cb95f0e390902700e" origin="Generated by Gradle"/>
@@ -3901,6 +3961,11 @@
39013961
<sha256 value="e7d5c60fde47984fb4f0e17ad572792e9f852e49973570fd92c3d72b08136d0f" origin="Generated by Gradle"/>
39023962
</artifact>
39033963
</component>
3964+
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.20.0">
3965+
<artifact name="org.eclipse.equinox.common-3.20.0.jar">
3966+
<sha256 value="617c5d7e759276b7e9ed363c56a6714b7f21d4a812d533fcb90e48723cc4c001" origin="Generated by Gradle"/>
3967+
</artifact>
3968+
</component>
39043969
<component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.6.200">
39053970
<artifact name="org.eclipse.equinox.event-1.6.200.jar">
39063971
<sha256 value="b83c7f7023a3c30daa75e112f3ad2c6d8c30108e19bbe84ec2d25b8bad0efe7a" origin="Generated by Gradle"/>
@@ -3911,6 +3976,11 @@
39113976
<sha256 value="9f7dbc1ced29e627cb228ec205be7f4e496330eee450b31cb94c7973e4459561" origin="Generated by Gradle"/>
39123977
</artifact>
39133978
</component>
3979+
<component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.7.200">
3980+
<artifact name="org.eclipse.equinox.event-1.7.200.jar">
3981+
<sha256 value="81afa6c1e9ec3e85f9884d0edd44865234091111565e5b44c1e3046ebf44dd11" origin="Generated by Gradle"/>
3982+
</artifact>
3983+
</component>
39143984
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.10.300">
39153985
<artifact name="org.eclipse.equinox.preferences-3.10.300.jar">
39163986
<sha256 value="0e231ed4443b1bb21e16ec13a83e975bc04b0503eac2ce6f4b4a7d7b2f53956d" origin="Generated by Gradle"/>
@@ -3926,6 +3996,11 @@
39263996
<sha256 value="80bbf8d76313b0136ee95fa883fc16f958a52bec453bb9b4c794ab24dbde8097" origin="Generated by Gradle"/>
39273997
</artifact>
39283998
</component>
3999+
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.11.300">
4000+
<artifact name="org.eclipse.equinox.preferences-3.11.300.jar">
4001+
<sha256 value="7f8b452ee5f9d836db8534c6bd1a29a2662352d868ff94856b6b54bc8032a999" origin="Generated by Gradle"/>
4002+
</artifact>
4003+
</component>
39294004
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.300">
39304005
<artifact name="org.eclipse.equinox.registry-3.11.300.jar">
39314006
<sha256 value="3acbb9c857bae9093f3308aff5abe72be5eabcb23e2791139d3571cade659da0" origin="Generated by Gradle"/>
@@ -3941,6 +4016,11 @@
39414016
<sha256 value="2a80f6dcb1bfc594e8653db59ef6843b8ae17909759303687779dafa9b29a5d6" origin="Generated by Gradle"/>
39424017
</artifact>
39434018
</component>
4019+
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.12.300">
4020+
<artifact name="org.eclipse.equinox.registry-3.12.300.jar">
4021+
<sha256 value="e2145418ff639b44ff50e83b66848f40ae38c869db6b8f95044bbb5d0d652722" origin="Generated by Gradle"/>
4022+
</artifact>
4023+
</component>
39444024
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.10.700">
39454025
<artifact name="org.eclipse.equinox.supplement-1.10.700.jar">
39464026
<sha256 value="5df4309856c79492807c17f116ca112ea83c7dd04c2c01049f5d3b4811135068" origin="Generated by Gradle"/>
@@ -3956,6 +4036,11 @@
39564036
<sha256 value="86ef86bd058c91a35ad09a53573191ebe9ab62959f13c0090a089c9aea067ff2" origin="Generated by Gradle"/>
39574037
</artifact>
39584038
</component>
4039+
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.12.0">
4040+
<artifact name="org.eclipse.equinox.supplement-1.12.0.jar">
4041+
<sha256 value="09a5f2962dcc5ec4ca7e730d17e0ca562f38d27b80e218043a130febb9131293" origin="Generated by Gradle"/>
4042+
</artifact>
4043+
</component>
39594044
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.18.300">
39604045
<artifact name="org.eclipse.osgi-3.18.300.jar">
39614046
<sha256 value="bab943e58edd17309238672dba7a45aec9e2dacbdddb818a8cf17723ea13fa22" origin="Generated by Gradle"/>
@@ -3976,6 +4061,11 @@
39764061
<sha256 value="e73e2ed1110f18e663dbe6a86048df586ee4d2ad70c38af726a1b5df0fb9f87a" origin="Generated by Gradle"/>
39774062
</artifact>
39784063
</component>
4064+
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.0">
4065+
<artifact name="org.eclipse.osgi-3.23.0.jar">
4066+
<sha256 value="1ac113541a19f0c72c0421fb24058defca7e3c6f282e5ee73f14d2768a9ae653" origin="Generated by Gradle"/>
4067+
</artifact>
4068+
</component>
39794069
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.13.100">
39804070
<artifact name="org.eclipse.text-3.13.100.jar">
39814071
<sha256 value="89afa204e8e686eaa5f1464a6ceb65ac1b341ad1d0326cab6716c6733ecaf5ac" origin="Generated by Gradle"/>
@@ -3991,6 +4081,11 @@
39914081
<sha256 value="312e5e1c013f109b9e1c0d77e9611bb7a9567d0f2a079ce1bd851c043085713e" origin="Generated by Gradle"/>
39924082
</artifact>
39934083
</component>
4084+
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.14.300">
4085+
<artifact name="org.eclipse.text-3.14.300.jar">
4086+
<sha256 value="a3e66c15596165de0869da6d18ce0d837eaa0584ff988a27c95618066e55cf04" origin="Generated by Gradle"/>
4087+
</artifact>
4088+
</component>
39944089
<component group="org.eclipse.sisu" name="org.eclipse.sisu.inject" version="0.3.3">
39954090
<artifact name="org.eclipse.sisu.inject-0.3.3.jar">
39964091
<sha256 value="c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b" origin="Generated by Gradle"/>

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/huggingface/response/HuggingFaceRerankResponseEntityTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ private void assertMissingFieldThrowsIllegalArgumentException(String responseJso
134134
assertThat(thrownException.getMessage(), is("Required [" + missingField + "]"));
135135
}
136136

137-
private void assertTopNLimit(
138-
Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation) throws IOException {
137+
private void assertTopNLimit(Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation)
138+
throws IOException {
139139
when(REQUEST_MOCK.getTopN()).thenReturn(topN);
140140

141141
RankedDocsResults parsedResults = HuggingFaceRerankResponseEntity.fromResponse(

‎x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/job/retention/MockWritableIndexExpander.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ public static WritableIndexExpander create(boolean stateIndexWritable) {
3030
}
3131

3232
private static void mockWhenIndicesAreNotWritable(WritableIndexExpander writableIndexExpander) {
33-
when(writableIndexExpander.getWritableIndices(anyString()))
34-
.thenReturn(new ArrayList<>());
35-
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any()))
36-
.thenReturn(new ArrayList<>());
33+
when(writableIndexExpander.getWritableIndices(anyString())).thenReturn(new ArrayList<>());
34+
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any())).thenReturn(new ArrayList<>());
3735
}
3836

3937
private static void mockWhenIndicesAreWritable(WritableIndexExpander writableIndexExpander) {

‎x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/AuthenticationServiceTests.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ public void testAuthenticateCached() throws Exception {
791791

792792
public void testAuthenticateNonExistentRestRequestUserThrowsAuthenticationException() throws Exception {
793793
when(firstRealm.token(threadContext)).thenReturn(
794-
new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
794+
new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
795795
);
796796
try {
797797
authenticateBlocking(restRequest, null);
@@ -2069,23 +2069,23 @@ public void testExpiredToken() throws Exception {
20692069
when(projectIndex.indexExists()).thenReturn(true);
20702070
User user = new User("_username", "r1");
20712071
final Authentication expected = AuthenticationTestHelper.builder()
2072-
.user(user)
2073-
.realmRef(new RealmRef("realm", "custom", "node"))
2074-
.build(false);
2072+
.user(user)
2073+
.realmRef(new RealmRef("realm", "custom", "node"))
2074+
.build(false);
20752075
PlainActionFuture<TokenService.CreateTokenResult> tokenFuture = new PlainActionFuture<>();
20762076
Tuple<byte[], byte[]> newTokenBytes = tokenService.getRandomTokenBytes(randomBoolean());
20772077
try (ThreadContext.StoredContext ctx = threadContext.stashContext()) {
20782078
Authentication originatingAuth = AuthenticationTestHelper.builder()
2079-
.user(new User("creator"))
2080-
.realmRef(new RealmRef("test", "test", "test"))
2081-
.build(false);
2079+
.user(new User("creator"))
2080+
.realmRef(new RealmRef("test", "test", "test"))
2081+
.build(false);
20822082
tokenService.createOAuth2Tokens(
2083-
newTokenBytes.v1(),
2084-
newTokenBytes.v2(),
2085-
expected,
2086-
originatingAuth,
2087-
Collections.emptyMap(),
2088-
tokenFuture
2083+
newTokenBytes.v1(),
2084+
newTokenBytes.v2(),
2085+
expected,
2086+
originatingAuth,
2087+
Collections.emptyMap(),
2088+
tokenFuture
20892089
);
20902090
}
20912091
String token = tokenFuture.get().getAccessToken();
@@ -2104,8 +2104,8 @@ public void testExpiredToken() throws Exception {
21042104
}
21052105
threadContext.putHeader("Authorization", "Bearer " + token);
21062106
ElasticsearchSecurityException e = expectThrows(
2107-
ElasticsearchSecurityException.class,
2108-
() -> authenticateBlocking("_action", transportRequest, null, null)
2107+
ElasticsearchSecurityException.class,
2108+
() -> authenticateBlocking("_action", transportRequest, null, null)
21092109
);
21102110
if (requestIdAlreadyPresent) {
21112111
assertThat(expectAuditRequestId(threadContext), is(reqId.get()));

0 commit comments

Comments
 (0)