From 75da8358d8d728a46ada9e03f66bb72f78aa3876 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Fri, 6 Oct 2023 19:05:56 +0200
Subject: [PATCH 1/9] #1108 Use (and test) Solr 9.3.0 with PHP 8

---
 .github/workflows/php.yml  | 19 +++++++++-
 Vagrantfile                | 11 ++++--
 bin/install_solr_docker.sh | 77 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 99 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 bin/install_solr_docker.sh

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index b9d543f248..1f3d4e0dcd 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,7 +16,16 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.1','8.1']
+        php-versions: ['7.1', '8.1']
+        solr-versions: ['7.7.3', '9.3.0']
+        include:
+          - solr-versions: '9.3.0'
+            solr9-compatibility: true
+        exclude:
+          - php-versions: '7.1'
+            solr-versions: '9.3.0'
+          - php-versions: '8.1'
+            solr-versions: '7.7.3'
       fail-fast: false
 
     name: PHP ${{ matrix.php-versions }} Test
@@ -32,6 +41,12 @@ jobs:
       - name: Install Composer and Dependencies
         run: sudo apt-get update && curl -s http://getcomposer.org/installer | php && php composer.phar self-update && php composer.phar install
 
+      - name: Install Solr 9-compatible opus4-search package
+        if: ${{ matrix.solr9-compatibility }}
+        run: |
+          composer remove --dev "opus4-repo/search"
+          composer require --dev "opus4-repo/search":"dev-upgradeSolr35 as 4.8.1"
+
       - name: Fix for issue 502
         run: sudo apt-get --fix-broken install
 
@@ -39,7 +54,7 @@ jobs:
         run: sudo apt-get install libxml2-utils
 
       - name: Solr
-        run: sudo bash bin/install_solr_docker.sh
+        run: sudo bash bin/install_solr_docker.sh --version ${{ matrix.solr-versions }}
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
diff --git a/Vagrantfile b/Vagrantfile
index c323c0d8a4..d7533257d8 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -58,15 +58,16 @@ php bin/composer update
 SCRIPT
 
 $solr = <<SCRIPT
+SOLR_VERSION="9.3.0"
 cd /home/vagrant
 mkdir -p "downloads"
 cd downloads
-SOLR_TAR="solr-7.7.2.tgz"
+SOLR_TAR="solr-$SOLR_VERSION.tgz"
 if test ! -f "$SOLR_TAR"; then
-  wget "https://archive.apache.org/dist/lucene/solr/7.7.2/$SOLR_TAR"
+  wget -q "https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/$SOLR_TAR"
 fi
 tar xfz "$SOLR_TAR" -C /home/vagrant
-cd /home/vagrant/solr-7.7.2
+cd /home/vagrant/solr-$SOLR_VERSION
 mkdir -p server/solr/opus4/conf
 echo name=opus4 > server/solr/opus4/core.properties
 cd server/solr/opus4/conf/
@@ -122,6 +123,7 @@ fi
 if ! grep "PATH=/vagrant/bin" /home/vagrant/.bashrc > /dev/null; then
   echo "export PATH=/vagrant/bin:$PATH" >> /home/vagrant/.bashrc
 fi
+# Increase limits for Apache Solr
 if ! grep "vagrant hard" /etc/security/limits.conf > /dev/null; then
   echo "vagrant hard nofile 65535" >> /etc/security/limits.conf
   echo "vagrant soft nofile 65535" >> /etc/security/limits.conf
@@ -132,7 +134,8 @@ SCRIPT
 
 $start = <<SCRIPT
 sudo service apache2 reload
-cd /home/vagrant/solr-7.7.2
+SOLR_VERSION="9.3.0"
+cd /home/vagrant/solr-$SOLR_VERSION
 ./bin/solr start
 SCRIPT
 
diff --git a/bin/install_solr_docker.sh b/bin/install_solr_docker.sh
old mode 100644
new mode 100755
index a5c545f2ee..3bbc8fb61c
--- a/bin/install_solr_docker.sh
+++ b/bin/install_solr_docker.sh
@@ -1,7 +1,80 @@
 #!/usr/bin/env bash
 
