Skip to content

Commit

Permalink
Fix IT run error by adding job-scheduler back to zipArchive dependency (
Browse files Browse the repository at this point in the history
opensearch-project#87)

Signed-off-by: zane-neo <zaniu@amazon.com>
Signed-off-by: yuye-aws <yuyezhu@amazon.com>
  • Loading branch information
zane-neo authored and yuye-aws committed Apr 26, 2024
1 parent 71d37b4 commit d321dd6
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ configurations {
all {
resolutionStrategy {
force "org.mockito:mockito-core:${versions.mockito}"
force "com.google.guava:guava:32.1.3-jre" // CVE for 31.1
force "com.google.guava:guava:33.0.0-jre" // CVE for 31.1
force("org.eclipse.platform:org.eclipse.core.runtime:3.30.0") // CVE for < 3.29.0, forces JDK17 for spotless
}
}
Expand Down Expand Up @@ -108,7 +108,7 @@ dependencies {
compileOnly group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
compileOnly "org.apache.logging.log4j:log4j-slf4j-impl:2.22.0"
compileOnly group: 'org.json', name: 'json', version: '20231013'
compileOnly("com.google.guava:guava:32.1.3-jre")
compileOnly("com.google.guava:guava:33.0.0-jre")
compileOnly group: 'org.apache.commons', name: 'commons-lang3', version: '3.10'
compileOnly group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'

Expand All @@ -122,8 +122,7 @@ dependencies {

// ZipArchive dependencies used for integration tests
zipArchive group: 'org.opensearch.plugin', name:'opensearch-ml-plugin', version: "${version}"
//JS plugin is published to `org/opensearch` instead of `org/opensearch/plugin` under local maven repo: https://mvnrepository.com/artifact/org.opensearch/opensearch-job-scheduler.
zipArchive group: 'org.opensearch', name:'opensearch-job-scheduler', version: "${version}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-job-scheduler', version: "${version}"
zipArchive "org.opensearch.plugin:opensearch-anomaly-detection:${version}"
zipArchive group: 'org.opensearch.plugin', name:'opensearch-sql-plugin', version: "${version}"

Expand Down Expand Up @@ -364,4 +363,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 d321dd6

Please sign in to comment.