Merge pull request #36 from research-technologies/hyrax_3_1

Hyrax 3 1

.fcrepo_wrapper

@@ -1,4 +1,5 @@
 # Place any default configuration for solr_wrapper here
+version: 4.7.5
 port: 8984
 enable_jms: false
 fcrepo_home_dir: tmp/fcrepo4-development-data

.gitignore

@@ -35,6 +35,12 @@
 terraform/config.json
 terraform/create_copy_script.rb
 terraform/docker_build.rb
+terraform.uat/config.json
+terraform.uat/create_copy_script.rb
+terraform.uat/docker_build.rb
+terraform.prod/config.json
+terraform.prod/create_copy_script.rb
+terraform.prod/docker_build.rb
 
 # Keys
 *id_rsa

.solr_wrapper

@@ -1,5 +1,5 @@
 # Place any default configuration for solr_wrapper here
-# version: 7.7.1
+version: 7.7.1
 # port: 8983
 instance_dir: tmp/solr-development
 collection:

Dockerfile

@@ -59,6 +59,7 @@ RUN apt-get update -qq \
     libpq-dev \
     libreoffice \
     libxml2-dev libxslt1-dev \
+    logrotate \
     net-tools \
     nodejs \
     openjdk-11-jre-headless \

Gemfile

@@ -44,7 +44,13 @@ end
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
-gem 'hyrax', '~> 2.9', '>= 2.9.3'
+gem 'hyrax', '~> 3.1'
+# rdf 3.2.5 conflicts with a monkey patch in acive-fedora 13.2.5 and below
+gem 'rdf', '~> 3.2', '<= 3.2.4'
+gem 'okcomputer', '~> 1.6', '>= 1.6.4'
+
+#gem 'hyrax', '~> 2.9', '>= 2.9.3'
+
 #gem 'hyrax', '~> 2.5'
 
 group :development, :test do
@@ -67,9 +73,10 @@ gem 'rsolr', '>= 1.0'
 
 gem 'riiif', '~> 2.0'
 
-gem 'dog_biscuits'
+#gem 'dog_biscuits'
+gem 'dog_biscuits', git: 'https://github.com/research-technologies/dog_biscuits.git'
 gem 'hydra-role-management'
-gem 'leaf_addons', git: 'https://github.com/leaf-research-technologies/leaf_addons.git'
+gem 'leaf_addons', git: 'https://github.com/research-technologies/leaf_addons.git'
 gem 'pg', '~> 0.21.0'
 gem 'sidekiq'