Skip to content

Commit 4c574f9

Browse files
author
Vincent Potucek
committed
bump spotless to 7.2.1
1 parent 05f5620 commit 4c574f9

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public void apply(Project project) {
5959

6060
java.target("src/**/*.java");
6161
java.removeUnusedImports();
62+
java.removeWildcardImports();
6263

6364
// We enforce a standard order for imports
6465
java.importOrderFile(new File(elasticsearchWorkspace, importOrderPath));

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:6.25.0"
48+
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.2.1"
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: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<trust group="beats" name="metricbeat"/>
1010
<trust group="beats" name="metricbeat-fips"/>
1111
<trust group="elasticsearch-distribution" name="elasticsearch"/>
12-
<trust group="openjdk_.*" regex="true"/>
1312
<trust group="org.elasticsearch"/>
1413
<trust group="org.elasticsearch.distribution.zip" name="elasticsearch"/>
1514
<trust group="org.elasticsearch.ml"/>
1615
<trust group="org.elasticsearch.plugin"/>
1716
<trust file=".*-javadoc[.]jar" regex="true"/>
1817
<trust file=".*-sources[.]jar" regex="true"/>
18+
<trust group="openjdk_.*" regex="true"/>
1919
</trusted-artifacts>
2020
</configuration>
2121
<components>
@@ -252,6 +252,11 @@
252252
<sha256 value="caa88246e4f3b4d26e4c4b24b31db33a6758747429f6429702ab8dd75bd58e90" origin="Generated by Gradle"/>
253253
</artifact>
254254
</component>
255+
<component group="com.diffplug.spotless" name="spotless-lib" version="3.3.1">
256+
<artifact name="spotless-lib-3.3.1.jar">
257+
<sha256 value="7c74aa3d85e5f0563f06af05808cef62af8e378786f27dca40cfe817f402267b" origin="Generated by Gradle"/>
258+
</artifact>
259+
</component>
255260
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.45.0">
256261
<artifact name="spotless-lib-extra-2.45.0.jar">
257262
<sha256 value="602cbbcd3828ee9cfb2e30a7f9b30335c6927130771414d4cdd294d21fe5cb67" origin="Generated by Gradle"/>
@@ -262,6 +267,11 @@
262267
<sha256 value="58e3ddd55199ad74c28fa6490bad1e2b707d7aa4694d3611af2394af77fa2212" origin="Generated by Gradle"/>
263268
</artifact>
264269
</component>
270+
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.3.1">
271+
<artifact name="spotless-lib-extra-3.3.1.jar">
272+
<sha256 value="64c1219236fe562bdaa9aa3ba89531c3fab81ea232a4fffd46444df6399bf95a" origin="Generated by Gradle"/>
273+
</artifact>
274+
</component>
265275
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.25.0">
266276
<artifact name="spotless-plugin-gradle-6.25.0.jar">
267277
<sha256 value="f5eb908a4c5da46299e7543faada0402d2c4b77d58c7b432d4b6e59349b280a3" origin="Generated by Gradle"/>
@@ -272,6 +282,11 @@
272282
<sha256 value="a3609eeb7173837a589a4ad865e6feaf71ee6139d061eae2e698401485f7589c" origin="Generated by Gradle"/>
273283
</artifact>
274284
</component>
285+
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.2.1">
286+
<artifact name="spotless-plugin-gradle-7.2.1.jar">
287+
<sha256 value="ff5bd9bde1f21b486d0f87a96a2e90fad1d88971a04bef6941d94caa52e27afd" origin="Generated by Gradle"/>
288+
</artifact>
289+
</component>
275290
<component group="com.ethlo.time" name="itu" version="1.7.0">
276291
<artifact name="itu-1.7.0.jar">
277292
<sha256 value="55ceb418c9e8138c4fcf62e213c4c814d89e8a84c827d395407cbecba5d791e7" origin="Generated by Gradle"/>
@@ -1534,6 +1549,11 @@
15341549
<sha256 value="cc272e742da41a326623a83ec1b086832fe80869cbf0a19627887f1fb128312c" origin="Generated by Gradle"/>
15351550
</artifact>
15361551
</component>
1552+
<component group="dev.equo.ide" name="solstice" version="1.8.1">
1553+
<artifact name="solstice-1.8.1.jar">
1554+
<sha256 value="6e5ba2cce813be1d71ccdc2ecf3e49271b14e691bfbbb1a114cf3a30e773b10d" origin="Generated by Gradle"/>
1555+
</artifact>
1556+
</component>
15371557
<component group="dnsjava" name="dnsjava" version="2.1.7">
15381558
<artifact name="dnsjava-2.1.7.jar">
15391559
<sha256 value="2c52a6fabd5af9331d73fc7787dafc32a56bd8019c49f89749c2eeef244e303c" origin="Generated by Gradle"/>
@@ -3937,6 +3957,11 @@
39373957
<sha256 value="43f92f3adb681a5f3006b979e8d341c12a8cfd8029f287c42bcf0a80377565ae" origin="Generated by Gradle"/>
39383958
</artifact>
39393959
</component>
3960+
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.10.1.202505221210-r">
3961+
<artifact name="org.eclipse.jgit-6.10.1.202505221210-r.jar">
3962+
<sha256 value="8f0135ca45d00c4da8e7ba2e96d44e1ade452bf279d79ca4eb54921e8f27952c" origin="Generated by Gradle"/>
3963+
</artifact>
3964+
</component>
39403965
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.5.0.202303070854-r">
39413966
<artifact name="org.eclipse.jgit-6.5.0.202303070854-r.jar">
39423967
<sha256 value="9b4da8cde1651fa7a9f4d242585fe94343d40165e4c06ad5a722044a2cbe6251" origin="Generated by Gradle"/>
@@ -4092,6 +4117,11 @@
40924117
<sha256 value="11e61736689f0c1af46c9a852420058e10c6072f936c8308b6eca50e46dd38ef" origin="Generated by Gradle"/>
40934118
</artifact>
40944119
</component>
4120+
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.100">
4121+
<artifact name="org.eclipse.osgi-3.23.100.jar">
4122+
<sha256 value="9164f40fd0b424caf21ca6518186d2af82691f2a8de452f8a7d290b955280a21" origin="Generated by Gradle"/>
4123+
</artifact>
4124+
</component>
40954125
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.13.100">
40964126
<artifact name="org.eclipse.text-3.13.100.jar">
40974127
<sha256 value="89afa204e8e686eaa5f1464a6ceb65ac1b341ad1d0326cab6716c6733ecaf5ac" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)