Merge branch 'refs/heads/2024.1' into 2024.x

# Conflicts:
#	doc/02_Platform_Version_Releases/2024.1.md
#	doc/03_Release_Notes/2024.1.md

.github/files/bundles.php

@@ -22,13 +22,11 @@
 
     \Pimcore\Bundle\DataHubBundle\PimcoreDataHubBundle::class => ['all' => true],
     \Pimcore\Bundle\DataHubSimpleRestBundle\PimcoreDataHubSimpleRestBundle::class => ['all' => true],
-    \Pimcore\Bundle\DataHubCiHubBundle\PimcoreDataHubCiHubBundle::class => ['all' => true],
     \Pimcore\Bundle\DataHubFileExportBundle\PimcoreDataHubFileExportBundle::class => ['all' => true],
     \Pimcore\Bundle\DataHubProductsupBundle\PimcoreDataHubProductsupBundle::class => ['all' => true],
     \Pimcore\Bundle\DataImporterBundle\PimcoreDataImporterBundle::class => ['all' => true],
     \Pimcore\Bundle\CustomReportsBundle\PimcoreCustomReportsBundle::class => ['all' => true],
     \Pimcore\Bundle\OpenIdConnectBundle\PimcoreOpenIdConnectBundle::class => ['all' => true],
-    \AdvancedObjectSearchBundle\AdvancedObjectSearchBundle::class => ['all' => true],
 
     \Pimcore\AssetMetadataClassDefinitionsBundle\PimcoreAssetMetadataClassDefinitionsBundle::class => ['all' => true],
     \FrontendPermissionToolkitBundle\FrontendPermissionToolkitBundle::class => ['all' => true],
@@ -53,6 +51,8 @@
     \Pimcore\Bundle\DataQualityManagementBundle\PimcoreDataQualityManagementBundle::class => ['all' => true],
     \Pimcore\Bundle\WorkflowAutomationIntegrationBundle\PimcoreWorkflowAutomationIntegrationBundle::class => ['all' => true],
     \Pimcore\Bundle\AdminUiClassicLightThemeBundle\PimcoreAdminUiClassicLightThemeBundle::class => ['all' => true],
+    \Pimcore\Bundle\GenericDataIndexBundle\PimcoreGenericDataIndexBundle::class => ['all' => true],
+    \Pimcore\Bundle\CopilotBundle\PimcoreCopilotBundle::class => ['all' => true],
 ];
 
 

.github/files/config-portal-engine.yaml

@@ -1,6 +1,6 @@
 pimcore_portal_engine:
-    messenger_queue_processing:
-        activated: true
+
+
     custom_public_routes:
         - pimcore_saas_ping
         - pimcore_saas_monitoring

.github/files/config-system.yaml

@@ -9,10 +9,10 @@ pimcore:
     gotenberg:
         base_url: 'http://gotenberg:3000'
 
-pimcore_elasticsearch_client:
-    es_clients:
+pimcore_open_search_client:
+    clients:
         default:
-            hosts: [ 'elastic:9200' ]
-            username: 'elastic'
-            password: 'somethingsecret'
-            logger_channel: 'pimcore.elasicsearch'
+            hosts: ['https://opensearch:9200']
+            password: 'XkxGSdN0sMdq9OS'
+            username: 'admin'
+            ssl_verification: false

.github/files/docker-compose.override.yaml

@@ -2,8 +2,6 @@ services:
 
     php:
         user: www-data:0
-        environment:
-            PIMCORE_ES_CLIENT_HOST: elastic:9200
 
     supervisord:
         user: www-data:0
@@ -22,23 +20,28 @@ services:
         ports:
             - "8089:80"
         #    - "8443:443"
-
-    elastic:
-        image: elasticsearch:7.17.9
+    opensearch:
+        image: opensearchproject/opensearch:latest
         environment:
+            - cluster.name=opensearch-cluster # Name the cluster
+            - node.name=opensearch-node # Name the node that will run in this container
+            - discovery.seed_hosts=opensearch-node # Nodes to look for when discovering the cluster
+            # - cluster.initial_cluster_manager_nodes=opensearch-node # Nodes eligible to serve as cluster manager
+            - bootstrap.memory_lock=true # Disable JVM heap memory swapping
+            - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # Set min and max JVM heap sizes to at least 50% of system RAM
             - discovery.type=single-node
