diff --git a/DEVELOPER_GUIDE.rst b/DEVELOPER_GUIDE.rst index f53b4b081a..7029388085 100644 --- a/DEVELOPER_GUIDE.rst +++ b/DEVELOPER_GUIDE.rst @@ -34,7 +34,7 @@ OpenSearch & OpenSearch Dashboards For convenience, we recommend installing `OpenSearch `_ and `OpenSearch Dashboards `_ on your local machine. You can download the open source ZIP for each and extract them to a folder. -If you just want to have a quick look, you can also get an OpenSearch running with plugin installed by ``./gradlew :plugin:run``. +If you just want to have a quick look, you can also get an OpenSearch running with plugin installed by ``./gradlew :opensearch-sql-plugin:run``. OpenSearch Dashboards is optional, but makes it easier to test your queries. Alternately, you can use curl from the terminal to run queries against the plugin. diff --git a/doctest/build.gradle b/doctest/build.gradle index 9ce28225fa..eec5a791b8 100644 --- a/doctest/build.gradle +++ b/doctest/build.gradle @@ -79,7 +79,7 @@ testClusters { } } })) - plugin ':plugin' + plugin ':opensearch-sql-plugin' testDistribution = 'integ_test' } } diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 9f37b910b2..e640c41025 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -64,7 +64,7 @@ dependencies { testImplementation group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}" testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1' - testImplementation project(':plugin') + testImplementation project(':opensearch-sql-plugin') testImplementation project(':legacy') testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2') testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.6.2') @@ -98,12 +98,12 @@ testClusters.all { } testClusters.integTest { - plugin ":plugin" + plugin ":opensearch-sql-plugin" } // Run PPL ITs and new, legacy and comparison SQL ITs with new SQL engine enabled integTest { - dependsOn ':plugin:bundlePlugin' + dependsOn ':opensearch-sql-plugin:bundlePlugin' systemProperty 'tests.security.manager', 'false' systemProperty('project.root', project.projectDir.absolutePath) @@ -147,7 +147,7 @@ integTest { task comparisonTest(type: RestIntegTestTask) { - dependsOn ':plugin:bundlePlugin' + dependsOn ':opensearch-sql-plugin:bundlePlugin' systemProperty 'tests.security.manager', 'false' systemProperty('project.root', project.projectDir.absolutePath) diff --git a/settings.gradle b/settings.gradle index d250643599..3d4700d8de 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,7 +6,8 @@ rootProject.name = 'opensearch-sql' -include 'plugin' +include 'opensearch-sql-plugin' +project(':opensearch-sql-plugin').projectDir = file('plugin') include 'ppl' include 'integ-test' include 'common'