From 01beed9da0d58522e7de442e31f28af9dd32ef52 Mon Sep 17 00:00:00 2001 From: Tyler Ohlsen Date: Wed, 17 Jan 2024 23:51:52 +0000 Subject: [PATCH] revert build.gradle change Signed-off-by: Tyler Ohlsen --- build.gradle | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 1555fe0b..818f7f0c 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,6 @@ apply plugin: 'opensearch.pluginzip' def sqlJarDirectory = "$buildDir/dependencies/opensearch-sql-plugin" def jsJarDirectory = "$buildDir/dependencies/opensearch-job-scheduler" def adJarDirectory = "$buildDir/dependencies/opensearch-time-series-analytics" -// def alertingJarDirectory = "$buildDir/dependencies/alerting" configurations { zipArchive @@ -102,11 +101,6 @@ task addJarsToClasspath(type: Copy) { include "opensearch-time-series-analytics-${version}.jar" } into("$buildDir/classes") - - // from(fileTree(dir: alertingJarDirectory)) { - // include "alerting-${version}.jar" - // } - // into("$buildDir/classes") } dependencies { @@ -122,12 +116,10 @@ dependencies { compileOnly group: 'org.opensearch', name:'opensearch-ml-client', version: "${version}" implementation fileTree(dir: jsJarDirectory, include: ["opensearch-job-scheduler-${version}.jar"]) implementation fileTree(dir: adJarDirectory, include: ["opensearch-time-series-analytics-${version}.jar"]) - // implementation fileTree(dir: alertingJarDirectory, include: ["alerting-${version}.jar"]) implementation fileTree(dir: sqlJarDirectory, include: ["opensearch-sql-${version}.jar", "ppl-${version}.jar", "protocol-${version}.jar"]) compileOnly "org.opensearch:common-utils:${version}" compileOnly "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" compileOnly "org.opensearch:opensearch-job-scheduler-spi:${version}" - // compileOnly "org.opensearch.plugin:alerting:${version}" // ZipArchive dependencies used for integration tests @@ -137,7 +129,6 @@ dependencies { zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}" zipArchive group: 'org.opensearch.plugin', name:'opensearch-knn', version: "${version}" zipArchive group: 'org.opensearch.plugin', name:'neural-search', version: "${version}" - zipArchive group: 'org.opensearch.plugin', name:'alerting', version: "${version}" // Test dependencies testImplementation "org.opensearch.test:framework:${opensearch_version}" @@ -173,16 +164,9 @@ task extractAdJar(type: Copy) { into adJarDirectory } -// task extractAlertingJar(type: Copy) { -// mustRunAfter() -// from(zipTree(configurations.zipArchive.find { it.name.startsWith("alerting")})) -// into alertingJarDirectory -// } - tasks.addJarsToClasspath.dependsOn(extractSqlJar) tasks.addJarsToClasspath.dependsOn(extractJsJar) tasks.addJarsToClasspath.dependsOn(extractAdJar) -// tasks.addJarsToClasspath.dependsOn(extractAlertingJar) project.tasks.delombok.dependsOn(addJarsToClasspath) tasks.publishNebulaPublicationToMavenLocal.dependsOn ':generatePomFileForPluginZipPublication' tasks.validateNebulaPom.dependsOn ':generatePomFileForPluginZipPublication' @@ -228,7 +212,6 @@ compileJava { dependsOn extractSqlJar dependsOn extractJsJar dependsOn extractAdJar - // dependsOn extractAlertingJar dependsOn delombok options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor']) } @@ -405,4 +388,4 @@ task updateVersion { // Include the required files that needs to be updated with new Version ant.replaceregexp(file:'build.gradle', match: '"opensearch.version", "\\d.*"', replace: '"opensearch.version", "' + newVersion.tokenize('-')[0] + '-SNAPSHOT"', flags:'g', byline:true) } -} +} \ No newline at end of file