diff --git a/build.gradle b/build.gradle index 7accde344637a..3c87c3ca05624 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ plugins { id 'lifecycle-base' id 'opensearch.docker-support' id 'opensearch.global-build-info' - id "com.diffplug.spotless" version "5.6.1" apply false + id "com.diffplug.spotless" version "6.2.0" apply false } apply from: 'gradle/build-complete.gradle' @@ -168,8 +168,7 @@ tasks.register("verifyVersions") { // Read the list from maven central. // Fetch the metadata and parse the xml into Version instances because it's more straight forward here // rather than bwcVersion ( VersionCollection ). - //TODO OpenSearch - Update the maven repo URL for OpenSearch when available. - new URL('https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch/maven-metadata.xml').openStream().withStream { s -> + new URL('https://repo1.maven.org/maven2/org/opensearch/opensearch/maven-metadata.xml').openStream().withStream { s -> BuildParams.bwcVersions.compareToAuthoritative( new XmlParser().parse(s) .versioning.versions.version @@ -433,11 +432,11 @@ allprojects { tasks.named('cleanEclipse') { dependsOn 'wipeEclipseSettings' } // otherwise the eclipse merging is *super confusing* tasks.named('eclipse') { dependsOn 'cleanEclipse', 'copyEclipseSettings' } - + afterEvaluate { tasks.findByName("eclipseJdt")?.configure { dependsOn 'copyEclipseSettings' - } + } } }