-            - ES_JAVA_OPTS=-Xms1g -Xmx1g
-            - xpack.security.enabled=true
-            - xpack.security.authc.anonymous.roles=superuser,kibana_admin,kibana_system,kibana_user
-            - ELASTIC_USERNAME=elastic
-            - ELASTIC_PASSWORD=somethingsecret
+            - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=XkxGSdN0sMdq9OS"
         ports:
             - "9200:9200"
-        deploy:
-            resources:
-                limits:
-                    cpus: '1'
-                    memory: '2G'
+        ulimits:
+            memlock:
+                soft: -1 # Set memlock to unlimited (no soft or hard limit)
+                hard: -1
+            nofile:
+                soft: 65536 # Maximum number of open files for the opensearch user - set to at least 65536
+                hard: 65536
+        volumes:
+            - pimcore-demo-opensearch:/usr/share/opensearch/data
 
     chrome:
         image: browserless/chrome
@@ -50,3 +53,6 @@ networks:
   default:
     name: k6-test-network
     external: true        
+
+volumes:
+    pimcore-demo-opensearch:

.github/files/docker-compose.yaml

@@ -0,0 +1,70 @@
+services:
+    redis:
+        image: redis:alpine
+        command: [ redis-server, --maxmemory 128mb, --maxmemory-policy volatile-lru, --save "" ]
+
+    db:
+        image: mariadb:10.11
+        working_dir: /application
+        command: [ mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_general_ci, --innodb-file-per-table=1 ]
+        volumes:
+            - pimcore-database:/var/lib/mysql
+        environment:
+            - MYSQL_ROOT_PASSWORD=ROOT
+            - MYSQL_DATABASE=pimcore
+            - MYSQL_USER=pimcore
+            - MYSQL_PASSWORD=pimcore
+        healthcheck:
+            # The service is considered healthy when:
+            # - connection to pimcore db can be established, and
+            # - we can run a simple SQL query.
+            test: [ "CMD-SHELL", "mysql -h db -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE -e 'SHOW TABLES;'" ]
+            interval: 10s
+            retries: 6
+            start_period: 1m
+            timeout: 3s
+
+    nginx:
+        image: nginx:stable-alpine
+        ports:
+            - "80:80"
+        volumes:
+            - .:/var/www/html:ro
+            - ./.docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+        depends_on:
+            - php
+
+    php:
+        #user: '1000:1000' # set to your uid:gid
+        image: pimcore/pimcore:php8.2-debug-latest
+        environment:
+            COMPOSER_HOME: /var/www/html
+            PHP_IDE_CONFIG: serverName=localhost
+            # Feed installer configuration via ENV variables.
+            # See: https://pimcore.com/docs/pimcore/current/Development_Documentation/Getting_Started/Advanced_Installation_Topics.html#page_Advanced-Installation-Topics
+            PIMCORE_INSTALL_MYSQL_USERNAME: pimcore
+            PIMCORE_INSTALL_MYSQL_PASSWORD: pimcore
+            PIMCORE_INSTALL_MYSQL_PORT: 3306
+            PIMCORE_INSTALL_MYSQL_HOST_SOCKET: db
+            PIMCORE_INSTALL_MYSQL_DATABASE: pimcore
+        depends_on:
+            db:
+                condition: service_healthy
+        volumes:
+            - .:/var/www/html
+
+    supervisord:
+        #user: '1000:1000' # set to your uid:gid
+        image: pimcore/pimcore:php8.2-supervisord-latest
+        depends_on:
+            db:
+                condition: service_healthy
+        volumes:
+            - .:/var/www/html
+            - ./.docker/supervisord.conf:/etc/supervisor/conf.d/pimcore.conf:ro
+
+volumes:
+    pimcore-database:
+    pimcore-test-database:
+    pimcore-test-var:
+    pimcore-test-public-var:

.github/files/parameters.yaml

@@ -1,6 +1,3 @@
 parameters:
     secret: 'some-secret-value'
-    app_encryption_secret: 'some-more-secret'
-    es_client: 'elastic'
-    pimcore_portal_engine.elasticsearch.host: 'elastic'
-    pimcore_portal_engine.elasticsearch.index_prefix: 'portal_'
+    app_encryption_secret: 'some-more-secret'

.github/files/supervisord.conf

@@ -1,7 +1,7 @@
 # Important Notice: this configuration is not optimized for production use!
 
 [program:messenger-consume]
