Skip to content

Commit

Permalink
[Backport 2.x] Manually backport #8573, #8586 (#8604)
Browse files Browse the repository at this point in the history
* Manual backports

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* remove blank lines

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* fix numbers

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

* fix numbering

Signed-off-by: Stephen Crawford <steecraw@amazon.com>

---------

Signed-off-by: Stephen Crawford <steecraw@amazon.com>
  • Loading branch information
scrawfor99 committed Jul 11, 2023
1 parent 2c5b320 commit fee1b80
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Bump `avro` from 1.11.1 to 1.11.2 ([#8404](https://github.com/opensearch-project/OpenSearch/pull/8404))
- Bump `org.apache.maven:maven-model` from 3.9.2 to 3.9.3 ([#8403](https://github.com/opensearch-project/OpenSearch/pull/8403))
- Bump `io.projectreactor.netty:reactor-netty` and `io.projectreactor.netty:reactor-netty-core` from 1.1.7 to 1.1.8 ([#8405](https://github.com/opensearch-project/OpenSearch/pull/8405))
- Bump `com.google.cloud:google-cloud-core-http` from 2.17.0 to 2.21.0 ([#8586](https://github.com/opensearch-project/OpenSearch/pull/8586))
- Bump `com.networknt:json-schema-validator` from 1.0.85 to 1.0.86 ([#8573](https://github.com/opensearch-project/OpenSearch/pull/8573))

### Changed
- Replace jboss-annotations-api_1.2_spec with jakarta.annotation-api ([#7836](https://github.com/opensearch-project/OpenSearch/pull/7836))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ dependencies {
api 'com.avast.gradle:gradle-docker-compose-plugin:0.16.11'
api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
api 'org.apache.maven:maven-model:3.9.3'
api 'com.networknt:json-schema-validator:1.0.85'
api 'com.networknt:json-schema-validator:1.0.86'
api 'org.jruby.jcodings:jcodings:1.0.58'
api 'org.jruby.joni:joni:2.2.1'
api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
Expand Down
8 changes: 3 additions & 5 deletions plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@
* GitHub history for details.
*/

import java.nio.file.Files
import java.security.KeyPair
import java.security.KeyPairGenerator

import org.opensearch.gradle.MavenFilteringHack
import org.opensearch.gradle.info.BuildParams
import org.opensearch.gradle.test.InternalClusterTestPlugin
import org.opensearch.gradle.test.RestIntegTestTask
import org.opensearch.gradle.test.rest.YamlRestTestPlugin
import org.opensearch.gradle.test.InternalClusterTestPlugin

import java.nio.file.Files
import java.security.KeyPair
Expand Down Expand Up @@ -69,7 +67,7 @@ dependencies {
api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}"

api 'com.google.cloud:google-cloud-core:2.5.10'
api 'com.google.cloud:google-cloud-core-http:2.17.0'
api 'com.google.cloud:google-cloud-core-http:2.21.0'
api 'com.google.cloud:google-cloud-storage:1.113.1'

api 'com.google.code.gson:gson:2.9.0'
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
07da4710ccdbcfee253672c0b9e00e7370626c26

0 comments on commit fee1b80

Please sign in to comment.