[TASK] Prepare EXT:solr ELTS for TYPO3 ELTS 10.4

.ddev/commands/host/clone

@@ -45,6 +45,6 @@ if ! [[ "$EXT_SOLR_PLUGIN_NAME" == "solr" ]]; then
   if [[ -d "packages/introduction_$EXT_SOLR_PLUGIN_NAME" ]]; then
     ddev solr:enable $EXT_SOLR_PLUGIN_NAME
   else
-    ddev composer req "apache-solr-for-typo3/$EXT_SOLR_PLUGIN_NAME":"@dev"
+    ddev composer req "apache-solr-for-typo3/$EXT_SOLR_PLUGIN_NAME:@dev"
   fi
 fi

.ddev/config.yaml

@@ -1,4 +1,4 @@
-name: solr-ddev-site
+name: solr-11.2
 type: typo3
 docroot: public
 php_version: "7.4"
@@ -29,7 +29,7 @@ hooks:
         echo '* * * * * TYPO3_CONTEXT=Development /usr/bin/php /var/www/html/vendor/bin/typo3 scheduler:run';
       } | crontab -
 
-webimage_extra_packages: [cron, jq, openjdk-11-jre-headless, parallel]
+webimage_extra_packages: [cron, jq, openjdk-17-jre-headless, parallel]
 use_dns_when_possible: true
 timezone: UTC
 composer_version: "2"

.ddev/docker-compose.solr.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   solr-site: &typo3-solr-service
     container_name: ddev-${DDEV_SITENAME}-solr-site
@@ -11,8 +9,6 @@ services:
         SOLR_UNIX_UID: ${DDEV_UID}
         SOLR_UNIX_GID: ${DDEV_GID}
     restart: "no"
-    ports:
-      - 8983
     volumes:
       - solr-site:/var/solr
     labels:
@@ -27,14 +23,15 @@ services:
   solr-tests:
     <<: *typo3-solr-service
     container_name: ddev-${DDEV_SITENAME}-solr-tests
-    ports:
-      - 8985
     volumes:
       - solr-tests:/var/solr
     environment:
       - VIRTUAL_HOST=$DDEV_HOSTNAME
       - SOLR_PORT=8985
       - HTTP_EXPOSE=8985
+      - HTTPS_EXPOSE=8985
+      - TYPO3_SOLR_ENABLED_CORES=english danish german
+
   web:
     links:
       - solr-tests:$DDEV_HOSTNAME
@@ -52,4 +49,4 @@ volumes:
     driver_opts:
       type: none
       device: $DDEV_APPROOT/.ddev/solr/tests
-      o: bind
+      o: bind

config/sites/introduction/config.yaml

@@ -1,5 +1,5 @@
 rootPageId: 1
-base: 'https://solr-ddev-site.ddev.site/'
+base: 'https://solr-11.2.ddev.site/'
 baseVariants: {  }
 languages:
   -

public/typo3conf/AdditionalConfiguration.php

@@ -3,8 +3,8 @@
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['errorHandlerErrors'] = E_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['exceptionalErrors'] = E_WARNING | E_RECOVERABLE_ERROR | E_DEPRECATED | E_USER_DEPRECATED;
 
-$GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern']  = 'localhost|solr-ddev-site.ddev.site';
-$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['sites'][1]['domains'][]  = 'solr-ddev-site.ddev.site';
+$GLOBALS['TYPO3_CONF_VARS']['SYS']['trustedHostsPattern']  = 'localhost|solr-11.2.ddev.site';
+$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['sites'][1]['domains'][]  = 'solr-11.2.ddev.site';
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 /* Configure Tika within solr-ddev-site                                                                               */