bump version to 1.1.1

opensearch-project · Dec 1, 2021 · 604851d · 604851d
1 parent f26d0c3
commit 604851d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 42 deletions.
diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -6,7 +6,7 @@ env:
   PLUGIN_NAME: reportsDashboards
   ARTIFACT_NAME: reports-dashboards
   OPENSEARCH_VERSION: '1.1'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
+  OPENSEARCH_PLUGIN_VERSION: 1.1.1.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
@@ -3,10 +3,7 @@ name: Test and Build Reports Scheduler
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.1.0-SNAPSHOT'
-  OPENSEARCH_BRANCH: '1.1'
-  COMMON_UTILS_BRANCH: 'main'
-  JOB_SCHEDULER_BRANCH: 'main'
+  OPENSEARCH_VERSION: '1.1.0'
 
 jobs:
   build:
@@ -18,39 +15,6 @@ 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'
-          ref: ${{ env.COMMON_UTILS_BRANCH }}
-          path: common-utils
-      - 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
@@ -1,6 +1,6 @@
 {
   "id": "reportsDashboards",
-  "version": "1.1.0.0",
+  "version": "1.1.1.0",
   "opensearchDashboardsVersion": "1.1.0",
   "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
   "optionalPlugins": ["share"],

diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reports-dashboards",
-  "version": "1.1.0.0",
+  "version": "1.1.1.0",
   "description": "OpenSearch Dashboards Reports Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",

diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle
@@ -123,7 +123,7 @@ plugins.withId('org.jetbrains.kotlin.jvm') {
 
 allprojects {
     group = "org.opensearch"
-    version = "${opensearch_version}" - "-SNAPSHOT" + ".0"
+    version = "1.1.1-SNAPSHOT" - "-SNAPSHOT" + ".0"
     if (isSnapshot) {
         version += "-SNAPSHOT"
     } 
@@ -247,7 +247,7 @@ integTest.dependsOn(bundle)
 integTest.getClusters().forEach{c -> c.plugin(project.getObjects().fileProperty().value(bundle.getArchiveFile()))}
 
 testClusters.integTest {
-    testDistribution = "ARCHIVE"
+    testDistribution = "INTEG_TEST"
     // need to install job-scheduler first, need to assemble job-scheduler first
     plugin(provider(new Callable<RegularFile>(){
         @Override