diff --git a/opensearch-dashboards-3.yaml b/opensearch-dashboards-3.yaml index 0862cd1d0f4..0d20dcfece4 100644 --- a/opensearch-dashboards-3.yaml +++ b/opensearch-dashboards-3.yaml @@ -1,7 +1,7 @@ package: name: opensearch-dashboards-3 - version: "3.0.0" # when updating please check if we can remove the patched package.json for the reporting plugin - epoch: 1 + version: "3.1.0" # when updating please check if we can remove the patched package.json for the reporting plugin + epoch: 0 description: Open source visualization dashboards for OpenSearch copyright: - license: Apache-2.0 @@ -60,7 +60,7 @@ pipeline: with: repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git tag: ${{package.version}} - expected-commit: c378e1f95a58498ad41c4c99f39e2072b2629085 + expected-commit: 1feb86934e7f2d5fae58baebf1b98c5c0825bc3f - runs: | # Workaround for "OpenSearch Dashboards should not be run as root. Use --allow-root to continue." @@ -74,8 +74,8 @@ pipeline: # unset our global flags to allow the build to succeed. unset LDFLAGS - # fix CVE-2024-47764, CVE-2025-27789, CVE-2025-5889 - resolutions='{"**/cookie": "^0.7.0", "@babel/runtime": "^7.26.10", "@babel/runtime-corejs3": "^7.26.10", "brace-expansion": "1.1.12"}' + # fix CVE-2024-47764, CVE-2025-27789, CVE-2025-5889, CVE-2025-6545 + resolutions='{"**/cookie": "^0.7.0", "@babel/runtime": "^7.26.10", "@babel/runtime-corejs3": "^7.26.10", "brace-expansion": "1.1.12", "pbkdf2": "3.1.3"}' jq --argjson resolutions "$resolutions" '.resolutions += $resolutions' package.json > temp.json && mv temp.json package.json # fix CVE-2023-28155 @@ -106,7 +106,7 @@ subpackages: repository: https://github.com/opensearch-project/opensearch-build tag: ${{package.version}} destination: opensearch-build - expected-commit: 93296ec81611080141bc569f761794a01eb1d105 # will need to be manually updated when opensearch dashboard auto update happens + expected-commit: c152d16bbe6b4501e3e2418be0f9f8b3dc07559f # will need to be manually updated when opensearch dashboard auto update happens - runs: | install -Dm755 opensearch-build/docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint-2.x.sh ${{targets.contextdir}}/usr/share/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh install -Dm655 opensearch-build/config/opensearch_dashboards-2.x.yml ${{targets.contextdir}}/usr/share/opensearch-dashboards/config/opensearch_dashboards.yml @@ -127,8 +127,8 @@ subpackages: - runs: | cd ./plugins/${{range.value}} - # fix CVE-2025-27789, CVE-2025-25977, CVE-2025-5889 - resolutions='{"@babel/runtime": "^7.26.10", "canvg": "^4.0.3", "brace-expansion": "1.1.12"}' + # fix CVE-2025-27789, CVE-2025-25977, CVE-2025-5889, CVE-2025-6545 + resolutions='{"@babel/runtime": "^7.26.10", "canvg": "^4.0.3", "brace-expansion": "1.1.12", "pbkdf2": "3.1.3"}' jq --argjson resolutions "$resolutions" '.resolutions += $resolutions' package.json > temp.json && mv temp.json package.json dependencies='{"cypress": "^13.5.1"}'