Skip to content

Commit

Permalink
gem updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrywbrady
terrywbrady committed Jun 10, 2024
1 parent 33423ff commit a2b51a3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
22 changes: 12 additions & 10 deletions mrt-inttest-services/mock-merritt-it/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ GEM
base64 (0.2.0)
daemons (1.4.1)
eventmachine (1.2.7)
json (2.7.1)
json (2.7.2)
language_server-protocol (3.17.0.3)
mustache (1.1.1)
mustermann (3.0.0)
ruby2_keywords (~> 0.0.1)
parallel (1.24.0)
parser (3.3.0.5)
parallel (1.25.1)
parser (3.3.2.0)
ast (~> 2.4.1)
racc
racc (1.7.3)
rack (3.0.9.1)
racc (1.8.0)
rack (3.0.11)
rack-protection (4.0.0)
base64 (>= 0.1.0)
rack (>= 3.0.0, < 4)
Expand All @@ -26,9 +26,10 @@ GEM
webrick (~> 1.8)
rainbow (3.1.1)
redcarpet (3.6.0)
regexp_parser (2.9.0)
rexml (3.2.6)
rubocop (1.62.0)
regexp_parser (2.9.2)
rexml (3.2.9)
strscan
rubocop (1.64.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -39,8 +40,8 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.1)
parser (>= 3.3.0.4)
rubocop-ast (1.31.3)
parser (>= 3.3.1.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
sinatra (4.0.0)
Expand All @@ -49,6 +50,7 @@ GEM
rack-protection (= 4.0.0)
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
strscan (3.1.0)
thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
Expand Down
2 changes: 1 addition & 1 deletion mrt-services/dep_zk/mrt-zk
Submodule mrt-zk updated 42 files
+1 −0 .gitignore
+54 −43 README.md
+10 −0 api/java/index-all.html
+1 −1 api/java/member-search-index.js
+ − api/java/member-search-index.zip
+58 −10 api/java/org/cdlib/mrt/zk/Access.html
+74 −28 api/java/org/cdlib/mrt/zk/Job.html
+33 −10 api/java/org/cdlib/mrt/zk/QueueItemHelper.html
+7 −0 api/java/org/cdlib/mrt/zk/class-use/Access.Queues.html
+17 −0 api/java/org/cdlib/mrt/zk/class-use/Access.html
+17 −0 api/java/org/cdlib/mrt/zk/class-use/AccessState.html
+16 −10 api/java/org/cdlib/mrt/zk/class-use/IngestState.html
+6 −0 api/java/org/cdlib/mrt/zk/class-use/Job.html
+13 −0 api/java/org/cdlib/mrt/zk/class-use/MerrittZKNodeInvalid.html
+ − api/java/package-search-index.zip
+ − api/java/type-search-index.zip
+2 −0 api/ruby/MerrittZK/Access.html
+9 −8 api/ruby/MerrittZK/Batch.html
+45 −35 api/ruby/MerrittZK/Job.html
+3 −3 api/ruby/MerrittZK/LargeLegacyAccessJob.html
+4 −4 api/ruby/MerrittZK/LegacyAccessJob.html
+13 −13 api/ruby/MerrittZK/LegacyIngestJob.html
+4 −4 api/ruby/MerrittZK/LegacyInventoryJob.html
+11 −11 api/ruby/MerrittZK/LegacyItem.html
+19 −19 api/ruby/MerrittZK/QueueItem.html
+1 −1 api/ruby/MerrittZK/SmallLegacyAccessJob.html
+4 −0 api/ruby/MerrittZK/ZkKeys.html
+5 −5 api/ruby/created.rid
+1 −1 api/ruby/js/search_index.js
+ − api/ruby/js/search_index.js.gz
+40 −0 buildspec.yml
+1 −0 design/test_plan.md
+32 −2 src/main/java/org/cdlib/mrt/zk/Access.java
+29 −0 src/main/java/org/cdlib/mrt/zk/Job.java
+1 −0 src/main/java/org/cdlib/mrt/zk/MerrittJsonKey.java
+5 −10 src/main/java/org/cdlib/mrt/zk/MerrittLocks.java
+6 −0 src/main/java/org/cdlib/mrt/zk/QueueItemHelper.java
+6 −4 src/main/ruby/Gemfile.lock
+2 −0 src/main/ruby/lib/merritt_zk_access.rb
+10 −6 src/main/ruby/lib/merritt_zk_job.rb
+12 −7 src/main/ruby/show_all.rb
+17 −6 src/test/java/org/cdlib/mrt/zk/ZKTestIT.java
2 changes: 1 addition & 1 deletion mrt-services/ingest/mrt-ingest
Submodule mrt-ingest updated 62 files
+2 −0 ingest-conf/src/main/yaml/ingestConfig.yaml
+15 −6 ingest-it/pom.xml
+105 −18 ingest-it/src/main/webapp/WEB-INF/web.xml
+4 −1 ingest-it/src/test/docker/docker-compose.yml
+285 −366 ingest-it/src/test/java/org/cdlib/mrt/ingest/ServiceDriverIT.java
+30 −18 ingest-it/src/test/resources/profiles/admin/docker/collection/merritt_test
+31 −18 ingest-it/src/test/resources/profiles/merritt_test_content
+4 −4 ingest-src/pom.xml
+1,151 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/BatchManager.java
+40 −43 ingest-src/src/main/java/org/cdlib/mrt/ingest/BatchState.java
+2 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestConfig.java
+17 −19 ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestRequest.java
+40 −144 ingest-src/src/main/java/org/cdlib/mrt/ingest/ProcessManager.java
+112 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/ProfileState.java
+48 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/ProfileStateInf.java
+13 −14 ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueManager.java
+5 −8 ingest-src/src/main/java/org/cdlib/mrt/ingest/app/jersey/JerseyBase.java
+0 −272 ingest-src/src/main/java/org/cdlib/mrt/ingest/app/jersey/ingest/JerseyIngest.java
+665 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchConsumer.java
+710 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchReportConsumer.java
+0 −686 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ConsumerHighPriority.java
+525 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/DownloadConsumer.java
+718 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/EstimateConsumer.java
+667 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/NotifyConsumer.java
+549 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProcessConsumer.java
+520 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProvisionConsumer.java
+87 −210 ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/RecordConsumer.java
+2 −2 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/HandlerResult.java
+114 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchProcess/HandlerPost.java
+227 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchProcess/HandlerSubmit.java
+412 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchReport/HandlerNotification.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/download/HandlerRetrieve.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/HandlerAccept.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/HandlerDisaggregate.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/HandlerInitialize.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/HandlerVerify.java
+1 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/OBS/Handler.old
+9 −5 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/estimate/OBS/HandlerResult.old
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/notify/HandlerCallback.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/notify/HandlerCleanup.java
+6 −9 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/notify/HandlerNotification.java
+3 −2 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerCharacterize.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerCorroborate.java
+3 −2 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerDescribe.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerDigest.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerDocument.java
+3 −2 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerMinter.java
+5 −3 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/process/HandlerTransfer.java
+88 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/provision/HandlerProvision.java
+2 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerDisaggregate.java
+2 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerNotification.java
+24 −22 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerSubmit.java
+3 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/record/HandlerInventoryQueue.java
+49 −13 ingest-src/src/main/java/org/cdlib/mrt/ingest/service/IngestService.java
+13 −6 ingest-src/src/main/java/org/cdlib/mrt/ingest/service/IngestServiceAbs.java
+23 −5 ingest-src/src/main/java/org/cdlib/mrt/ingest/service/IngestServiceInf.java
+71 −0 ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/JSONUtil.java
+104 −1 ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/ProfileUtil.java
+15 −15 ingest-src/src/test/java/org/cdlib/mrt/ingest/IngestHandlerTest.java
+8 −1 ingest-src/src/test/java/org/cdlib/mrt/ingest/IngestProfileUnitTest.java
+31 −18 ingest-src/src/test/resources/profile/merritt_test_content
+106 −19 ingest-war/src/main/webapp/WEB-INF/web.xml
2 changes: 1 addition & 1 deletion mrt-services/mrt-admin-lambda
Submodule mrt-admin-lambda updated 72 files
+8 −0 README.md
+10 −10 cognito-lambda-nonvpc/Gemfile.lock
+10 −10 mysql-ruby-lambda/Gemfile.lock
+6 −6 simulate-lambda-alb/Gemfile.lock
+14 −14 src-admintool/Gemfile.lock
+1 −1 src-admintool/lambda_function.rb
+1 −1 src-admintool/queries/admin_objects_files_query.rb
+1 −1 src-admintool/queries/admin_objects_query.rb
+1 −1 src-admintool/queries/audit_processed_size_iterative_query.rb
+1 −1 src-admintool/queries/audit_processed_size_query.rb
+1 −1 src-admintool/queries/audit_status_time_query.rb
+1 −1 src-admintool/queries/collections_by_node_query.rb
+1 −1 src-admintool/queries/collections_by_owner_query.rb
+1 −1 src-admintool/queries/consistency_files_query.rb
+1 −1 src-admintool/queries/consistency_objects_query.rb
+1 −1 src-admintool/queries/files_by_name_coll_query.rb
+1 −1 src-admintool/queries/idlist_compare_query.rb
+1 −1 src-admintool/queries/idlist_query.rb
+1 −1 src-admintool/queries/ingest_by_hour_query.rb
+1 −1 src-admintool/queries/ingest_by_month_query.rb
+1 −1 src-admintool/queries/ingest_by_week_query.rb
+1 −1 src-admintool/queries/ingest_by_year_query.rb
+1 −1 src-admintool/queries/invoices_query.rb
+1 −1 src-admintool/queries/objectid_files_query.rb
+1 −1 src-admintool/queries/objects_by_ark_query.rb
+1 −1 src-admintool/queries/objects_by_author_query.rb
+1 −1 src-admintool/queries/objects_by_batch_query.rb
+1 −1 src-admintool/queries/objects_by_container_name_query.rb
+1 −1 src-admintool/queries/objects_by_job_query.rb
+1 −1 src-admintool/queries/objects_by_local_id_query.rb
+1 −1 src-admintool/queries/objects_by_title_query.rb
+1 −1 src-admintool/queries/objects_file_copies_needed_query.rb
+1 −1 src-admintool/queries/objects_large_query.rb
+1 −1 src-admintool/queries/objects_largest_files_query.rb
+1 −1 src-admintool/queries/objects_many_files_query.rb
+1 −1 src-admintool/queries/objects_object_copies_needed_query.rb
+1 −1 src-admintool/queries/objects_replication_needed_query.rb
+1 −1 src-admintool/queries/palmu_refresh_query.rb
+1 −1 src-admintool/queries/producer_files_query.rb
+1 −1 src-admintool/queries/prune_files_query.rb
+1 −1 src-admintool/queries/recent_ingests_query.rb
+1 −1 src-admintool/queries/replic_initiated_query.rb
+1 −1 src-admintool/queries/report_query.rb
+1 −1 src-admintool/queries/s3_query.rb
+1 −1 src-admintool/queries/update_billing_query.rb
+2 −1 src-colladmin/Gemfile
+25 −22 src-colladmin/Gemfile.lock
+1 −1 src-colladmin/actions/cognito_action.rb
+1 −1 src-colladmin/actions/consistency_report_cleanup_action.rb
+1 −1 src-colladmin/actions/ingest_queue_action.rb
+1 −1 src-colladmin/actions/ingest_queue_profile_action.rb
+8 −8 src-colladmin/actions/ldap_action.rb
+1 −1 src-colladmin/actions/opensearch_describe_action.rb
+1 −1 src-colladmin/actions/post_to_ingest_action.rb
+1 −1 src-colladmin/actions/queue_action.rb
+1 −1 src-colladmin/actions/ssm_describe_action.rb
+23 −0 src-colladmin/actions/storage_action.rb
+1 −1 src-colladmin/actions/tag_action.rb
+1 −1 src-colladmin/actions/tag_uc3_action.rb
+8 −8 src-colladmin/actions/zookeeper_action.rb
+16 −0 src-colladmin/config/actions.yml
+1 −1 src-colladmin/lambda_function.rb
+2 −2 src-colladmin/lib/acc_queue.rb
+1 −1 src-colladmin/lib/audit_info.rb
+69 −0 src-colladmin/lib/manifest_to_yaml.rb
+1 −1 src-colladmin/lib/profile.rb
+14 −0 src-colladmin/lib/queue_json.rb
+1 −1 src-colladmin/lib/storage_nodes.rb
+13 −0 src-colladmin/template/storage.js
+1 −1 src-colladmin/web/storeObjectNodes.html
+10 −10 src-common/Gemfile.lock
+13 −13 src-testdriver/Gemfile.lock
2 changes: 1 addition & 1 deletion mrt-services/store/mrt-store
Submodule mrt-store updated 10 files
+2 −0 store-conf/src/main/resources/yaml/storeConfig.yml
+1 −0 store-it/src/main/resources/yaml/storeConfig.yml
+10 −11 store-it/src/test/java/org/cdlib/mrt/store/ServiceDriverIT.java
+6 −0 store2-src/pom.xml
+54 −0 store2-src/src/main/java/org/cdlib/mrt/store/StorageConfig.java
+307 −0 store2-src/src/main/java/org/cdlib/mrt/store/action/AccessLock.java
+32 −1 store2-src/src/main/java/org/cdlib/mrt/store/app/jersey/JerseyBase.java
+25 −0 store2-src/src/main/java/org/cdlib/mrt/store/app/jersey/store/JerseyStorage.java
+181 −310 store2-src/src/main/java/org/cdlib/mrt/store/consumer/Consumer.java
+28 −49 store2-src/src/main/java/org/cdlib/mrt/store/consumer/utility/QueueUtil.java

0 comments on commit a2b51a3

Please sign in to comment.