-command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_scheduled_tasks pimcore_index_queues pimcore_data_import pimcore_datahub_fileexport portal-engine-async pimcore_maintenance pimcore_image_optimize pimcore_asset_update pimcore_search_backend_message pimcore_datahub_webhooks  --memory-limit=250M --time-limit=3600 -vv
+command=php /var/www/html/bin/console messenger:consume pimcore_core pimcore_scheduled_tasks pimcore_index_queues pimcore_data_import pimcore_datahub_fileexport portal-engine-async pimcore_maintenance pimcore_image_optimize pimcore_asset_update pimcore_search_backend_message pimcore_datahub_webhooks pimcore_generic_data_index_queue --memory-limit=250M --time-limit=3600 -vv
 numprocs=2
 startsecs=0
 autostart=true

.github/scripts/01-setup-environment.sh

@@ -19,6 +19,7 @@ docker run \
 
 cd test-project/
 
+cp ../../platform-version/.github/files/docker-compose.yaml .
 cp ../../platform-version/.github/files/docker-compose.override.yaml .
 cp ../../platform-version/.github/files/supervisord.conf .docker/
 cp ../../platform-version/.github/files/.env.local .
@@ -55,7 +56,6 @@ docker compose exec -T -- php composer require -W \
     gotenberg/gotenberg-php:^1.1 \
     pimcore/admin-ui-classic-bundle \
     pimcore/asset-metadata-class-definitions \
-    pimcore/data-hub-ci-hub \
     pimcore/data-hub-file-export \
     pimcore/data-hub-productsup \
     pimcore/data-hub-simple-rest \
@@ -75,7 +75,6 @@ docker compose exec -T -- php composer require -W \
     pimcore/output-data-config-toolkit-bundle \
     pimcore/object-merger \
     pimcore/frontend-permission-toolkit-bundle \
-    pimcore/advanced-object-search \
     pimcore/system-info-bundle \
     pimcore/file-explorer-bundle \
     pimcore/personalization-bundle \
@@ -87,6 +86,8 @@ docker compose exec -T -- php composer require -W \
     pimcore/data-hub-webhooks \
     pimcore/backend-power-tools-bundle \
     pimcore/admin-ui-classic-light-theme-bundle \
+    pimcore/copilot-bundle \
+    pimcore/generic-data-index-bundle \
     pimcore/workflow-automation-integration-bundle
 
 docker compose exec -T -- php composer update
@@ -100,4 +101,4 @@ docker compose exec -u root -T -- php bash -c '\
 
 # Wait for the database to set up.
 docker compose exec -T -- php dockerize -wait tcp://db:3306 -timeout 5m
-docker compose exec -T -- php dockerize -wait tcp://elastic:9200 -timeout 5m
+docker compose exec -T -- php dockerize -wait tcp://opensearch:9200 -timeout 5m

.github/scripts/02-install-pimcore.sh

@@ -43,18 +43,15 @@ docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubBund
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataImporterBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubFileExportBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubSimpleRestBundle
-docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubCiHubBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubProductsupBundle
 cp ../../platform-version/.github/files/config-datahub.yaml ./config/local
 
-docker compose exec -T php bin/console pimcore:bundle:install AdvancedObjectSearchBundle
-cp ../../platform-version/.github/files/config-advanced-object-search.yaml ./config/local
-
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreAssetMetadataClassDefinitionsBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreStatisticsExplorerBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDirectEditBundle
 docker compose exec -T php bin/console doctrine:schema:update --force
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreOpenIdConnectBundle
+docker compose exec -T php bin/console pimcore:bundle:install PimcoreGenericDataIndexBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcorePortalEngineBundle
 cp ../../platform-version/.github/files/config-portal-engine.yaml ./config/local
 
@@ -71,6 +68,7 @@ docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataQuality
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreDataHubWebhooksBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreBackendPowerToolsBundle
 docker compose exec -T php bin/console pimcore:bundle:install PimcoreWorkflowAutomationIntegrationBundle
+docker compose exec -T php bin/console pimcore:bundle:install PimcoreCopilotBundle
 
 cp ../../platform-version/.github/files/config-config.yaml ./config/local
 

composer.json

@@ -3,42 +3,45 @@
   "type": "library",
   "description": "Verified Pimcore Version",
   "license": "proprietary",
