Skip to content

Commit 5b76280

Browse files
committed
Leave the formatting project list empty, so we can merge the Gradle changes
1 parent 82c44b7 commit 5b76280

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed
File renamed without changes.

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ subprojects {
100100
project.licenseFile = project.rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
101101
project.noticeFile = project.rootProject.file('NOTICE.txt')
102102

103-
// Projects that should be formatted with Spotless are listed here, by
104-
// project path. Once the number of formatted projects is greater than
105-
// the number of unformatted projects, this can be switched to an
106-
// exclude list, and eventualy removed completely.
103+
// Projects that should be formatted and checked with Spotless are
104+
// listed here, by project path. Once the number of formatted projects
105+
// is greater than the number of unformatted projects, this can be
106+
// switched to an exclude list, and eventualy removed completely.
107107
def projectPathsToFormat = [
108-
':build-tools'
108+
// ':build-tools'
109109
]
110110

111111
if (projectPathsToFormat.contains(project.path)) {
@@ -115,7 +115,7 @@ subprojects {
115115
java {
116116

117117
removeUnusedImports()
118-
eclipse().configFile rootProject.file('elasticsearch.eclipseformat.xml')
118+
eclipse().configFile rootProject.file('.eclipseformat.xml')
119119
trimTrailingWhitespace()
120120
endWithNewline()
121121

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ dependencies {
112112
compile 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
113113
compile 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
114114
compile 'com.netflix.nebula:gradle-info-plugin:3.0.3'
115-
compile 'org.eclipse.jgit:org.eclipse.jgit:3.2.0.201312181205-r'
115+
compile 'org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r'
116116
compile 'com.perforce:p4java:2012.3.551082' // THIS IS SUPPOSED TO BE OPTIONAL IN THE FUTURE....
117117
compile 'org.apache.rat:apache-rat:0.11'
118118
compile "org.elasticsearch:jna:4.5.1"

0 commit comments

Comments
 (0)