-ant download-solr -DsolrVersion=7.7.2 -DdownloadDir=./downloads
-cd solr-7.7.2
+#
+# Script to install Solr. By default, version 9.3.0 will be installed.
+# Another Solr version can be specified using the `--version` option.
+
+script_name="$(basename "$0")"
+
+# Define variables and their default values
+version="9.3.0"
+
+# Define colors
+DEFAULT='\033[0;33m' # Purple color for default values
+OPTION='\033[1;32m'  # Green
+NC='\033[0m'         # No Color
+
+# Print command line help to stderr
+displayHelp() {
+  echo "Usage: $script_name [OPTIONS]" >&2
+  echo
+  echo -e "This script will install Solr version 9.3.0, unless"
+  echo -e "option ${OPTION}--version${NC} is specified with another Solr version."
+  echo
+  echo "Options:"
+  echo
+  echo -e "  ${OPTION}--help${NC}        (${OPTION}-h${NC})    Print out help"
+  echo
+  echo -e "                                          DEFAULT"
+  echo -e "  ${OPTION}--version${NC}             Solr version      (${DEFAULT}$version${NC})"
+  echo
+  echo "Examples:"
+  echo
+  echo -e "  $script_name"
+  echo -e "  $script_name ${OPTION}--help${NC}"
+  echo -e "  $script_name ${OPTION}--version${NC} ${DEFAULT}7.7.2${NC}"
+  echo
+  exit 1
+}
+
+# Display command line help if '-h' or '--help' is given as first option
+if [ $# -gt 0 ]; then
+    if [[ $1 == "-h" || $1 == "--help" ]]; then
+        displayHelp
+        exit 0
+    fi
+fi
+
+# Parse any other command line options
+while [ $# -gt 0 ]; do
+    if [[ $1 == "--"* ]]; then # only deal with long options
+        if [[ -n "$2" && $2 != "-"* ]]; then # ignore options without a value
+            # Create variable name from option name
+            v="${1/--/}" # uses parameter expansion removing '--'
+
+            # Read option value into variable
+            declare "$v"="$2"
+
+            # Process next option
+            shift
+        fi
+    fi
+    shift
+done
+
+if [[ "$version" =~ ^[1-8]\.[0-9]+\.[0-9]+$ ]]; then
+  SOLR_VERSION="$version"
+  ant download-solr -DsolrVersion=$SOLR_VERSION -DdownloadDir=./downloads
+elif [[ "$version" =~ ^(9|[1-9][0-9]+)\.[0-9]+\.[0-9]+$ ]]; then
+  SOLR_VERSION="$version"
+  wget -q "https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" -O - | tar -xz
+else
+  echo "Unrecognized version number"
+  echo -e "The ${OPTION}--version${NC} option requires a 3-digit version number, e.g.: 9.3.0"
+  exit 1
+fi
+
+cd solr-$SOLR_VERSION
 ./bin/solr start -force
 ./bin/solr create -c opus4 -force
 cd server/solr/opus4/conf/

From 87370f447c9bd6de095502895ec3355faaf9c411 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Fri, 6 Oct 2023 19:14:24 +0200
Subject: [PATCH 2/9] #1108 Fix incorrect GitHub workflow step "Install Solr
 9-compatible opus4-search package"

---
 .github/workflows/php.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1f3d4e0dcd..9fa577bffb 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -44,8 +44,7 @@ jobs:
       - name: Install Solr 9-compatible opus4-search package
         if: ${{ matrix.solr9-compatibility }}
         run: |
-          composer remove --dev "opus4-repo/search"
-          composer require --dev "opus4-repo/search":"dev-upgradeSolr35 as 4.8.1"
+          composer require "opus4-repo/search":"dev-upgradeSolr35 as 4.8.1"
 
       - name: Fix for issue 502
         run: sudo apt-get --fix-broken install

From 48d8025eb365ae1140b5a58c58b2a22c1f09a33c Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Mon, 9 Oct 2023 21:59:06 +0200
Subject: [PATCH 3/9] #1108 Try different workflow setup

---
 .github/workflows/php.yml | 26 ++++++--------------------
 composer.json             |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 9fa577bffb..6e51a4c034 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -16,16 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.1', '8.1']
-        solr-versions: ['7.7.3', '9.3.0']
-        include:
-          - solr-versions: '9.3.0'
-            solr9-compatibility: true
-        exclude:
-          - php-versions: '7.1'
-            solr-versions: '9.3.0'
-          - php-versions: '8.1'
-            solr-versions: '7.7.3'
+        versions: [{php: '7.1', solr: '7.7.3'}, {php: '8.1', solr: '9.3.0'}]
       fail-fast: false
 
     name: PHP ${{ matrix.php-versions }} Test
@@ -33,27 +24,22 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup PHP ${{ matrix.php-versions }}
+      - name: Setup PHP ${{ matrix.versions.php }}
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ matrix.versions.php }}
 
       - name: Install Composer and Dependencies
         run: sudo apt-get update && curl -s http://getcomposer.org/installer | php && php composer.phar self-update && php composer.phar install
 
