diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml index 475f2e04..6dac8119 100644 --- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml @@ -5,8 +5,8 @@ on: [pull_request, push] env: PLUGIN_NAME: reportsDashboards ARTIFACT_NAME: reports-dashboards - OPENSEARCH_VERSION: '1.2' - OPENSEARCH_PLUGIN_VERSION: 1.2.0.0 + OPENSEARCH_VERSION: '1.1' + OPENSEARCH_PLUGIN_VERSION: 1.1.0.0 jobs: build: diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index d7ec7744..a018e46f 100644 --- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml +++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml @@ -3,7 +3,10 @@ name: Test and Build Reports Scheduler on: [push, pull_request] env: - OPENSEARCH_VERSION: '1.2.0-SNAPSHOT' + OPENSEARCH_VERSION: '1.1.0-SNAPSHOT' + OPENSEARCH_BRANCH: '1.1' + COMMON_UTILS_BRANCH: 'main' + JOB_SCHEDULER_BRANCH: 'main' jobs: build: @@ -15,6 +18,39 @@ jobs: with: java-version: 1.14 + # dependencies: OpenSearch + - name: Checkout OpenSearch + uses: actions/checkout@v2 + with: + repository: 'opensearch-project/OpenSearch' + path: OpenSearch + ref: ${{ env.OPENSEARCH_BRANCH }} + - name: Build OpenSearch + working-directory: ./OpenSearch + run: ./gradlew publishToMavenLocal + + # dependencies: common-utils + - name: Checkout common-utils + uses: actions/checkout@v2 + with: + repository: 'opensearch-project/common-utils' + path: common-utils + ref: ${{ env.COMMON_UTILS_BRANCH }} + - name: Build common-utils + working-directory: ./common-utils + run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} + + # dependencies: job-scheduler + - name: Checkout job-scheduler + uses: actions/checkout@v2 + with: + repository: 'opensearch-project/job-scheduler' + ref: ${{ env.JOB_SCHEDULER_BRANCH }} + path: job-scheduler + - name: Build job-scheduler + working-directory: ./job-scheduler + run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} + # reports-scheduler - name: Checkout Reports Scheduler uses: actions/checkout@v2 diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json index 962332e8..522dc961 100644 --- a/dashboards-reports/opensearch_dashboards.json +++ b/dashboards-reports/opensearch_dashboards.json @@ -1,7 +1,7 @@ { "id": "reportsDashboards", - "version": "1.2.0.0", - "opensearchDashboardsVersion": "1.2.0", + "version": "1.1.0.0", + "opensearchDashboardsVersion": "1.1.0", "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"], "optionalPlugins": ["share"], "server": true, diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json index a98991da..4b535490 100644 --- a/dashboards-reports/package.json +++ b/dashboards-reports/package.json @@ -1,11 +1,11 @@ { "name": "reports-dashboards", - "version": "1.2.0.0", + "version": "1.1.0.0", "description": "OpenSearch Dashboards Reports Plugin", "license": "Apache-2.0", "main": "index.ts", "opensearchDashboards": { - "version": "1.2.0", + "version": "1.1.0", "templateVersion": "1.0.0" }, "scripts": { diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index 39615f40..7692e0a9 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -30,7 +30,7 @@ import java.util.concurrent.Callable buildscript { ext { opensearch_group = "org.opensearch" - opensearch_version = System.getProperty("opensearch.version", "1.2.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.1.0-SNAPSHOT") // 1.0.0 -> 1.0.0.0, and 1.0.0-SNAPSHOT -> 1.0.0.0-SNAPSHOT opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build) @@ -40,7 +40,6 @@ buildscript { repositories { mavenLocal() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } mavenCentral() jcenter() } @@ -135,7 +134,6 @@ allprojects { repositories { mavenLocal() - maven { url "https://aws.oss.sonatype.org/content/repositories/snapshots" } } dependencies { @@ -158,7 +156,7 @@ dependencies { testCompile "org.opensearch.test:framework:${opensearch_version}" testCompile "org.jetbrains.kotlin:kotlin-test:${kotlin_version}" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - testCompile "org.mockito:mockito-core:3.12.4" + testCompile "org.mockito:mockito-core:2.23.0" testCompile 'com.google.code.gson:gson:2.8.6' ktlint "com.pinterest:ktlint:0.33.0" diff --git a/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.1.0.0-SNAPSHOT.zip b/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.1.0.0-SNAPSHOT.zip new file mode 100644 index 00000000..4c537d0d Binary files /dev/null and b/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.1.0.0-SNAPSHOT.zip differ diff --git a/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip b/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip deleted file mode 100644 index 1cd2d885..00000000 Binary files a/reports-scheduler/src/test/resources/job-scheduler/opensearch-job-scheduler-1.2.0.0-SNAPSHOT.zip and /dev/null differ