Skip to content

Commit 35d40ec

Browse files
Fix libs:ssl-config project setup (#39074)
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.
1 parent 3ae42c8 commit 35d40ec

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

libs/ssl-config/build.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,23 @@ dependencies {
3434
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
3535
}
3636

37+
if (isEclipse) {
38+
// in eclipse the project is under a fake root, we need to change around the source sets
39+
sourceSets {
40+
if (project.path == ":libs:ssl-config") {
41+
main.java.srcDirs = ['java']
42+
main.resources.srcDirs = ['resources']
43+
} else {
44+
test.java.srcDirs = ['java']
45+
test.resources.srcDirs = ['resources']
46+
}
47+
}
48+
}
49+
3750
forbiddenApisMain {
3851
replaceSignatureFiles 'jdk-signatures'
3952
}
53+
4054
forbiddenPatterns {
4155
exclude '**/*.key'
4256
exclude '**/*.pem'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// this is just shell gradle file for eclipse to have separate projects for geo src and tests
1+
// this is just shell gradle file for eclipse to have separate projects for ssl-config src and tests
22
apply from: '../../build.gradle'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// this is just shell gradle file for eclipse to have separate projects for geo src and tests
1+
// this is just shell gradle file for eclipse to have separate projects for ssl-config src and tests
22
apply from: '../../build.gradle'
33
dependencies {
44
testCompile project(':libs:elasticsearch-ssl-config')
5-
}
5+
}

0 commit comments

Comments
 (0)