From 56a999c3d7f5a5f492f426cfcf3abb2ab4950d3b Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:05:44 -0700 Subject: [PATCH 1/2] Updates common-utils version to 1.2 Signed-off-by: Clay Downs --- .github/workflows/ci.yml | 6 +++--- build.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f83153e..f7c314e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.1' + ref: '1.x' - name: Build OpenSearch working-directory: ./OpenSearch run: ./gradlew publishToMavenLocal @@ -39,11 +39,11 @@ jobs: # common-utils - name: Build and Test run: | - ./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT + ./gradlew build -Dopensearch.version=1.2.0-SNAPSHOT - name: Publish to Maven Local run: | - ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT + ./gradlew publishToMavenLocal -Dopensearch.version=1.2.0-SNAPSHOT - name: Upload Coverage Report uses: codecov/codecov-action@v1 diff --git a/build.gradle b/build.gradle index d443ddf4..18634116 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") kotlin_version = System.getProperty("kotlin.version", "1.4.32") } From 14c4954843f072172393cc904408cb1f1baac1da Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:22:09 -0700 Subject: [PATCH 2/2] Uses Maven for 1.2 dependencies Signed-off-by: Clay Downs --- .github/workflows/ci.yml | 11 ----------- build.gradle | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7c314e2..52eea2f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,17 +25,6 @@ jobs: with: java-version: ${{ matrix.java }} - # dependencies: OpenSearch - - name: Checkout OpenSearch - uses: actions/checkout@v2 - with: - repository: 'opensearch-project/OpenSearch' - path: OpenSearch - ref: '1.x' - - name: Build OpenSearch - working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal - # common-utils - name: Build and Test run: | diff --git a/build.gradle b/build.gradle index 18634116..dc33b6d9 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,7 @@ buildscript { mavenCentral() maven { url "https://plugins.gradle.org/m2/" } jcenter() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { @@ -42,6 +43,7 @@ repositories { mavenCentral() maven { url "https://plugins.gradle.org/m2/" } jcenter() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } ext {