From c4cad32ce3ca702a00d0b35f3a8004e453753ade Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 16:51:46 -0700 Subject: [PATCH 1/5] Updates job scheduler version to 1.2 Signed-off-by: Clay Downs --- .github/workflows/test-and-build-workflow.yml | 6 +++--- build.gradle | 2 +- gradle.properties | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 77c43d72..926118f9 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: repository: 'opensearch-project/OpenSearch' - ref: '1.1' + ref: '1.2' path: OpenSearch - name: Build OpenSearch working-directory: ./OpenSearch @@ -39,11 +39,11 @@ jobs: # job-scheduler - 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 aae07ef4..c98c7312 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") } repositories { diff --git a/gradle.properties b/gradle.properties index 57aa1bf1..b3d3c230 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ # permissions and limitations under the License. # -version = 1.1.0 +version = 1.2.0 From 17a77e8b5679a786d03218231fda95d78228f774 Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:10:29 -0700 Subject: [PATCH 2/5] Uses 1.x branch in test and build workflow Signed-off-by: Clay Downs --- .github/workflows/test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 926118f9..ee428493 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 with: repository: 'opensearch-project/OpenSearch' - ref: '1.2' + ref: '1.x' path: OpenSearch - name: Build OpenSearch working-directory: ./OpenSearch From 554453af504214b50a6a93bbcdd746e86e5dc33a Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:22:40 -0700 Subject: [PATCH 3/5] Uses Maven for 1.2 dependencies Signed-off-by: Clay Downs --- .github/workflows/test-and-build-workflow.yml | 11 ----------- build.gradle | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index ee428493..fb5f3a02 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.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' - ref: '1.x' - path: OpenSearch - - name: Build OpenSearch - working-directory: ./OpenSearch - run: ./gradlew publishToMavenLocal - # job-scheduler - name: Build and Test run: | diff --git a/build.gradle b/build.gradle index c98c7312..7b2f53d6 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ buildscript { repositories { mavenLocal() mavenCentral() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { @@ -100,6 +101,7 @@ allprojects { repositories { mavenLocal() mavenCentral() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { From c629f2bf8f61d112cf36acda1964531ab3729057 Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:36:41 -0700 Subject: [PATCH 4/5] Updates Maven repositories for sample extension plugin and job scheduler spi Signed-off-by: Clay Downs --- sample-extension-plugin/build.gradle | 1 + spi/build.gradle | 1 + 2 files changed, 2 insertions(+) diff --git a/sample-extension-plugin/build.gradle b/sample-extension-plugin/build.gradle index db62aa9c..bf89865c 100644 --- a/sample-extension-plugin/build.gradle +++ b/sample-extension-plugin/build.gradle @@ -45,6 +45,7 @@ ext { repositories { mavenLocal() mavenCentral() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { diff --git a/spi/build.gradle b/spi/build.gradle index 36900828..1adae4c2 100644 --- a/spi/build.gradle +++ b/spi/build.gradle @@ -41,6 +41,7 @@ apply plugin: 'opensearch.java-rest-test' repositories { mavenLocal() mavenCentral() + maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } ext { From 0d859ef88e2107d7a0b7507893394e5c5a2c9107 Mon Sep 17 00:00:00 2001 From: Clay Downs Date: Thu, 30 Sep 2021 17:44:05 -0700 Subject: [PATCH 5/5] Removes gradle.properties file Signed-off-by: Clay Downs --- gradle.properties | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 gradle.properties diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index b3d3c230..00000000 --- a/gradle.properties +++ /dev/null @@ -1,27 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. -# -# Modifications Copyright OpenSearch Contributors. See -# GitHub history for details. -# - -# -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file is distributed -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -# express or implied. See the License for the specific language governing -# permissions and limitations under the License. -# - -version = 1.2.0