Skip to content

Commit

Permalink
Fix libs:ssl-config project setup (#39074)
Browse files Browse the repository at this point in the history
The build script file for the `:libs:elasticsearch-ssl-config` and
`:libs:ssl-config-tests` projects was incorrectly named `eclipse.build.gradle`
 while the expected name was `eclipse-build.gradle`.
In addition, this also adds a missing snippet in the `build.gradle` conf file,
that fixes the project setup for Eclipse users.
  • Loading branch information
albertzaharovits committed Feb 19, 2019
1 parent 6bc88b0 commit 5c30446
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
14 changes: 14 additions & 0 deletions libs/ssl-config/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,23 @@ dependencies {
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
}

if (isEclipse) {
// in eclipse the project is under a fake root, we need to change around the source sets
sourceSets {
if (project.path == ":libs:ssl-config") {
main.java.srcDirs = ['java']
main.resources.srcDirs = ['resources']
} else {
test.java.srcDirs = ['java']
test.resources.srcDirs = ['resources']
}
}
}

forbiddenApisMain {
replaceSignatureFiles 'jdk-signatures'
}

forbiddenPatterns {
exclude '**/*.key'
exclude '**/*.pem'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// this is just shell gradle file for eclipse to have separate projects for geo src and tests
// this is just shell gradle file for eclipse to have separate projects for ssl-config src and tests
apply from: '../../build.gradle'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// this is just shell gradle file for eclipse to have separate projects for geo src and tests
// this is just shell gradle file for eclipse to have separate projects for ssl-config src and tests
apply from: '../../build.gradle'
dependencies {
testCompile project(':libs:elasticsearch-ssl-config')
}
}

0 comments on commit 5c30446

Please sign in to comment.