Resolved conflicts

Signed-off-by: Angie Zhang <[email protected]>

manifests/2.3.0/opensearch-2.3.0.yml

@@ -99,10 +99,45 @@ components:
     checks:
       - gradle:properties:version
       - gradle:dependencies:opensearch.version
-  - name: index-management
-    repository: https://github.com/opensearch-project/index-management.git
-    ref: '2.3'
-    platforms:
-      - linux
-    checks:
-      - gradle:properties:version
+- name: index-management
+  repository: https://github.com/opensearch-project/index-management.git
+  ref: '2.3'
+  platforms:
+    - linux
+  checks:
+    - gradle:properties:version
+- name: notifications-core
+  repository: https://github.com/opensearch-project/notifications.git
+  ref: '2.3'
+  platforms:
+    - linux
+  working_directory: notifications
+  checks:
+    - gradle:properties:version
+    - gradle:dependencies:opensearch.version: opensearch-notifications-core
+- name: notifications
+  repository: https://github.com/opensearch-project/notifications.git
+  ref: '2.3'
+  platforms:
+    - linux
+  working_directory: notifications
+  checks:
+    - gradle:properties:version
+    - gradle:dependencies:opensearch.version: notifications
+- name: asynchronous-search
+  repository: https://github.com/opensearch-project/asynchronous-search.git
+  ref: '2.3'
+  checks:
+    - gradle:properties:version
+    - gradle:dependencies:opensearch.version
+  platforms:
+    - linux
+- name: sql
+  repository: https://github.com/opensearch-project/sql.git
+  ref: 2.3'
+  platforms:
+    - linux
+  checks:
+    - gradle:properties:version
+    - gradle:dependencies:opensearch.version: opensearch-sql-plugin
+

manifests/2.3.0/opensearch-dashboards-2.3.0.yml

@@ -35,8 +35,14 @@ components:
     repository: https://github.com/opensearch-project/dashboards-maps.git
     working_directory: src/plugins/custom_import_map
     ref: '2.3'
-  - name: indexManagementDashboards
-    repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
-    ref: '2.3'
-
-
+- name: indexManagementDashboards
+  repository: https://github.com/opensearch-project/index-management-dashboards-plugin.git
+  ref: '2.3'
+- name: notificationsDashboards
+  repository: https://github.com/opensearch-project/notifications.git
+  working_directory: dashboards-notifications
+  ref: '2.3'
+- name: queryWorkbenchDashboards
+  repository: https://github.com/opensearch-project/sql.git
+  working_directory: workbench
+  ref: '2.3'