Skip to content

Commit

Permalink
Leave the formatting project list empty, so we can merge the Gradle c…
Browse files Browse the repository at this point in the history
…hanges
  • Loading branch information
pugnascotia committed Sep 25, 2019
1 parent 82c44b7 commit 5b76280
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
File renamed without changes.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ subprojects {
project.licenseFile = project.rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
project.noticeFile = project.rootProject.file('NOTICE.txt')

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

if (projectPathsToFormat.contains(project.path)) {
Expand All @@ -115,7 +115,7 @@ subprojects {
java {

removeUnusedImports()
eclipse().configFile rootProject.file('elasticsearch.eclipseformat.xml')
eclipse().configFile rootProject.file('.eclipseformat.xml')
trimTrailingWhitespace()
endWithNewline()

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ dependencies {
compile 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
compile 'com.netflix.nebula:nebula-publishing-plugin:4.4.4'
compile 'com.netflix.nebula:gradle-info-plugin:3.0.3'
compile 'org.eclipse.jgit:org.eclipse.jgit:3.2.0.201312181205-r'
compile 'org.eclipse.jgit:org.eclipse.jgit:5.5.0.201909110433-r'
compile 'com.perforce:p4java:2012.3.551082' // THIS IS SUPPOSED TO BE OPTIONAL IN THE FUTURE....
compile 'org.apache.rat:apache-rat:0.11'
compile "org.elasticsearch:jna:4.5.1"
Expand Down

0 comments on commit 5b76280

Please sign in to comment.