hyrax ~> 5.2.0

.github/actions/build-container/action.yml

@@ -39,7 +39,7 @@ runs:
         echo "tag=$clean_tag" >> "$GITHUB_OUTPUT"
     -
       name: Build and push ${{ inputs.image_name }} container
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v7
       with:
         build-args: |
           build_date="${{ steps.build_date.outputs.date }}"

.github/workflows/build-containers.yml

@@ -31,10 +31,10 @@ jobs:
         environment: ${{ fromJson(inputs.environments) }}
         service: ${{ fromJson(inputs.services) }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       -
         name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           role-to-assume: ${{ secrets.aws_role_to_assume }}
           aws-region: ${{ vars.AWS_REGION }}
@@ -44,7 +44,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v4
       -
         name: Get service config
         id: service

.github/workflows/lint-and-test.yml

@@ -10,7 +10,7 @@ jobs:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_WITH: test
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
@@ -19,13 +19,16 @@ jobs:
         run: bundle exec rubocop --format github
 
   test:
-    name: Test
+    name: "Test (Valkyrie enabled: ${{ matrix.hyrax_valkyrie_enabled }})"
     runs-on: ubuntu-latest
     container:
-      image: ruby:2.7.8-slim-bullseye
+      image: ruby:3.2.9-slim-bookworm
       volumes:
         - solr:/tmp/solr
     needs: lint
+    strategy:
+      matrix:
+        hyrax_valkyrie_enabled: [false]
     services:
       database:
         image: postgres:13-alpine
@@ -51,17 +54,21 @@ jobs:
         ports:
           - 6379:6379
       solr:
-        image: solr:8.11.4
+        image: solr:9.10.1
         ports:
           - 8983:8983
         volumes:
-          - solr:/var/solr/data
+          - solr:/var/solr
+        env:
+          SOLR_OPTS: "-Dsolr.config.lib.enabled=true -Dsolr.modules=analysis-extras"
+          SOLR_HOST: solr
     env:
       BUNDLE_PATH: vendor/bundle
       BUNDLE_WITH: test
       CAS_BASE_URL: ''
       CI: 1
       FEDORA_TEST_URL: http://fedora:8080/rest
+      HYRAX_VALKYRIE: ${{ matrix.hyrax_valkyrie_enabled }}
       IIIF_BASE_URL: http://localhost/iiif/2
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
       PSQL_PASSWORD: spot_test_pw
@@ -70,31 +77,29 @@ jobs:
       PSQL_HOST: database
       RAILS_ENV: test
       SOLR_TEST_URL: http://solr:8983/solr/spot-test
-      SOLR_VERSION: "8.11.4"
+      SOLR_VERSION: "9.10.1"
       URL_HOST: http://localhost:3000
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - name: Copy Solr config to mount
         run: |
-          mkdir -p /tmp/solr/spot-test/data
-          cp -r docker/solr/config/* /tmp/solr/spot-test
-          touch /tmp/solr/spot-test/core.properties
-          chown -R 8983:8983 /tmp/solr/spot-test
+          mkdir -p /tmp/solr/data/spot-test/data
+          cp -r docker/solr/config /tmp/solr/data/spot-test/conf
+          touch /tmp/solr/data/spot-test/core.properties
+          chown -R 8983:8983 /tmp/solr/data/spot-test
       - name: Restart Solr service
         uses: docker://docker
         with:
           args: docker restart ${{ job.services.solr.id }}
       -
         name: Install system dependencies from Dockerfile
         run: |
-          apt-get update -y && apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-          mkdir -p /etc/apt/keyrings && \
-          curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-          echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-          apt-get update -y && apt-get install -y \
-            build-essential coreutils curl git libxml2 libxml2-dev libxslt-dev \
-            netcat-openbsd nodejs openssl postgresql-13 ruby-dev tzdata zip \
+          apt-get update -y && apt-get install -y curl && \
+          curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+          apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
+            awscli build-essential coreutils cron git libpq-dev libxml2 libxml2-dev \
+            libxslt-dev netcat-openbsd nodejs openssl postgresql ruby-dev tzdata zip \
             libasound2 libdbus-glib-1-dev libgtk-3-0 libpq-dev unzip libx11-xcb1
       -
         name: Setup Firefox

.ruby-version

@@ -1 +1 @@
-2.7.8
+3.2.9

Dockerfile

@@ -3,15 +3,13 @@
 # !! This is a builder image. Not for general use !!
 # Use this as the base image for the Rails / Sidekiq services.
 ##
-FROM ruby:2.7.8-slim-bullseye AS spot-base
+FROM ruby:3.2.9-slim-bookworm AS spot-base
 
 RUN apt-get clean && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates curl gnupg && \
-    mkdir -p /etc/apt/keyrings && \
-    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
-    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update -y && apt-get install -y --no-install-recommends \
+    apt-get update -y && \
+    apt-get install -y curl && \
+    curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get update -y --fix-missing && apt-get install -y --no-install-recommends \
         awscli \
         build-essential \
         coreutils \
@@ -24,7 +22,7 @@ RUN apt-get clean && \
         netcat-openbsd \
         nodejs \
         openssl \
-        postgresql-13 \
+        postgresql \
         ruby-dev \
         tzdata \
         zip
@@ -38,10 +36,9 @@ ENV HYRAX_CACHE_PATH=/spot/tmp/cache \
 
 RUN corepack enable
 
-COPY Gemfile.lock /spot/
+COPY Gemfile Gemfile.lock /spot/
 RUN gem install bundler:$(tail -n 1 Gemfile.lock | sed -e 's/\s*//')
 
-COPY Gemfile /spot/
 RUN bundle config unset with && \
     bundle config unset without && \
     bundle config set without "development:test" && \
@@ -137,14 +134,14 @@ ENV MALLOC_ARENA_MAX=2
 # We don't need the entrypoint script to generate an SSL cert
 ENV SKIP_SSL_CERT=true
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        bash \
+RUN apt-get update -y && \
+    apt-get install -y \
         ffmpeg \
         ghostscript \
         imagemagick \
         libreoffice \
         mediainfo \
-        openjdk-11-jre \
+        openjdk-17-jre \
         perl \
         python3 \
         unzip

Gemfile

@@ -9,16 +9,16 @@ end
 #
 # the base rails stack (installed with 'rails new spot')
 #
-gem 'rails', '~> 5.2.7'
+gem 'rails', '~> 6.1'
 
 # use Puma as the app server
 gem 'puma', '~> 6.4.0'
 
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.1.0'
+gem 'sass-rails', '~> 6.0'
 
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier', '~> 4.2.0'
+# Use Terser as compressor for JavaScript assets
+gem 'terser', '~> 1.2.7'
 
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5.2.1'
@@ -29,7 +29,7 @@ gem 'jbuilder', '~> 2.11.5'
 #
 # the hyrax/spot stack
 #
-gem 'hyrax', '~> 3.6.0'
+gem 'hyrax', '~> 5.2.0'
 
 # modularize our javascripts
 gem 'almond-rails', '~> 0.3.0'
@@ -44,16 +44,18 @@ gem 'aws-sdk-s3', '~> 1.142.0'
 gem 'bagit', '~> 0.6.0'
 
 # blacklight plugins for enhanced searching
-gem 'blacklight_advanced_search', '~> 6.4.1'
-gem 'blacklight_oai_provider', '~> 6.0.0'
-gem 'blacklight_range_limit', '~> 6.3.3'
+gem 'blacklight_advanced_search', '~> 7.0.0'
+gem 'blacklight_oai_provider', '~> 7.0.2'
+gem 'blacklight_range_limit', '~> 8.5.0'
 
 # start up the server faster
 gem 'bootsnap', '~> 1.17', require: false
 
+gem 'bootstrap', '~> 4.0'
+
 # Bulkrax for batch ingesting objects
-gem 'browse-everything', '~> 1.1.2'
-gem 'bulkrax', '~> 9.0.2'
+gem 'browse-everything', '~> 1.6.0'
+gem 'bulkrax', '~> 9.3.3'
 
 # This needs to be here if we want to compile our own JS
 # (there's like a single coffee-script file still remaining in hyrax)
@@ -73,7 +75,7 @@ gem 'edtf-humanize', '~> 2.1.0'
 
 # a bunch of samvera gems rely on Faraday already, but we'll
 # require it as we're explicitly using it.
-gem 'faraday', '~> 0.17.6'
+gem 'faraday', '~> 2.0'
 
 # video file resource for getting information on video derivatives
 gem 'ffprober'
@@ -99,7 +101,8 @@ gem 'kaminari', '~> 1.2.2'
 
 # mini_magick is a dependency of hydra-derivatives, but since we're
 # calling it explicitly, we should require it.
-gem 'mini_magick', '~> 4.11'
+# gem 'mini_magick', '~> 4.11'
+gem 'posix-spawn'
 
 # manually add this gem to enable questioning_authority to parse linked-data results
 gem 'linkeddata', '~> 3.1.6'
@@ -116,7 +119,7 @@ gem 'pg', '~> 1.5.4'
 
 # this is bundled somewhere within the hyrax stack, but since we're
 # calling it within our code we shouldn't expect it to always be there
-gem 'rdf-vocab', '~> 3.2.7'
+gem 'rdf-vocab', '~> 3.3.3'
 
 # solr client for interacting with rails (installed w/ hyrax)
 gem 'rsolr', '~> 2.5.0'
@@ -129,7 +132,10 @@ gem 'sidekiq', '~> 5.2.9'
 gem 'sidekiq-cron', '~> 1.9.1'
 
 # using Slack for some of our messaging
-gem 'slack-ruby-client', '~> 0.14.6'
+gem 'slack-ruby-client'
+
+# used in the Hyrax 4 upgrade but not a dependency??
+gem 'twitter-typeahead-rails', '~> 0.11.1'
 
 # now that we're writing es6 javascript of our own (+ not just using the hyrax js)
 # we need to compile it in sprockets.
@@ -148,12 +154,18 @@ gem 'redlock', '>= 0.1.2', '< 2.0'
 # that throws off how forms are built in Hyrax.
 gem 'simple_form', '< 5.2'
 
+# sprockets support gets cagey after 1.0
+gem 'openseadragon', '~> 0.9.0'
+
+# need to be 1.20.1 or higher to avoid an incompatibility with json gem
+gem 'multi_json', '~> 1.20.1'
+
 # development dependencies (not as necessary to lock down versions here)
 group :development do
   # Seed data
   # gem 'ldr-development-seeds', github: 'LafayetteCollegeLibraries/ldr-development-seeds', branch: 'main'
 
-  gem 'listen', '>= 3.0.5', '< 3.8'
+  gem 'listen', '~> 3.9.0'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring', '~> 2.1.1'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -177,7 +189,7 @@ group :development, :test do
   gem 'selenium-webdriver'
   gem 'shoulda-matchers', '~> 4'
   gem 'simplecov', '~> 0.22.0', require: false
-  gem 'simplecov-cobertura', '~> 2.1', require: false
+  gem 'simplecov-cobertura', '~> 3', require: false
   gem 'stub_env', '~> 1.0.4'
   gem 'webmock', '~> 3.8'
 end