Skip to content

Commit

Permalink
Fix three minor issues:
Browse files Browse the repository at this point in the history
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 <mulugeta.mammo@intel.com>
  • Loading branch information
mulugetam committed Mar 15, 2024
1 parent 7e851b5 commit 536ac88
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 24 deletions.
6 changes: 1 addition & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ allprojects {
version += "-SNAPSHOT"
}

'java' {
java {
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_11
}
Expand Down Expand Up @@ -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'
}
19 changes: 0 additions & 19 deletions gradle/formatting.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down

0 comments on commit 536ac88

Please sign in to comment.