Using snapshots from sonatype for 2.0 OpenSearch snapshot

Signed-off-by: Vacha Shah <[email protected]>
opensearch-project · Mar 30, 2022 · 35b7c06 · 35b7c06
1 parent 1e01fbe
commit 35b7c06
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Test>("integrationTest") {
 
 dependencies {
 
-    val opensearchVersion = "2.0.0-SNAPSHOT"
+    val opensearchVersion = "2.0.0-alpha1-SNAPSHOT"
     val jacksonVersion = "2.12.6"
 
     // Apache 2.0