From 536ac886f2a35824c21b8b5766463558776a6f39 Mon Sep 17 00:00:00 2001 From: Mulugeta Mammo Date: Fri, 15 Mar 2024 14:09:33 -0400 Subject: [PATCH] Fix three minor issues: 1) Remove the Elasticsearch attribution in spotless formatter. 2) Use java instead of 'java'. 3) Remove version resolution for jackson. Signed-off-by: Mulugeta Mammo --- build.gradle | 6 +----- gradle/formatting.gradle | 19 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index ec5a827..56d4261 100644 --- a/build.gradle +++ b/build.gradle @@ -77,7 +77,7 @@ allprojects { version += "-SNAPSHOT" } - 'java' { + java { targetCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11 } @@ -231,7 +231,3 @@ task updateVersion { ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) } } - -configurations.all { - resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.17.0' -} diff --git a/gradle/formatting.gradle b/gradle/formatting.gradle index 0cd9485..37b4b07 100644 --- a/gradle/formatting.gradle +++ b/gradle/formatting.gradle @@ -9,25 +9,6 @@ * GitHub history for details. */ -/* - * Licensed to Elasticsearch under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - spotless { java { target '**/*.java'