Merge branch 'search_highlight' of github.com:kylehuynh205/islandora-…

…starter-site into islandora_group

* 'search_highlight' of github.com:kylehuynh205/islandora-starter-site:
  Update version of Advanced Search include fixes for https://github.com/digitalutsc/advanced_search/issues/33 and Islandora-Devops#96 (comment)
  Update composer.lock
  Enable Search hightlight settings for Search API Added Search hightlight field for search views Change Advanced Search module to the beta release
  Bump JWT.
  Update jwt

# Conflicts:
#	composer.lock

composer.json

@@ -25,10 +25,19 @@
                 }
             }
         },
-	{
-	    "type": "vcs",
-	    "url": "https://github.com/digitalutsc/advanced_search.git"
-	}
+	    {
+            "type": "package",
+            "package": {
+              "name": "islandora/advanced_search",
+              "version": "2.0.0-beta3",
+              "type": "drupal-module",
+              "source": {
+                "url": "https://github.com/digitalutsc/advanced_search",
+                "type": "git",
+                "reference":"2.0.0-beta3"
+              }
+            }
+        }
     ],
     "require": {
         "php": "^7.4 || ^8",
@@ -58,16 +67,16 @@
         "drupal/views_field_view": "^1.0@beta",
         "drush/drush": "^10.3",
         "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev",
-        "islandora/advanced_search": "dev-contrib",
+        "islandora/advanced_search": "^2.0.0@beta",
         "islandora/controlled_access_terms": "^2",
-        "islandora/islandora": "^2",
+        "islandora/islandora": "^2.8.1",
         "islandora/openseadragon": "^2",
         "islandora/views_nested_details": "^1.0",
         "library/pdf.js": "^2.4",
         "mjordan/islandora_workbench_integration": "^1.0",
-        "digitalutsc/islandora_group": "2.x-dev",
-        "digitalutsc/group_solr": "dev-main",
-        "digitalutsc/private_files_adapter": "dev-main"
+        "digitalutsc/group_solr": "^1.0.0-beta",
+        "digitalutsc/islandora_group": "^1.0.0-beta",
+        "digitalutsc/private_files_adapter": "^1.0.0@beta"
     },
     "conflict": {
         "drupal/drupal": "*",