mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-06-28 09:28:55 -04:00
[Gradle] Spotless plugin update (#115750)
- provides better configuration cache support - requires some rework due to changed defaults
This commit is contained in:
parent
17d463f6bf
commit
6370d600b0
6 changed files with 213 additions and 41 deletions
|
@ -381,7 +381,6 @@ tasks.named("jar") {
|
|||
|
||||
spotless {
|
||||
java {
|
||||
|
||||
// workaround for https://github.com/diffplug/spotless/issues/2317
|
||||
//toggleOffOn()
|
||||
target project.fileTree("src/main/java") {
|
||||
|
|
|
@ -45,7 +45,7 @@ snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.
|
|||
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
|
||||
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
|
||||
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }
|
||||
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
|
||||
spotless-plugin = "com.diffplug.spotless:spotless-plugin-gradle:7.0.4"
|
||||
wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
|
||||
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
|
||||
|
||||
|
|
|
@ -201,6 +201,11 @@
|
|||
<sha256 value="81e2b639a7e4be6dc9b7245713cf06f5cab51f29db2e16b9b57645c96fde2884" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.durian" name="durian-swt.os" version="4.3.1">
|
||||
<artifact name="durian-swt.os-4.3.1.jar">
|
||||
<sha256 value="8fcf4f4fecb6c0b4f1ef8de4c979bd5bcfb886b689b48556cbf33cf181ad4464" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-eclipse-base" version="3.5.2">
|
||||
<artifact name="spotless-eclipse-base-3.5.2.jar">
|
||||
<sha256 value="e381d6996a3d7f41c02d79bd0b1dff077aaec40b55fa15971c1bb45ab16f5a20" origin="Generated by Gradle"/>
|
||||
|
@ -211,34 +216,34 @@
|
|||
<sha256 value="e983d13b1051f8dc49820970aa8da80364857cecf46d78d1b509366e523186bd" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib" version="2.45.0">
|
||||
<artifact name="spotless-lib-2.45.0.jar">
|
||||
<sha256 value="b25969972e1d980280ca2ae529197ed9b3160aae48b506cf1935f01bd1318667" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib" version="3.0.2">
|
||||
<artifact name="spotless-lib-3.0.2.jar">
|
||||
<sha256 value="3f9a7fdfc5b03ac20894834170910c15c4f2b84ed4ce3677898a307ad589837c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib" version="3.0.0.BETA3">
|
||||
<artifact name="spotless-lib-3.0.0.BETA3.jar">
|
||||
<sha256 value="caa88246e4f3b4d26e4c4b24b31db33a6758747429f6429702ab8dd75bd58e90" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib" version="3.1.2">
|
||||
<artifact name="spotless-lib-3.1.2.jar">
|
||||
<sha256 value="a80e31bf6acb481802988bee55590815b0988d68607b6a586ffc775cdf8a9b3f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="2.45.0">
|
||||
<artifact name="spotless-lib-extra-2.45.0.jar">
|
||||
<sha256 value="602cbbcd3828ee9cfb2e30a7f9b30335c6927130771414d4cdd294d21fe5cb67" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.2">
|
||||
<artifact name="spotless-lib-extra-3.0.2.jar">
|
||||
<sha256 value="b0e77746d633d445e78489ac3d08ad2ea1b3537c4d064e4abe46cc42d62303eb" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.0.0.BETA3">
|
||||
<artifact name="spotless-lib-extra-3.0.0.BETA3.jar">
|
||||
<sha256 value="58e3ddd55199ad74c28fa6490bad1e2b707d7aa4694d3611af2394af77fa2212" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-lib-extra" version="3.1.2">
|
||||
<artifact name="spotless-lib-extra-3.1.2.jar">
|
||||
<sha256 value="37c9bbde63d5cebb293321c1cfd046fc7a05cd066abda9da52aa63a8ea676f74" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="6.25.0">
|
||||
<artifact name="spotless-plugin-gradle-6.25.0.jar">
|
||||
<sha256 value="f5eb908a4c5da46299e7543faada0402d2c4b77d58c7b432d4b6e59349b280a3" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.2">
|
||||
<artifact name="spotless-plugin-gradle-7.0.2.jar">
|
||||
<sha256 value="59a34c4f84a48d4c8d929e2f89906369e65476ec0499a43de87c3e4127977cd5" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.0.BETA3">
|
||||
<artifact name="spotless-plugin-gradle-7.0.0.BETA3.jar">
|
||||
<sha256 value="a3609eeb7173837a589a4ad865e6feaf71ee6139d061eae2e698401485f7589c" origin="Generated by Gradle"/>
|
||||
<component group="com.diffplug.spotless" name="spotless-plugin-gradle" version="7.0.4">
|
||||
<artifact name="spotless-plugin-gradle-7.0.4.jar">
|
||||
<sha256 value="23557cdec130b4bb2ca2d30eda2398325e09dfe6b990d2eacd9d5f39a1dede71" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="com.ethlo.time" name="itu" version="1.7.0">
|
||||
|
@ -1423,6 +1428,11 @@
|
|||
<sha256 value="cc272e742da41a326623a83ec1b086832fe80869cbf0a19627887f1fb128312c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dev.equo.ide" name="solstice" version="1.8.1">
|
||||
<artifact name="solstice-1.8.1.jar">
|
||||
<sha256 value="6e5ba2cce813be1d71ccdc2ecf3e49271b14e691bfbbb1a114cf3a30e773b10d" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="dnsjava" name="dnsjava" version="2.1.7">
|
||||
<artifact name="dnsjava-2.1.7.jar">
|
||||
<sha256 value="2c52a6fabd5af9331d73fc7787dafc32a56bd8019c49f89749c2eeef244e303c" origin="Generated by Gradle"/>
|
||||
|
@ -1781,6 +1791,16 @@
|
|||
<sha256 value="8ce969116cac95bd61b07a8d5e07174b352e63301473caac72c395e3c08488d2" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="net.java.dev.jna" name="jna-platform" version="5.15.0">
|
||||
<artifact name="jna-platform-5.15.0.jar">
|
||||
<sha256 value="18b7f6e7d34ce89309a6d9052ae1a987e8e64057e2f683e01e50f2f2b59cd153" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="net.java.dev.jna" name="jna-platform" version="5.16.0">
|
||||
<artifact name="jna-platform-5.16.0.jar">
|
||||
<sha256 value="e5a79523964509757555782bb60283e4902611013f107e4600dc93298f73f382" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="net.java.dev.jna" name="jna-platform" version="5.7.0">
|
||||
<artifact name="jna-platform-5.7.0.jar">
|
||||
<sha256 value="42e020705692eddbd285e2b72ef0ff468f51a926382569c45f4e9cea4602ad1e" origin="Generated by Gradle"/>
|
||||
|
@ -2385,6 +2405,11 @@
|
|||
<sha256 value="dd9d920101890ecd0565a8e48bf3f80bbe3d398cdf0f1970a19eec4f54c8d4e1" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.12">
|
||||
<artifact name="org.apache.felix.scr-2.2.12.jar">
|
||||
<sha256 value="c35bdaa7e366cf7f8806305105890e2731f29d173e593e441f401cfbf1017696" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.apache.felix" name="org.apache.felix.scr" version="2.2.6">
|
||||
<artifact name="org.apache.felix.scr-2.2.6.jar">
|
||||
<sha256 value="24c0b2d8081cbc9624e60a1c19f1dd0d104e014cdba4038d9b1aed0ab63721c6" origin="Generated by Gradle"/>
|
||||
|
@ -3626,6 +3651,16 @@
|
|||
<sha256 value="97c566b120009c203a2fc8b291f4a9adbc171cf1ccb70f06f6b4e1828c00ce8e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jdt" name="ecj" version="3.40.0">
|
||||
<artifact name="ecj-3.40.0.jar">
|
||||
<sha256 value="05cc22a24e7982970f63a405fc6c820bc80b806f27f3c5a6236fc475f8f7152b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jdt" name="ecj" version="3.41.0">
|
||||
<artifact name="ecj-3.41.0.jar">
|
||||
<sha256 value="47bda183cd94a8bdb704f5b35690224f75b7d2fb563c8b8f9bbcfab987c3029b" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.35.0">
|
||||
<artifact name="org.eclipse.jdt.core-3.35.0.jar">
|
||||
<sha256 value="8f5bcb00355b271638b9d82a8cccd0e733225cb74c4a3f0f55a7b75d43ee442a" origin="Generated by Gradle"/>
|
||||
|
@ -3636,6 +3671,16 @@
|
|||
<sha256 value="f0387e80ed4327d39f1f63da8773ee460af4edd78f7c2efecb4ba9bc0628bf60" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.40.0">
|
||||
<artifact name="org.eclipse.jdt.core-3.40.0.jar">
|
||||
<sha256 value="aa9cd22885bd514b18b5eee7a2b3ef8a06e1d83b2adcc4148dc2c31ef81c0525" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jdt" name="org.eclipse.jdt.core" version="3.41.0">
|
||||
<artifact name="org.eclipse.jdt.core-3.41.0.jar">
|
||||
<sha256 value="88aff1ec4f6b52105971bdbbb5e1a0636b9046ee1bafc3b25b467172da9a079e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jetty" name="jetty-annotations" version="9.4.40.v20210413">
|
||||
<artifact name="jetty-annotations-9.4.40.v20210413.jar">
|
||||
<sha256 value="faccdc2113daf5ace9157cacd98751a41280fec94f584fd571b7fc26ff84742d" origin="Generated by Gradle"/>
|
||||
|
@ -3746,6 +3791,11 @@
|
|||
<sha256 value="43f92f3adb681a5f3006b979e8d341c12a8cfd8029f287c42bcf0a80377565ae" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.10.1.202505221210-r">
|
||||
<artifact name="org.eclipse.jgit-6.10.1.202505221210-r.jar">
|
||||
<sha256 value="8f0135ca45d00c4da8e7ba2e96d44e1ade452bf279d79ca4eb54921e8f27952c" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.jgit" name="org.eclipse.jgit" version="6.5.0.202303070854-r">
|
||||
<artifact name="org.eclipse.jgit-6.5.0.202303070854-r.jar">
|
||||
<sha256 value="9b4da8cde1651fa7a9f4d242585fe94343d40165e4c06ad5a722044a2cbe6251" origin="Generated by Gradle"/>
|
||||
|
@ -3766,6 +3816,16 @@
|
|||
<sha256 value="443adcdec30c0563e4d7bafe6f7eeca704749e4b5a8620d18626fb1d640b41f7" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.12.200">
|
||||
<artifact name="org.eclipse.core.commands-3.12.200.jar">
|
||||
<sha256 value="ed66bd24d74e7b3aacd2e6f1cfe4087690b579a409fae7b8c57fb2cb9df46cf4" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.commands" version="3.12.300">
|
||||
<artifact name="org.eclipse.core.commands-3.12.300.jar">
|
||||
<sha256 value="c936d69ac4fee9da0d11dd4420d9d622d0c6b5f19e97a47d1f22cfd44d45282a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.9.100">
|
||||
<artifact name="org.eclipse.core.contenttype-3.9.100.jar">
|
||||
<sha256 value="707e81707e8f2843be90f621aa3b7ff318dd3244e6f4a2982af55f66faf55987" origin="Generated by Gradle"/>
|
||||
|
@ -3776,6 +3836,11 @@
|
|||
<sha256 value="7622d903f85e8c11afe6ae662ffa1a2c33a5f694c6510758299f070ec520d4ca" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.contenttype" version="3.9.600">
|
||||
<artifact name="org.eclipse.core.contenttype-3.9.600.jar">
|
||||
<sha256 value="d8a2974f5ec3d7cfb8e3e177aa7303babed0a1565dbe5416084a751044255002" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.expressions" version="3.9.100">
|
||||
<artifact name="org.eclipse.core.expressions-3.9.100.jar">
|
||||
<sha256 value="72736638d17cef9183659590d99fd7262a601ed2e3723295737a638db24e23fd" origin="Generated by Gradle"/>
|
||||
|
@ -3796,6 +3861,11 @@
|
|||
<sha256 value="7cfc4f8aee8c1b399dcbe105e10e096a9e2f21dc56b28a3c7aa42cf0a5023682" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.filesystem" version="1.11.100">
|
||||
<artifact name="org.eclipse.core.filesystem-1.11.100.jar">
|
||||
<sha256 value="e97dced18aac77726d8fce40c5a398146a995af7cf8caec1f7fc4a8afbc7a810" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.0">
|
||||
<artifact name="org.eclipse.core.jobs-3.15.0.jar">
|
||||
<sha256 value="857df690c6424a6558b5c96732958f03b9c209258562caf93d9fcbc13242fa11" origin="Generated by Gradle"/>
|
||||
|
@ -3806,6 +3876,16 @@
|
|||
<sha256 value="ad6db9d0e7d8579d01b750fdced6d6e1d410919047d4bfd3b7d6a65627e5063a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.400">
|
||||
<artifact name="org.eclipse.core.jobs-3.15.400.jar">
|
||||
<sha256 value="2be3d118c967756858c612d834cc121393e6c2743e83f1559fd3ae867a82d7b9" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.jobs" version="3.15.500">
|
||||
<artifact name="org.eclipse.core.jobs-3.15.500.jar">
|
||||
<sha256 value="189199cd46a284220b7b97fd59218b533fe9fd8e0ad22258f674a3f2df4de7c9" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.19.100">
|
||||
<artifact name="org.eclipse.core.resources-3.19.100.jar">
|
||||
<sha256 value="537af88de2c0e602446ab0fa9dcfec29c617f0891b96fc4cc3fba1655edcc91b" origin="Generated by Gradle"/>
|
||||
|
@ -3816,6 +3896,16 @@
|
|||
<sha256 value="8b51dd0c72e54ecfd4b56a160769ca00a0d944ace10d47ef372fa4e103698b13" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.22.0">
|
||||
<artifact name="org.eclipse.core.resources-3.22.0.jar">
|
||||
<sha256 value="366789a319a4c6c911e0f1a5777ff3bad712139fb795e4ced89ed79aa45444c2" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.resources" version="3.22.100">
|
||||
<artifact name="org.eclipse.core.resources-3.22.100.jar">
|
||||
<sha256 value="0d534030b9c76d0f7b8affc3b22d1a772506b64888e44d6b06806dd400792318" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.29.0">
|
||||
<artifact name="org.eclipse.core.runtime-3.29.0.jar">
|
||||
<sha256 value="096373dff05c425cb37e4924b25b3532a8f8c2992f36d4b6266b0e05a19af814" origin="Generated by Gradle"/>
|
||||
|
@ -3826,6 +3916,16 @@
|
|||
<sha256 value="aa484a9f9ecb6a2575d19d1a73bd943dbc9b2292751f4874109b7ac67fd904a8" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.32.0">
|
||||
<artifact name="org.eclipse.core.runtime-3.32.0.jar">
|
||||
<sha256 value="faf6b6584b82420609a20f7bf18cbe67c890a7d3b69b6158110e9d3c38fb36cc" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.core.runtime" version="3.33.0">
|
||||
<artifact name="org.eclipse.core.runtime-3.33.0.jar">
|
||||
<sha256 value="ff59efb6fb7d610d819d44777bd306860ec7926cd31ac95419e729edfb38cc02" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.6.300">
|
||||
<artifact name="org.eclipse.equinox.app-1.6.300.jar">
|
||||
<sha256 value="eaeb288c9bc78916027d3933d7d1f78c1b8675d54a55a7abdea161b001b7adf1" origin="Generated by Gradle"/>
|
||||
|
@ -3836,6 +3936,16 @@
|
|||
<sha256 value="7ebd054bc03da4d61abc166d22df41cfa0e49963a5b0c4b32dbe0b769b6c216d" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.7.200">
|
||||
<artifact name="org.eclipse.equinox.app-1.7.200.jar">
|
||||
<sha256 value="4584f6a46013aa3ecaf5b1ac67ac6e1bdc5ce7ba89ce61d857047cff30bd92f4" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.app" version="1.7.300">
|
||||
<artifact name="org.eclipse.equinox.app-1.7.300.jar">
|
||||
<sha256 value="ca5d75f9228510f19250ef947e340a7a2cdebd1a888efdf13a3f3a4b114d4d2e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.18.100">
|
||||
<artifact name="org.eclipse.equinox.common-3.18.100.jar">
|
||||
<sha256 value="7c15db46dda5f6f1ff9ecac10eb6ffa9ed1cbd0ed5e6996cb95f0e390902700e" origin="Generated by Gradle"/>
|
||||
|
@ -3846,6 +3956,16 @@
|
|||
<sha256 value="77da20b3d040b9a00509add8583c659243a62e9f9633bc3f82b55e96b0a09427" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.19.200">
|
||||
<artifact name="org.eclipse.equinox.common-3.19.200.jar">
|
||||
<sha256 value="e7d5c60fde47984fb4f0e17ad572792e9f852e49973570fd92c3d72b08136d0f" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.common" version="3.20.0">
|
||||
<artifact name="org.eclipse.equinox.common-3.20.0.jar">
|
||||
<sha256 value="617c5d7e759276b7e9ed363c56a6714b7f21d4a812d533fcb90e48723cc4c001" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.6.200">
|
||||
<artifact name="org.eclipse.equinox.event-1.6.200.jar">
|
||||
<sha256 value="b83c7f7023a3c30daa75e112f3ad2c6d8c30108e19bbe84ec2d25b8bad0efe7a" origin="Generated by Gradle"/>
|
||||
|
@ -3856,6 +3976,11 @@
|
|||
<sha256 value="9f7dbc1ced29e627cb228ec205be7f4e496330eee450b31cb94c7973e4459561" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.event" version="1.7.200">
|
||||
<artifact name="org.eclipse.equinox.event-1.7.200.jar">
|
||||
<sha256 value="81afa6c1e9ec3e85f9884d0edd44865234091111565e5b44c1e3046ebf44dd11" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.10.300">
|
||||
<artifact name="org.eclipse.equinox.preferences-3.10.300.jar">
|
||||
<sha256 value="0e231ed4443b1bb21e16ec13a83e975bc04b0503eac2ce6f4b4a7d7b2f53956d" origin="Generated by Gradle"/>
|
||||
|
@ -3866,6 +3991,16 @@
|
|||
<sha256 value="2dece57392142293cd35b58132b7f6bb0ac599a35f2ce734fd2551440ec27b47" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.11.200">
|
||||
<artifact name="org.eclipse.equinox.preferences-3.11.200.jar">
|
||||
<sha256 value="80bbf8d76313b0136ee95fa883fc16f958a52bec453bb9b4c794ab24dbde8097" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.preferences" version="3.11.300">
|
||||
<artifact name="org.eclipse.equinox.preferences-3.11.300.jar">
|
||||
<sha256 value="7f8b452ee5f9d836db8534c6bd1a29a2662352d868ff94856b6b54bc8032a999" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.11.300">
|
||||
<artifact name="org.eclipse.equinox.registry-3.11.300.jar">
|
||||
<sha256 value="3acbb9c857bae9093f3308aff5abe72be5eabcb23e2791139d3571cade659da0" origin="Generated by Gradle"/>
|
||||
|
@ -3876,6 +4011,16 @@
|
|||
<sha256 value="23ded56b950ae846e006870f836c29b8d545f3a7bf9ced28baf41b5a2e5e8dbb" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.12.200">
|
||||
<artifact name="org.eclipse.equinox.registry-3.12.200.jar">
|
||||
<sha256 value="2a80f6dcb1bfc594e8653db59ef6843b8ae17909759303687779dafa9b29a5d6" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.registry" version="3.12.300">
|
||||
<artifact name="org.eclipse.equinox.registry-3.12.300.jar">
|
||||
<sha256 value="e2145418ff639b44ff50e83b66848f40ae38c869db6b8f95044bbb5d0d652722" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.10.700">
|
||||
<artifact name="org.eclipse.equinox.supplement-1.10.700.jar">
|
||||
<sha256 value="5df4309856c79492807c17f116ca112ea83c7dd04c2c01049f5d3b4811135068" origin="Generated by Gradle"/>
|
||||
|
@ -3886,6 +4031,16 @@
|
|||
<sha256 value="6edca163c9e251e8500765206b5728f91a929f664b692d6a5affb1ef644614ab" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.11.100">
|
||||
<artifact name="org.eclipse.equinox.supplement-1.11.100.jar">
|
||||
<sha256 value="86ef86bd058c91a35ad09a53573191ebe9ab62959f13c0090a089c9aea067ff2" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.equinox.supplement" version="1.12.0">
|
||||
<artifact name="org.eclipse.equinox.supplement-1.12.0.jar">
|
||||
<sha256 value="09a5f2962dcc5ec4ca7e730d17e0ca562f38d27b80e218043a130febb9131293" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.18.300">
|
||||
<artifact name="org.eclipse.osgi-3.18.300.jar">
|
||||
<sha256 value="bab943e58edd17309238672dba7a45aec9e2dacbdddb818a8cf17723ea13fa22" origin="Generated by Gradle"/>
|
||||
|
@ -3901,6 +4056,16 @@
|
|||
<sha256 value="11e61736689f0c1af46c9a852420058e10c6072f936c8308b6eca50e46dd38ef" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.22.0">
|
||||
<artifact name="org.eclipse.osgi-3.22.0.jar">
|
||||
<sha256 value="e73e2ed1110f18e663dbe6a86048df586ee4d2ad70c38af726a1b5df0fb9f87a" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.osgi" version="3.23.0">
|
||||
<artifact name="org.eclipse.osgi-3.23.0.jar">
|
||||
<sha256 value="1ac113541a19f0c72c0421fb24058defca7e3c6f282e5ee73f14d2768a9ae653" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.13.100">
|
||||
<artifact name="org.eclipse.text-3.13.100.jar">
|
||||
<sha256 value="89afa204e8e686eaa5f1464a6ceb65ac1b341ad1d0326cab6716c6733ecaf5ac" origin="Generated by Gradle"/>
|
||||
|
@ -3911,6 +4076,16 @@
|
|||
<sha256 value="7c9791768a715b1fef29dec8ba6a15a968bcc1cf7a766d439273fe52362eec65" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.14.200">
|
||||
<artifact name="org.eclipse.text-3.14.200.jar">
|
||||
<sha256 value="312e5e1c013f109b9e1c0d77e9611bb7a9567d0f2a079ce1bd851c043085713e" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.platform" name="org.eclipse.text" version="3.14.300">
|
||||
<artifact name="org.eclipse.text-3.14.300.jar">
|
||||
<sha256 value="a3e66c15596165de0869da6d18ce0d837eaa0584ff988a27c95618066e55cf04" origin="Generated by Gradle"/>
|
||||
</artifact>
|
||||
</component>
|
||||
<component group="org.eclipse.sisu" name="org.eclipse.sisu.inject" version="0.3.3">
|
||||
<artifact name="org.eclipse.sisu.inject-0.3.3.jar">
|
||||
<sha256 value="c6935e0b7d362ed4ca768c9b71d5d4d98788ff0a79c0d2bb954c221a078b166b" origin="Generated by Gradle"/>
|
||||
|
|
|
@ -134,8 +134,8 @@ public class HuggingFaceRerankResponseEntityTests extends ESTestCase {
|
|||
assertThat(thrownException.getMessage(), is("Required [" + missingField + "]"));
|
||||
}
|
||||
|
||||
private void assertTopNLimit(
|
||||
Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation) throws IOException {
|
||||
private void assertTopNLimit(Integer topN, String responseJson, List<RankedDocsResultsTests.RerankExpectation> expectation)
|
||||
throws IOException {
|
||||
when(REQUEST_MOCK.getTopN()).thenReturn(topN);
|
||||
|
||||
RankedDocsResults parsedResults = HuggingFaceRerankResponseEntity.fromResponse(
|
||||
|
|
|
@ -30,10 +30,8 @@ public class MockWritableIndexExpander {
|
|||
}
|
||||
|
||||
private static void mockWhenIndicesAreNotWritable(WritableIndexExpander writableIndexExpander) {
|
||||
when(writableIndexExpander.getWritableIndices(anyString()))
|
||||
.thenReturn(new ArrayList<>());
|
||||
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any()))
|
||||
.thenReturn(new ArrayList<>());
|
||||
when(writableIndexExpander.getWritableIndices(anyString())).thenReturn(new ArrayList<>());
|
||||
when(writableIndexExpander.getWritableIndices(ArgumentMatchers.<Collection<String>>any())).thenReturn(new ArrayList<>());
|
||||
}
|
||||
|
||||
private static void mockWhenIndicesAreWritable(WritableIndexExpander writableIndexExpander) {
|
||||
|
|
|
@ -791,7 +791,7 @@ public class AuthenticationServiceTests extends ESTestCase {
|
|||
|
||||
public void testAuthenticateNonExistentRestRequestUserThrowsAuthenticationException() throws Exception {
|
||||
when(firstRealm.token(threadContext)).thenReturn(
|
||||
new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
|
||||
new UsernamePasswordToken("idonotexist", new SecureString("passwd".toCharArray()))
|
||||
);
|
||||
try {
|
||||
authenticateBlocking(restRequest, null);
|
||||
|
@ -2069,23 +2069,23 @@ public class AuthenticationServiceTests extends ESTestCase {
|
|||
when(projectIndex.indexExists()).thenReturn(true);
|
||||
User user = new User("_username", "r1");
|
||||
final Authentication expected = AuthenticationTestHelper.builder()
|
||||
.user(user)
|
||||
.realmRef(new RealmRef("realm", "custom", "node"))
|
||||
.build(false);
|
||||
.user(user)
|
||||
.realmRef(new RealmRef("realm", "custom", "node"))
|
||||
.build(false);
|
||||
PlainActionFuture<TokenService.CreateTokenResult> tokenFuture = new PlainActionFuture<>();
|
||||
Tuple<byte[], byte[]> newTokenBytes = tokenService.getRandomTokenBytes(randomBoolean());
|
||||
try (ThreadContext.StoredContext ctx = threadContext.stashContext()) {
|
||||
Authentication originatingAuth = AuthenticationTestHelper.builder()
|
||||
.user(new User("creator"))
|
||||
.realmRef(new RealmRef("test", "test", "test"))
|
||||
.build(false);
|
||||
.user(new User("creator"))
|
||||
.realmRef(new RealmRef("test", "test", "test"))
|
||||
.build(false);
|
||||
tokenService.createOAuth2Tokens(
|
||||
newTokenBytes.v1(),
|
||||
newTokenBytes.v2(),
|
||||
expected,
|
||||
originatingAuth,
|
||||
Collections.emptyMap(),
|
||||
tokenFuture
|
||||
newTokenBytes.v1(),
|
||||
newTokenBytes.v2(),
|
||||
expected,
|
||||
originatingAuth,
|
||||
Collections.emptyMap(),
|
||||
tokenFuture
|
||||
);
|
||||
}
|
||||
String token = tokenFuture.get().getAccessToken();
|
||||
|
@ -2104,8 +2104,8 @@ public class AuthenticationServiceTests extends ESTestCase {
|
|||
}
|
||||
threadContext.putHeader("Authorization", "Bearer " + token);
|
||||
ElasticsearchSecurityException e = expectThrows(
|
||||
ElasticsearchSecurityException.class,
|
||||
() -> authenticateBlocking("_action", transportRequest, null, null)
|
||||
ElasticsearchSecurityException.class,
|
||||
() -> authenticateBlocking("_action", transportRequest, null, null)
|
||||
);
|
||||
if (requestIdAlreadyPresent) {
|
||||
assertThat(expectAuditRequestId(threadContext), is(reqId.get()));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue