From 000e16777a813fad44b4c8aed02dc557df6aefa3 Mon Sep 17 00:00:00 2001 From: Marco Costa Date: Fri, 26 Mar 2021 17:36:44 -0400 Subject: [PATCH] Fix JRuby builds after mimemagic license change (#1431) --- .circleci/images/primary/Dockerfile-jruby-9.2-latest | 3 ++- Appraisals | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/images/primary/Dockerfile-jruby-9.2-latest b/.circleci/images/primary/Dockerfile-jruby-9.2-latest index 0b97ccd069f..c1f61a4ff67 100644 --- a/.circleci/images/primary/Dockerfile-jruby-9.2-latest +++ b/.circleci/images/primary/Dockerfile-jruby-9.2-latest @@ -16,7 +16,8 @@ RUN set -ex; \ locales sudo openssh-client ca-certificates tar gzip parallel \ net-tools netcat unzip zip bzip2 gnupg curl wget \ tzdata rsync vim \ - build-essential; \ + build-essential \ + shared-mime-info; \ rm -rf /var/lib/apt/lists/*; # Set timezone to UTC by default diff --git a/Appraisals b/Appraisals index 2668ef908c6..8b8f63b553f 100644 --- a/Appraisals +++ b/Appraisals @@ -901,7 +901,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \ gem 'pg', platform: :ruby gem 'activerecord-jdbcpostgresql-adapter', '>= 60.2', platform: :jruby gem 'presto-client', '>= 0.5.14' - gem 'qless' + gem 'qless', (RUBY_PLATFORM == 'java' ? '0.10.0' : '>= 0') # Newer releases require `rusage`, which is not available for JRuby gem 'racecar', '>= 0.3.5' gem 'rack' gem 'rack-test'