Skip to content

Commit 536ac88

Browse files
committed
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 <mulugeta.mammo@intel.com>
1 parent 7e851b5 commit 536ac88

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

build.gradle

+1-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ allprojects {
7777
version += "-SNAPSHOT"
7878
}
7979

80-
'java' {
80+
java {
8181
targetCompatibility = JavaVersion.VERSION_11
8282
sourceCompatibility = JavaVersion.VERSION_11
8383
}
@@ -231,7 +231,3 @@ task updateVersion {
231231
ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true)
232232
}
233233
}
234-
235-
configurations.all {
236-
resolutionStrategy.force 'com.fasterxml.jackson.core:jackson-core:2.17.0'
237-
}

gradle/formatting.gradle

-19
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,6 @@
99
* GitHub history for details.
1010
*/
1111

12-
/*
13-
* Licensed to Elasticsearch under one or more contributor
14-
* license agreements. See the NOTICE file distributed with
15-
* this work for additional information regarding copyright
16-
* ownership. Elasticsearch licenses this file to you under
17-
* the Apache License, Version 2.0 (the "License"); you may
18-
* not use this file except in compliance with the License.
19-
* You may obtain a copy of the License at
20-
*
21-
* http://www.apache.org/licenses/LICENSE-2.0
22-
*
23-
* Unless required by applicable law or agreed to in writing,
24-
* software distributed under the License is distributed on an
25-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
26-
* KIND, either express or implied. See the License for the
27-
* specific language governing permissions and limitations
28-
* under the License.
29-
*/
30-
3112
spotless {
3213
java {
3314
target '**/*.java'

0 commit comments

Comments
 (0)