Skip to content

Commit

Permalink
Merge branch 'main' into get-certs-from-security
Browse files Browse the repository at this point in the history
Signed-off-by: bowenlan-amzn <[email protected]>
  • Loading branch information
bowenlan-amzn authored Jan 6, 2025
2 parents 8e209ba + 581f6db commit 57477fe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @bowenlan-amzn @Hailong-am @vikasvb90
* @bowenlan-amzn @Hailong-am @vikasvb90 @tandonks @shiv0408 @soosinha
3 changes: 3 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
| Vikas Bansal | [vikasvb90](https://github.com/vikasvb90) | Amazon |
| Bowen Lan | [bowenlan-amzn](https://github.com/bowenlan-amzn) | Amazon |
| Hailong Cui | [Hailong-am](https://github.com/Hailong-am) | Amazon |
| Kshitij Tandon | [tandonks](https://github.com/tandonks) | Amazon |
| Shivansh Arora | [shiv0408](https://github.com/shiv0408) | Amazon |
| Sooraj Sinha | [soosinha](https://github.com/soosinha) | Amazon |

## Emeritus

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ buildscript {
classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6"
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.7"
classpath "org.jacoco:org.jacoco.agent:0.8.10"
}
}

plugins {
id "de.undercouch.download" version "5.3.0"
id "com.netflix.nebula.ospackage" version "11.5.0"
id "com.netflix.nebula.ospackage" version "11.10.1"
id "com.dorongold.task-tree" version "2.1.1"
}

Expand Down Expand Up @@ -222,7 +222,7 @@ dependencies {
implementation "org.jetbrains:annotations:13.0"
implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
implementation "org.opensearch:common-utils:${common_utils_version}"
implementation "com.github.seancfoley:ipaddress:5.4.1"
implementation "com.github.seancfoley:ipaddress:5.5.1"
implementation "commons-codec:commons-codec:${versions.commonscodec}"
implementation "org.apache.httpcomponents:httpclient:${versions.httpclient}"
implementation "org.apache.httpcomponents:httpcore:${versions.httpcore}"
Expand Down

0 comments on commit 57477fe

Please sign in to comment.