+  "require": {
+    "php": "~8.2.0"
+  },
   "conflict": {
-    "pimcore/asset-metadata-class-definitions":  "<2.0 || > 2.0.99",
-    "pimcore/data-hub-ci-hub":  "<1.2 || > 1.2.99",
-    "pimcore/data-hub-file-export":  "<2.0 || > 2.0.99",
-    "pimcore/data-hub-productsup":  "<2.0 || > 2.0.99",
-    "pimcore/data-hub-simple-rest":  "<2.0 || > 2.0.99",
-    "pimcore/direct-edit":  "<2.0.1 || > 2.0.99",
-    "pimcore/headless-documents":  "<2.1 || > 2.1.99",
-    "pimcore/openid-connect":  "<1.1 || > 1.1.99",
-    "pimcore/portal-engine":  "<3.1 || > 3.1.99",
-    "pimcore/statistics-explorer":  "<2.0 || > 2.0.99",
-    "pimcore/translations-provider-interfaces":  "<3.0 || > 3.0.99",
-    "pimcore/workflow-designer":  "<1.1 || > 1.1.99",
-    "pimcore/data-importer":  "<1.8 || > 1.8.99",
-    "pimcore/data-hub":  "<1.6 || > 1.6.99",
-    "pimcore/customer-management-framework-bundle":  "<4.0 || > 4.0.99",
-    "pimcore/web2print-tools-bundle":  "<5.0 || > 5.0.99",
-    "pimcore/perspective-editor":  "<1.7.0 || > 1.7.99",
-    "pimcore/output-data-config-toolkit-bundle":  "<5.0 || > 5.0.99",
-    "pimcore/object-merger":  "<4.0 || > 4.0.99",
-    "pimcore/frontend-permission-toolkit-bundle":  "<2.0 || > 2.0.99",
-    "pimcore/advanced-object-search":  "<5.0 || > 5.0.99",
-    "pimcore/admin-ui-classic-bundle": "<1.3 || > 1.3.99",
+    "pimcore/asset-metadata-class-definitions": "<2.0 || > 2.0.99",
+    "pimcore/data-hub-file-export": "<2.1 || > 2.1.99",
+    "pimcore/data-hub-productsup": "<2.1 || > 2.1.99",
+    "pimcore/data-hub-simple-rest": "<3.0.1 || > 3.0.99",
+    "pimcore/direct-edit": "<2.0.1 || > 2.0.99",
+    "pimcore/headless-documents": "<2.1 || > 2.1.99",
+    "pimcore/openid-connect": "<1.1 || > 1.1.99",
+    "pimcore/portal-engine": "<4.0.2 || > 4.0.99",
+    "pimcore/statistics-explorer": "<2.1 || > 2.1.99",
+    "pimcore/translations-provider-interfaces": "<3.0 || > 3.0.99",
+    "pimcore/workflow-designer": "<1.2 || > 1.2.99",
+    "pimcore/data-importer": "<1.8 || > 1.8.99",
+    "pimcore/data-hub": "<1.7 || > 1.7.99",
+    "pimcore/customer-management-framework-bundle": "<4.0 || > 4.0.99",
+    "pimcore/web2print-tools-bundle": "<5.0 || > 5.0.99",
+    "pimcore/perspective-editor": "<1.7.0 || > 1.7.99",
+    "pimcore/output-data-config-toolkit-bundle": "<5.0 || > 5.0.99",
+    "pimcore/object-merger": "<4.0 || > 4.0.99",
+    "pimcore/frontend-permission-toolkit-bundle": "<2.0 || > 2.0.99",
+    "pimcore/admin-ui-classic-bundle": "<1.4 || > 1.4.99",
     "pimcore/system-info-bundle": "<1.0 || > 1.0.99",
     "pimcore/file-explorer-bundle": "<1.0 || > 1.0.99",
     "pimcore/personalization-bundle": "<1.0 || > 1.0.99",
     "pimcore/google-marketing-bundle": "<1.0 || > 1.0.99",
-    "pimcore/web-to-print-bundle": "<1.1 || > 1.1.99",
+    "pimcore/web-to-print-bundle": "<1.2 || > 1.2.99",
     "pimcore/ecommerce-framework-bundle": "<1.0 || > 1.0.99",
     "pimcore/newsletter-bundle": "<1.1 || > 1.1.99",
     "pimcore/data-quality-management-bundle": "<1.1 || > 1.1.99",
-    "pimcore/data-hub-webhooks": "<1.0 || > 1.0.99",
-    "pimcore/backend-power-tools-bundle": "<1.1 || > 1.1.99",
+    "pimcore/data-hub-webhooks": "<1.1 || > 1.1.99",
+    "pimcore/backend-power-tools-bundle": "<1.2 || > 1.2.99",
     "pimcore/workflow-automation-integration-bundle": "<1.0 || > 1.0.99",
-    "pimcore/static-resolver-bundle": "<1.2 || > 1.2.99",
+    "pimcore/static-resolver-bundle": "<1.4 || > 1.4.99",
     "pimcore/admin-ui-classic-light-theme-bundle": "<1.0 || > 1.0.99",
-    "pimcore/pimcore": "<11.1 || > 11.1.99"
+    "pimcore/copilot-bundle": "<1.0 || > 1.0.99",
+    "pimcore/generic-data-index-bundle": "<1.0.2 || > 1.0.99",
+    "pimcore/pimcore": "<11.2.2 || > 11.2.99"
   }
 }

