Rename elasticsearch-nio to nio (#31186)

This commit renames :libs:elasticsearch-nio to :libs:nio.
This commit is contained in:
Jason Tedor 2018-06-07 17:00:00 -04:00 committed by GitHub
parent 94be9b471f
commit 5296c11e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
36 changed files with 12 additions and 13 deletions

View File

@ -205,9 +205,8 @@ subprojects {
"org.elasticsearch.gradle:build-tools:${version}": ':build-tools',
"org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec',
"org.elasticsearch:elasticsearch:${version}": ':server',
"org.elasticsearch:elasticsearch-cli:${version}": ':libs:cli',
"org.elasticsearch:elasticsearch-core:${version}": ':libs:core',
"org.elasticsearch:elasticsearch-nio:${version}": ':libs:elasticsearch-nio',
"org.elasticsearch:elasticsearch-nio:${version}": ':libs:nio',
"org.elasticsearch:elasticsearch-x-content:${version}": ':libs:x-content',
"org.elasticsearch:elasticsearch-secure-sm:${version}": ':libs:secure-sm',
"org.elasticsearch.client:elasticsearch-rest-client:${version}": ':client:rest',

View File

@ -39,7 +39,7 @@ dependencies {
testCompile "junit:junit:${versions.junit}"
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
if (isEclipse == false || project.path == ":libs:elasticsearch-nio-tests") {
if (isEclipse == false || project.path == ":libs:nio-tests") {
testCompile("org.elasticsearch.test:framework:${version}") {
exclude group: 'org.elasticsearch', module: 'elasticsearch-nio'
}
@ -49,7 +49,7 @@ dependencies {
if (isEclipse) {
// in eclipse the project is under a fake root, we need to change around the source sets
sourceSets {
if (project.path == ":libs:elasticsearch-nio") {
if (project.path == ":libs:nio") {
main.java.srcDirs = ['java']
main.resources.srcDirs = ['resources']
} else {
@ -60,7 +60,7 @@ if (isEclipse) {
}
forbiddenApisMain {
// elasticsearch-nio does not depend on core, so only jdk signatures should be checked
// nio does not depend on core, so only jdk signatures should be checked
// es-all is not checked as we connect and accept sockets
signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
}

View File

@ -1,3 +1,3 @@
// this is just shell gradle file for eclipse to have separate projects for elasticsearch-nio src and tests
// this is just shell gradle file for eclipse to have separate projects for nio src and tests
apply from: '../../build.gradle'

View File

@ -1,7 +1,7 @@
// this is just shell gradle file for eclipse to have separate projects for elasticsearch-nio src and tests
// this is just shell gradle file for eclipse to have separate projects for nio src and tests
apply from: '../../build.gradle'
dependencies {
testCompile project(':libs:elasticsearch-nio')
testCompile project(':libs:nio')
}

View File

@ -84,7 +84,7 @@ if (isEclipse) {
// for server-src and server-tests
projects << 'server-tests'
projects << 'libs:core-tests'
projects << 'libs:elasticsearch-nio-tests'
projects << 'libs:nio-tests'
projects << 'libs:x-content-tests'
projects << 'libs:secure-sm-tests'
projects << 'libs:grok-tests'
@ -103,10 +103,10 @@ if (isEclipse) {
project(":libs:core").buildFileName = 'eclipse-build.gradle'
project(":libs:core-tests").projectDir = new File(rootProject.projectDir, 'libs/core/src/test')
project(":libs:core-tests").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-nio").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/main')
project(":libs:elasticsearch-nio").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-nio-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/test')
project(":libs:elasticsearch-nio-tests").buildFileName = 'eclipse-build.gradle'
project(":libs:nio").projectDir = new File(rootProject.projectDir, 'libs/nio/src/main')
project(":libs:nio").buildFileName = 'eclipse-build.gradle'
project(":libs:nio-tests").projectDir = new File(rootProject.projectDir, 'libs/nio/src/test')
project(":libs:nio-tests").buildFileName = 'eclipse-build.gradle'
project(":libs:x-content").projectDir = new File(rootProject.projectDir, 'libs/x-content/src/main')
project(":libs:x-content").buildFileName = 'eclipse-build.gradle'
project(":libs:x-content-tests").projectDir = new File(rootProject.projectDir, 'libs/x-content/src/test')