-      - name: Install Solr 9-compatible opus4-search package
-        if: ${{ matrix.solr9-compatibility }}
-        run: |
-          composer require "opus4-repo/search":"dev-upgradeSolr35 as 4.8.1"
-
       - name: Fix for issue 502
         run: sudo apt-get --fix-broken install
 
       - name: Install additional Software
         run: sudo apt-get install libxml2-utils
 
-      - name: Solr
-        run: sudo bash bin/install_solr_docker.sh --version ${{ matrix.solr-versions }}
+      - name: Install Solr ${{ matrix.versions.solr }}
+        run: sudo bash bin/install_solr_docker.sh --version ${{ matrix.versions.solr }}
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
@@ -68,7 +54,7 @@ jobs:
         run: ant prepare-workspace prepare-test-workspace
 
       - name: Setup config
-        run: ant prepare-config lint -DdbUserPassword=root -DdbAdminPassword=root -DphpVersion=${{ matrix.php-versions }}
+        run: ant prepare-config lint -DdbUserPassword=root -DdbAdminPassword=root -DphpVersion=${{ matrix.versions.php }}
 
       - name: Setup testdata
         run: ant reset-testdata
diff --git a/composer.json b/composer.json
index b5e220f3ed..9c5e6427a5 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "jpgraph/jpgraph": "dev-master",
     "opus4-repo/opus4-common": "dev-master as 4.8.1",
     "opus4-repo/framework": "dev-master as 4.8.1",
-    "opus4-repo/search": ">4.7.2",
+    "opus4-repo/search": "4.7.3.x-dev || dev-upgradeSolr35",
     "opus4-repo/opus4-bibtex": "^4.8",
     "opus4-repo/opus4-import": "^4.8",
     "opus4-repo/opus4-pdf": "^4.8",

From a74167dd2ed5a735ea08f46cd49e9e26c00be4f3 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Tue, 10 Oct 2023 18:02:31 +0200
Subject: [PATCH 4/9] #1108 Removes again the --help option from
 install_solr_docker.sh as this is not a user-facing script but just used as
 part of automatic testing

---
 bin/install_solr_docker.sh | 48 +++++++-------------------------------
 1 file changed, 8 insertions(+), 40 deletions(-)

diff --git a/bin/install_solr_docker.sh b/bin/install_solr_docker.sh
index 3bbc8fb61c..2873579b05 100755
--- a/bin/install_solr_docker.sh
+++ b/bin/install_solr_docker.sh
@@ -9,43 +9,7 @@ script_name="$(basename "$0")"
 # Define variables and their default values
 version="9.3.0"
 
