diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be9ddfe6bd..27566eeb8e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,20 +17,8 @@ jobs: with: java-version: '14' distribution: 'adopt' - - - name: Checkout OpenSearch - uses: actions/checkout@v2 - with: - repository: opensearch-project/opensearch - ref: ${{ env.OPENSEARCH_VERSION }} - path: opensearch - - - name: Assemble OpenSearch and Publish to Maven Local - run: | - cd opensearch - ./gradlew publishToMavenLocal - - name: Checkout Branch + - name: Checkout Branch uses: actions/checkout@v2 - name: Build with Gradle diff --git a/.github/workflows/test-integration-unreleased.yml b/.github/workflows/test-integration-unreleased.yml index 5755c80719..6fa4d67007 100644 --- a/.github/workflows/test-integration-unreleased.yml +++ b/.github/workflows/test-integration-unreleased.yml @@ -35,7 +35,6 @@ jobs: run: | cd opensearch ./gradlew assemble - ./gradlew publishToMavenLocal # This step runs the docker image generated during gradle assemble in OpenSearch. It is tagged as opensearch:test. # Reference: https://github.com/opensearch-project/OpenSearch/blob/2.0/distribution/docker/build.gradle#L190 diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml index 22d9bd8096..608c66447f 100644 --- a/.github/workflows/test-unit.yml +++ b/.github/workflows/test-unit.yml @@ -17,18 +17,6 @@ jobs: with: java-version: '14' distribution: 'adopt' - - - name: Checkout OpenSearch - uses: actions/checkout@v2 - with: - repository: opensearch-project/opensearch - ref: ${{ env.OPENSEARCH_VERSION }} - path: opensearch - - - name: Assemble OpenSearch and Publish to Maven Local - run: | - cd opensearch - ./gradlew publishToMavenLocal - name: Checkout Branch uses: actions/checkout@v2 diff --git a/build.gradle.kts b/build.gradle.kts index 3266bb8638..f016494b29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,8 +37,9 @@ allprojects { (File(project.rootDir, "config/version.txt").readText().trim() + "-SNAPSHOT") repositories { - mavenCentral() mavenLocal() + maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots") + mavenCentral() maven(url = "https://plugins.gradle.org/m2/") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a675d89503..c82bb73f9a 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -35,7 +35,8 @@ dependencies { } repositories { - mavenCentral() mavenLocal() + maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots") + mavenCentral() maven(url = "https://plugins.gradle.org/m2/") } diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index 377aaa13ab..cecc6251e7 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -36,8 +36,9 @@ import java.io.FileWriter buildscript { repositories { - mavenCentral() mavenLocal() + maven(url = "https://aws.oss.sonatype.org/content/repositories/snapshots") + mavenCentral() maven(url = "https://plugins.gradle.org/m2/") } } @@ -122,7 +123,7 @@ val integrationTest = task("integrationTest") { dependencies { - val opensearchVersion = "2.0.0-SNAPSHOT" + val opensearchVersion = "2.0.0-alpha1-SNAPSHOT" val jacksonVersion = "2.12.6" // Apache 2.0