Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/elastic-search-codeception.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
PIMCORE_VERSION: ${{ matrix.matrix.pimcore_version }}
REQUIRE_ADMIN_BUNDLE: "false"
PIMCORE_ELASTIC_SEARCH_HOST: "39201"
PIMCORE_ELASTIC_SEARCH_VERSION: "8.5.3"
PIMCORE_ELASTIC_SEARCH_VERSION: "8.12.2"
ENABLE_ELASTICSEARCH: true
COVERAGE: "xdebug"
secrets:
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"pimcore/pimcore": "^2026.1.5",
"pimcore/static-resolver-bundle": "^2026.1",
"pimcore/opensearch-client": "^2026.1.1",
"pimcore/elasticsearch-client": "^2026.1",
"pimcore/elasticsearch-client": "^2026.3",
Comment thread
kingjia90 marked this conversation as resolved.
"doctrine/orm": "^3.0",
"doctrine/dbal": "^4.4",
"symfony/scheduler": "^7.2"
Expand Down
4 changes: 3 additions & 1 deletion doc/01_Installation/02_Upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ description: Version-specific upgrade instructions and breaking changes for the

## Upgrade to 2026.3.0

- [Elasticsearch] Raised the minimum supported Elasticsearch server version to `8.12.2`
(`pimcore/elasticsearch-client` `^2026.3` now requires the `elasticsearch/elasticsearch` client library `^8.12`).
- Added command `generic-data-index:cleanup:unused-indices` to delete managed indices not referenced by any alias.
- [Searching] Element search result items now expose therelevance score via the new
- [Searching] Element search result items now expose the relevance score via the new
`ScoreAwareResultItemInterface`.
- [Searching] The search result models now expose `getMaxScore()`

Expand Down
2 changes: 1 addition & 1 deletion doc/01_Installation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: Install and configure the Generic Data Index bundle with OpenSearch

:::info

This bundle requires OpenSearch >= 2.7 and < 3.0 or Elasticsearch >= 8.0.0.
This bundle requires OpenSearch >= 2.7 and < 3.0 or Elasticsearch >= 8.12.2 (< 9).
OpenSearch 3 is not supported yet.

:::
Expand Down
4 changes: 2 additions & 2 deletions doc/02_Configuration/05_Elasticsearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description: Configure Elasticsearch as the search engine for the Generic Data I

:::info

Requires Elasticsearch >= 8.0
Requires Elasticsearch >= 8.12.2

:::

Expand Down Expand Up @@ -35,7 +35,7 @@ pimcore_generic_data_index:
```

For additional client options, see the
[Pimcore Elasticsearch Client documentation](https://github.com/pimcore/elasticsearch-client/blob/1.x/README.md).
[Pimcore Elasticsearch Client documentation](https://github.com/pimcore/elasticsearch-client#readme).

## Disable Auto-Index Creation

Expand Down
2 changes: 1 addition & 1 deletion tests/bin/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
hard: 65536

elastic:
image: elasticsearch:8.5.3
image: elasticsearch:8.12.2
environment:
- discovery.type=single-node
- ES_JAVA_OPTS=-Xms1g -Xmx1g
Expand Down
8 changes: 7 additions & 1 deletion tests/bin/init-functional-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ docker compose down -v --remove-orphans

docker compose up -d

docker compose exec php .github/ci/scripts/setup-pimcore-environment-functional-tests.sh "$SEARCH_ENGINE"
# The setup script switches to Elasticsearch automatically when the ES host is reachable,
# so stop the Elasticsearch container when testing against OpenSearch.
if [ "$SEARCH_ENGINE" != "elasticsearch" ]; then
docker compose stop elastic
fi

docker compose exec php .github/ci/scripts/setup-pimcore-environment.sh

docker compose exec php composer config --global --auth http-basic.repo.pimcore.com token $1

Expand Down
Loading