-# Define colors
-DEFAULT='\033[0;33m' # Purple color for default values
-OPTION='\033[1;32m'  # Green
-NC='\033[0m'         # No Color
-
-# Print command line help to stderr
-displayHelp() {
-  echo "Usage: $script_name [OPTIONS]" >&2
-  echo
-  echo -e "This script will install Solr version 9.3.0, unless"
-  echo -e "option ${OPTION}--version${NC} is specified with another Solr version."
-  echo
-  echo "Options:"
-  echo
-  echo -e "  ${OPTION}--help${NC}        (${OPTION}-h${NC})    Print out help"
-  echo
-  echo -e "                                          DEFAULT"
-  echo -e "  ${OPTION}--version${NC}             Solr version      (${DEFAULT}$version${NC})"
-  echo
-  echo "Examples:"
-  echo
-  echo -e "  $script_name"
-  echo -e "  $script_name ${OPTION}--help${NC}"
-  echo -e "  $script_name ${OPTION}--version${NC} ${DEFAULT}7.7.2${NC}"
-  echo
-  exit 1
-}
-
-# Display command line help if '-h' or '--help' is given as first option
-if [ $# -gt 0 ]; then
-    if [[ $1 == "-h" || $1 == "--help" ]]; then
-        displayHelp
-        exit 0
-    fi
-fi
-
-# Parse any other command line options
+# Parse command line options
 while [ $# -gt 0 ]; do
     if [[ $1 == "--"* ]]; then # only deal with long options
         if [[ -n "$2" && $2 != "-"* ]]; then # ignore options without a value
@@ -62,18 +26,22 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+# Download Solr version
 if [[ "$version" =~ ^[1-8]\.[0-9]+\.[0-9]+$ ]]; then
   SOLR_VERSION="$version"
   ant download-solr -DsolrVersion=$SOLR_VERSION -DdownloadDir=./downloads
-elif [[ "$version" =~ ^(9|[1-9][0-9]+)\.[0-9]+\.[0-9]+$ ]]; then
+elif [[ "$version" =~ ^(9|[1-9][0-9]+)\.[0-9]+\.[0-9]+$ ]]; then # new archive URL for versions >9.0.0
   SOLR_VERSION="$version"
-  wget -q "https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz" -O - | tar -xz
+  SOLR_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
+  echo "Getting: $SOLR_URL"
+  wget -q $SOLR_URL -O - | tar -xz
 else
   echo "Unrecognized version number"
-  echo -e "The ${OPTION}--version${NC} option requires a 3-digit version number, e.g.: 9.3.0"
+  echo -e "The --version option requires a 3-digit version number, e.g.: 9.3.0"
   exit 1
 fi
 
+# Configure & start Solr
 cd solr-$SOLR_VERSION
 ./bin/solr start -force
 ./bin/solr create -c opus4 -force

From dae909309167b22c27e7055001c1eda96ec4bdc0 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Tue, 10 Oct 2023 18:50:50 +0200
Subject: [PATCH 5/9] #1108 Fix typo in GitHub workflow test run name

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 6e51a4c034..d14d938d02 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -19,7 +19,7 @@ jobs:
         versions: [{php: '7.1', solr: '7.7.3'}, {php: '8.1', solr: '9.3.0'}]
       fail-fast: false
 
-    name: PHP ${{ matrix.php-versions }} Test
+    name: PHP ${{ matrix.versions.php }} Test
 
     steps:
       - uses: actions/checkout@v3

From c6b9c17f49dfc7c771ca2748a377cbb33a68e452 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Tue, 10 Oct 2023 22:08:49 +0200
Subject: [PATCH 6/9] #1108 In the Vagrantfile, define the Solr version only
 once

---
 Vagrantfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index d7533257d8..0283409933 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -58,7 +58,6 @@ php bin/composer update
 SCRIPT
 
 $solr = <<SCRIPT
-SOLR_VERSION="9.3.0"
 cd /home/vagrant
 mkdir -p "downloads"
 cd downloads
@@ -134,7 +133,6 @@ SCRIPT
 
 $start = <<SCRIPT
 sudo service apache2 reload
-SOLR_VERSION="9.3.0"
 cd /home/vagrant/solr-$SOLR_VERSION
 ./bin/solr start
 SCRIPT
@@ -155,17 +153,19 @@ Vagrant.configure("2") do |config|
   config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
   config.vm.network "forwarded_port", guest: 8983, host: 9983, host_ip: "127.0.0.1"
 
+  ENV['SOLR_VERSION']="9.3.0"
+
   config.vm.provision "Install required software...", type: "shell", inline: $software
   config.vm.provision "Install pandoc...", type: "shell", inline: $pandoc
   config.vm.provision "Install fonts...", type: "shell", inline: $fonts
   config.vm.provision "Install Composer dependencies...", type: "shell", privileged: false, inline: $composer
-  config.vm.provision "Install Apache Solr...", type: "shell", privileged: false, inline: $solr
+  config.vm.provision "Install Apache Solr...", type: "shell", privileged: false, inline: $solr, env: {"SOLR_VERSION" => ENV['SOLR_VERSION']}
   config.vm.provision "Create database...", type: "shell", inline: $database
   config.vm.provision "Configure OPUS 4...", type: "shell", privileged: false, inline: $opus
   config.vm.provision "Setup site in Apache2...", type: "shell", inline: $apache
   config.vm.provision "Fix permissions...", type: "shell", inline: $fix
   config.vm.provision "Setup environment...", type: "shell", inline: $environment
-  config.vm.provision "Start services...", type: "shell", privileged: false, run: "always", inline: $start
+  config.vm.provision "Start services...", type: "shell", privileged: false, run: "always", inline: $start, env: {"SOLR_VERSION" => ENV['SOLR_VERSION']}
   config.vm.provision "Initialize test data...", type: "shell", privileged: false, inline: $testdata
   config.vm.provision "Information", type: "shell", privileged: false, run: "always", inline: $help
 end

From d0ce76591682cab8bc28dc32185bff03adc46586 Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Wed, 11 Oct 2023 15:04:49 +0200
Subject: [PATCH 7/9] #1108 Display download info & progress when downloading
 Solr during Vagrant provisioning

---
 Vagrantfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 0283409933..0e3fa83e7d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -63,7 +63,9 @@ mkdir -p "downloads"
 cd downloads
 SOLR_TAR="solr-$SOLR_VERSION.tgz"
 if test ! -f "$SOLR_TAR"; then
-  wget -q "https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/$SOLR_TAR"
+  SOLR_URL="https://archive.apache.org/dist/solr/solr/$SOLR_VERSION/$SOLR_TAR"
+  echo "Getting: $SOLR_URL"
+  wget -q --show-progress --progress=bar:force $SOLR_URL
 fi
 tar xfz "$SOLR_TAR" -C /home/vagrant
 cd /home/vagrant/solr-$SOLR_VERSION

From 06e85a74aa47367f5c356ea6f51904645652528d Mon Sep 17 00:00:00 2001
From: Matthias Steffens <mat@extracts.de>
Date: Wed, 11 Oct 2023 21:36:47 +0200
Subject: [PATCH 8/9] #1118 Moves install scripts which are used for automatic
 testing from "bin" to "tests/bin" as these scripts are not meant to be
 user-facing

---
 .github/workflows/php.yml                  | 2 +-
 Jenkinsfile                                | 4 ++--
 {bin => tests/bin}/install_mysql_docker.sh | 0
 {bin => tests/bin}/install_solr_docker.sh  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {bin => tests/bin}/install_mysql_docker.sh (100%)
 rename {bin => tests/bin}/install_solr_docker.sh (100%)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index d14d938d02..35d85d8a5a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -39,7 +39,7 @@ jobs:
         run: sudo apt-get install libxml2-utils
 
       - name: Install Solr ${{ matrix.versions.solr }}
-        run: sudo bash bin/install_solr_docker.sh --version ${{ matrix.versions.solr }}
+        run: sudo bash tests/bin/install_solr_docker.sh --version ${{ matrix.versions.solr }}
 
       - name: Start MySQL
         run: sudo systemctl start mysql.service
diff --git a/Jenkinsfile b/Jenkinsfile
index 7dc217b15d..2138dd3a5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,13 +40,13 @@ pipeline {
 
         stage('Install Solr') {
             steps {
-                sh 'sudo bash bin/install_solr_docker.sh'
+                sh 'sudo bash tests/bin/install_solr_docker.sh'
             }
         }
 
         stage('Install MySQL') {
             steps {
-                sh 'sudo bash bin/install_mysql_docker.sh'
+                sh 'sudo bash tests/bin/install_mysql_docker.sh'
             }
         }
 
diff --git a/bin/install_mysql_docker.sh b/tests/bin/install_mysql_docker.sh
similarity index 100%
rename from bin/install_mysql_docker.sh
rename to tests/bin/install_mysql_docker.sh
diff --git a/bin/install_solr_docker.sh b/tests/bin/install_solr_docker.sh
similarity index 100%
rename from bin/install_solr_docker.sh
rename to tests/bin/install_solr_docker.sh

From eeb1b39819c32ef27f9be817c219db70c9b5aaed Mon Sep 17 00:00:00 2001
From: j3nsch <j3nsch@gmail.com>
Date: Fri, 20 Oct 2023 16:57:23 +0200
Subject: [PATCH 9/9] #1108 Depend on dev versions of opus4-search

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9c5e6427a5..8a349a71e0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     "jpgraph/jpgraph": "dev-master",
     "opus4-repo/opus4-common": "dev-master as 4.8.1",
     "opus4-repo/framework": "dev-master as 4.8.1",
-    "opus4-repo/search": "4.7.3.x-dev || dev-upgradeSolr35",
+    "opus4-repo/search": "4.7.3.x-dev || 4.8.1.x-dev",
     "opus4-repo/opus4-bibtex": "^4.8",
     "opus4-repo/opus4-import": "^4.8",
     "opus4-repo/opus4-pdf": "^4.8",