From 4ae50cbaa45c74dacd604447546da85c2501d032 Mon Sep 17 00:00:00 2001 From: Vacha Date: Mon, 16 Aug 2021 07:36:21 -0700 Subject: [PATCH 1/4] Using 1.1 snapshot version for OpenSearch (#57) Signed-off-by: Vacha --- .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 c8f51fdd..53c3d9b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,16 +34,16 @@ jobs: ref: '1.x' - name: Build OpenSearch working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false + run: ./gradlew publishToMavenLocal # common-utils - name: Build and Test run: | - ./gradlew build -Dopensearch.version=1.1.0 + ./gradlew build -Dopensearch.version=1.1.0-SNAPSHOT - name: Publish to Maven Local run: | - ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0 + ./gradlew publishToMavenLocal -Dopensearch.version=1.1.0-SNAPSHOT - name: Upload Coverage Report uses: codecov/codecov-action@v1 diff --git a/build.gradle b/build.gradle index 0f2b241a..4917e428 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") + opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") kotlin_version = System.getProperty("kotlin.version", "1.4.32") } From be78010879c690025ffc8ad9431a8945aa437f7c Mon Sep 17 00:00:00 2001 From: "Daniel Doubrovkine (dB.)" Date: Mon, 16 Aug 2021 11:25:48 -0400 Subject: [PATCH 2/4] Build snapshot build by default with the same version as OpenSearch. (#58) Signed-off-by: dblock --- build.gradle | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4917e428..d443ddf4 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,17 @@ repositories { jcenter() } -group 'org.opensearch.commons' +ext { + isSnapshot = "true" == System.getProperty("build.snapshot", "true") +} + +allprojects { + group 'org.opensearch.commons' + version = opensearch_version - '-SNAPSHOT' + '.0' + if (isSnapshot) { + version += "-SNAPSHOT" + } +} sourceCompatibility = 1.8 @@ -146,8 +156,6 @@ task javadocJar(type: Jar) { from javadoc.destinationDir } -version '1.1.0.0' - publishing { publications { shadow(MavenPublication) { From 259a1a7a74011170d057ed5822b7b5be79c9d1fe Mon Sep 17 00:00:00 2001 From: Aditya Jindal <13850971+aditjind@users.noreply.github.com> Date: Thu, 9 Sep 2021 15:29:24 -0700 Subject: [PATCH 3/4] Update build.gradle to reflect 1.1.0.0 version --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index d443ddf4..8037b004 100644 --- a/build.gradle +++ b/build.gradle @@ -156,6 +156,8 @@ task javadocJar(type: Jar) { from javadoc.destinationDir } +version '1.1.0.0' + publishing { publications { shadow(MavenPublication) { From e6cb5c0c041e7249fe8bcf3875245f4ba3708ed6 Mon Sep 17 00:00:00 2001 From: Aditya Jindal Date: Fri, 10 Sep 2021 03:53:27 +0000 Subject: [PATCH 4/4] Use Matching Opensearch Version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53c3d9b6..8f83153e 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.x' + ref: '1.1' - name: Build OpenSearch working-directory: ./OpenSearch run: ./gradlew publishToMavenLocal