doc/02_Platform_Version_Releases/2023.2.md

@@ -30,10 +30,11 @@ Following table lists all Pimcore modules and their version included in platform
 | [pimcore/headless-documents](https://github.com/pimcore/headless-documents) | 2.0              | 
 | [pimcore/direct-edit](https://github.com/pimcore/direct-edit) | 2.0              | 
 | [pimcore/data-hub-simple-rest](https://github.com/pimcore/data-hub-simple-rest) | 2.0              | 
-| [pimcore/data-hub-productsup](https://github.com/pimcore/data-hub-productsup) | 1.3              | 
+| [pimcore/data-hub-productsup](https://github.com/pimcore/data-hub-productsup) | 2.0              | 
 | [pimcore/data-hub-file-export](https://github.com/pimcore/data-hub-file-export) | 2.0              | 
 | [pimcore/data-hub-ci-hub](https://github.com/pimcore/data-hub-ci-hub) | 1.2              | 
 | [pimcore/data-quality-management-bundle](https://github.com/pimcore/data-quality-management-bundle) | 1.0              |
 | [pimcore/data-hub-webhooks](https://github.com/pimcore/data-hub-webhooks) | 1.0              |
 | [pimcore/backend-power-tools-bundle](https://github.com/pimcore/backend-power-tools-bundle) | 1.0              |
 | [pimcore/static-resolver-bundle](https://github.com/pimcore/static-resolver-bundle) | 1.0              |
+| [pimcore/asset-metadata-class-definitions](https://github.com/pimcore/asset-metadata-class-definitions) | 2.0              | 

doc/02_Platform_Version_Releases/2023.3.md

@@ -37,5 +37,6 @@ Following table lists all Pimcore modules and their version included in platform
 | [pimcore/data-hub-webhooks](https://github.com/pimcore/data-hub-webhooks) | 1.0              |
 | [pimcore/backend-power-tools-bundle](https://github.com/pimcore/backend-power-tools-bundle) | 1.1              |
 | [pimcore/static-resolver-bundle](https://github.com/pimcore/static-resolver-bundle) | 1.2              |
+| [pimcore/asset-metadata-class-definitions](https://github.com/pimcore/asset-metadata-class-definitions) | 2.0              | 
 | [pimcore/workflow-automation-integration-bundle](https://github.com/pimcore/workflow-automation-integration-bundle) | 1.0              |
 | [pimcore/ee-admin-ui-classic-light-theme-bundle](https://github.com/pimcore/ee-admin-ui-classic-light-theme-bundle) | 1.0              |

doc/02_Platform_Version_Releases/2024.1.md

@@ -35,6 +35,7 @@ Following table lists all Pimcore modules and their version included in platform
 | [pimcore/data-hub-webhooks](https://github.com/pimcore/data-hub-webhooks)                                           | 1.1              |
 | [pimcore/backend-power-tools-bundle](https://github.com/pimcore/backend-power-tools-bundle)                         | 1.2              |
 | [pimcore/static-resolver-bundle](https://github.com/pimcore/static-resolver-bundle)                                 | 1.4              |
+| [pimcore/asset-metadata-class-definitions](https://github.com/pimcore/asset-metadata-class-definitions) | 2.0              | 
 | [pimcore/workflow-automation-integration-bundle](https://github.com/pimcore/workflow-automation-integration-bundle) | 1.0              |
 | [pimcore/ee-admin-ui-classic-light-theme-bundle](https://github.com/pimcore/ee-admin-ui-classic-light-theme-bundle) | 1.0              |
 | [pimcore/copilot-bundle](https://github.com/pimcore/copilot-bundle)                                                 | 1.0              |