Merge 4.10.0 into master (#379)

* Merge 4.9.2 into 4.10.0 (#378) * Update changelog
wazuh · Sep 9, 2024 · 1cfd986 · 1cfd986
1 parent dfebe07
commit 1cfd986
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project are documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on how to add changelog entries.
 
-## [Unreleased 2.16.x]
+## [Unreleased 5.0.x]
 ### Added
 
 ### Dependencies
@@ -18,4 +18,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Security
 
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/57cd81da11e5cb831029719f0394e40aff68ced2...2.16
+[Unreleased 5.0.x]: https://github.com/wazuh/wazuh-indexer/compare/92ffe2ed8a743c07a1170960d5949fcd6ed12e89...master
diff --git a/build-scripts/README.md b/build-scripts/README.md
@@ -100,7 +100,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
    ```
    artifacts/
    |-- dist
-   |   |-- wazuh-indexer-min_4.9.1_amd64.deb
+   |   |-- wazuh-indexer-min_5.0.0_amd64.deb
    `-- tmp
        `-- deb
            |-- Makefile
@@ -109,7 +109,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
            |-- etc
            |-- usr
            |-- var
-           `-- wazuh-indexer-min_4.9.1_amd64.deb
+           `-- wazuh-indexer-min_5.0.0_amd64.deb
    ```
 
    `usr`, `etc` and `var` folders contain `wazuh-indexer` files, extracted from `wazuh-indexer-min-*.deb`.
@@ -132,8 +132,8 @@ For DEB packages, the `assemble.sh` script will perform the following operations
    artifacts/
    |-- artifact_name.txt
    |-- dist
-   |   |-- wazuh-indexer-min_4.9.1_amd64.deb
-   |   `-- wazuh-indexer_4.9.1_amd64.deb
+   |   |-- wazuh-indexer-min_5.0.0_amd64.deb
+   |   `-- wazuh-indexer_5.0.0_amd64.deb
    `-- tmp
        `-- deb
            |-- Makefile
@@ -142,7 +142,7 @@ For DEB packages, the `assemble.sh` script will perform the following operations
            |-- etc
            |-- usr
            |-- var
-           |-- wazuh-indexer-min_4.9.1_amd64.deb
+           |-- wazuh-indexer-min_5.0.0_amd64.deb
            `-- debian/
                | -- control
                | -- copyright

diff --git a/distribution/packages/src/rpm/wazuh-indexer.rpm.spec b/distribution/packages/src/rpm/wazuh-indexer.rpm.spec
@@ -265,8 +265,12 @@ exit 0
 %attr(750, %{name}, %{name}) %{product_dir}/performance-analyzer-rca/bin/*
 
 %changelog
+* Fri Sep 06 2024 support <[email protected]> - 5.0.0
+- More info: https://documentation.wazuh.com/current/release-notes/release-5.0.0-0.html
 * Tue Aug 20 2024 support <[email protected]> - 4.10.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-10-0.html
+* Fri Sep 06 2024 support <[email protected]> - 4.9.2
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
 * Thu Aug 15 2024 support <[email protected]> - 4.9.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-1.html
 * Thu Aug 15 2024 support <[email protected]> - 4.9.0