Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] Bump slf4j-api to 2.0.7, ospackage to 11.4.0, google-java-format to 1.17.0, guava to 32.1.2-jre and spotless to 6.20.0 #453

Merged
merged 1 commit into from
Aug 8, 2023
+6 −6
Merged

[Backport 2.x] Bump slf4j-api to 2.0.7, ospackage to 11.4.0, google-java-format to 1.17.0, guava to 32.1.2-jre and spotless to 6.20.0 #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ buildscript {
}

plugins {
id 'com.netflix.nebula.ospackage' version "11.3.0"
id 'com.netflix.nebula.ospackage' version "11.4.0"
id 'java-library'
id "com.diffplug.spotless" version "6.17.0" apply false
id "com.diffplug.spotless" version "6.20.0" apply false
}

apply plugin: 'opensearch.opensearchplugin'
Expand Down Expand Up @@ -153,18 +153,18 @@ repositories {
configurations {
all {
resolutionStrategy {
force 'com.google.guava:guava:32.0.1-jre'
force 'com.google.guava:guava:32.1.2-jre'
}
}
}

dependencies {
implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
implementation group: 'com.google.guava', name: 'guava', version:'32.0.1-jre'
implementation group: 'com.google.guava', name: 'guava', version:'32.1.2-jre'
implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
javaRestTestImplementation project.sourceSets.main.runtimeClasspath
//spotless
implementation('com.google.googlejavaformat:google-java-format:1.15.0') {
implementation('com.google.googlejavaformat:google-java-format:1.17.0') {
exclude group: 'com.google.guava'
}
}
Expand Down
2 changes: 1 addition & 1 deletion spi/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jacocoTestReport {
}
check.dependsOn jacocoTestReport

def slf4j_version_of_cronutils = "1.7.36"
def slf4j_version_of_cronutils = "2.0.7"
dependencies {
compileOnly "org.opensearch:opensearch:${opensearch_version}"
// slf4j is the runtime dependency of cron-utils
Expand Down