Skip to content

Commit

Permalink
revert build.gradle change
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Ohlsen <[email protected]>
  • Loading branch information
ohltyler committed Jan 17, 2024
1 parent 4de00d4 commit 58eadc5
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -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}"
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -228,7 +212,6 @@ compileJava {
dependsOn extractSqlJar
dependsOn extractJsJar
dependsOn extractAdJar
// dependsOn extractAlertingJar
dependsOn delombok
options.compilerArgs.addAll(["-processor", 'lombok.launch.AnnotationProcessorHider$AnnotationProcessor'])
}
Expand Down Expand Up @@ -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)
}
}
}

0 comments on commit 58eadc5

Please sign in to comment.