Merge branch 'master' into biodivportal

Gemfile

@@ -2,18 +2,16 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'ffi'
-gem 'activesupport', '~> 3.2'
 
 # This is needed temporarily to pull the Google Universal Analytics (UA)
 # data and store it in a file. See (bin/import_google_ua_analytics_data)
 # The ability to pull this data from Google will cease on July 1, 2024
 gem "google-apis-analytics_v3"
-
-gem 'google-analytics-data'
+gem 'google-analytics-data', '0.6.0'
+gem 'google-protobuf', '3.25.3'
 gem 'mail', '2.6.6'
 gem 'multi_json'
-gem 'oj', '~> 3.0'
+gem 'oj'
 gem 'parseconfig'
 gem 'pony'
 gem 'pry'
@@ -24,6 +22,7 @@ gem 'sys-proctable'
 gem 'request_store'
 gem 'parallel'
 gem 'json-ld'
+gem 'ffi', '~> 1.16.3'
 
 # Monitoring
 gem 'cube-ruby', require: 'cube'

Gemfile.lock

@@ -20,8 +20,8 @@ GIT
 
 GIT
   remote: https://github.com/ontoportal-lirmm/goo.git
-  revision: c48a1e4dfe82a2e5c42614a30380f3bdb2044ba9
-  branch: master
+  revision: a95245b8c964431505ca6315907440996c59a00d
+  branch: development
   specs:
     goo (0.0.2)
       addressable (~> 2.8)
@@ -47,6 +47,26 @@ GIT
       redis
       ruby-xxHash
 
+GIT
+  remote: https://github.com/ontoportal-lirmm/ontologies_linked_data.git
+  revision: 552fbe5faed5bb195396251066ef0e7b930939a0
+  branch: development
+  specs:
+    ontologies_linked_data (0.0.1)
+      activesupport
+      bcrypt
+      goo
+      json
+      libxml-ruby
+      multi_json
+      oj
+      omni_logger
+      pony
+      rack
+      rack-test
+      rsolr
+      rubyzip
+
 GIT
   remote: https://github.com/ontoportal-lirmm/sparql-client.git
   revision: 59251e59346c9a69a67c88552ba55a1244eec602
@@ -152,7 +172,12 @@ GEM
     google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.4.0)
-    google-protobuf (3.25.4)
+    google-protobuf (3.25.3)
+    google-protobuf (3.25.3-aarch64-linux)
+    google-protobuf (3.25.3-arm64-darwin)
+    google-protobuf (3.25.3-x86-linux)
+    google-protobuf (3.25.3-x86_64-darwin)
+    google-protobuf (3.25.3-x86_64-linux)
     googleapis-common-protos (1.6.0)
       google-protobuf (>= 3.18, < 5.a)
       googleapis-common-protos-types (~> 1.7)
@@ -166,6 +191,21 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
+    grpc (1.65.2)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-aarch64-linux)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-arm64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-x86-linux)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
+    grpc (1.65.2-x86_64-darwin)
+      google-protobuf (>= 3.25, < 5.0)
+      googleapis-common-protos-types (~> 1.0)
     grpc (1.65.2-x86_64-linux)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
@@ -307,6 +347,11 @@ GEM
       macaddr (~> 1.0)
 
 PLATFORMS
+  aarch64-linux
+  arm64-darwin
+  ruby
+  x86-linux
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -320,17 +365,18 @@ DEPENDENCIES
   cube-ruby
   ed25519 (>= 1.2, < 2.0)
   email_spec
-  ffi
+  ffi (~> 1.16.3)
   goo!
-  google-analytics-data
+  google-analytics-data (= 0.6.0)
   google-apis-analytics_v3
+  google-protobuf (= 3.25.3)
   json-ld
   mail (= 2.6.6)
   minitest (< 5.0)
   multi_json
   ncbo_annotator!
   ncbo_cron!
-  oj (~> 3.0)
+  oj
   ontologies_linked_data!
   parallel
   parseconfig