Skip to content

fix for messaging #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 15, 2023
Merged

fix for messaging #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd766a
fix for messaging
neildsouth Mar 15, 2023
df74ad2
Merge branch 'develop' into ac1619-nds
neildsouth Mar 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/dependency_decisions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2335,15 +2335,15 @@
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
:versions:
- 0.1.21
- 0.1.22-rc0011
- 0.1.22-rc0012
:when: 2022-12-15 21:43:10.781625468 Z
- - :approve
- Monai.Deploy.Messaging.RabbitMQ
- :who: samrooke
:why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
:versions:
- 0.1.21
- 0.1.22-rc0011
- 0.1.22-rc0012
:when: 2022-12-15 21:43:20.975488411 Z
- - :approve
- Monai.Deploy.Storage
Expand Down
4 changes: 2 additions & 2 deletions src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0012" />
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
<PackageReference Include="NLog" Version="5.1.2" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.2.2" />
Expand Down
14 changes: 7 additions & 7 deletions src/TaskManager/TaskManager/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.22-rc0011, )",
"resolved": "0.1.22-rc0011",
"contentHash": "khBiYmQhw2AH1qJ61JDrlZ9jjjBumyFvYAiTdvCny0KaSVlj9CjzsvuD6TRrb+oFHuL1ZehFvvhD53vGcSD4zw==",
"requested": "[0.1.22-rc0012, )",
"resolved": "0.1.22-rc0012",
"contentHash": "L7iTbtpB41nEEb12qVSf92pljZkN9HowioY5uXJ1drZ39mUHnOIv5qcCgtcaf1eNsaTUMLOHLMv4XaESdKVRUw==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand All @@ -89,11 +89,11 @@
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Direct",
"requested": "[0.1.22-rc0011, )",
"resolved": "0.1.22-rc0011",
"contentHash": "OTFvY4tO00zNrP+zjF7QY5mjsILWKfa3SyLB9wvxcJw8zIOJlkGDWoXTq84fLdL5QR/L5GT7PeD3Yhl82h8rcg==",
"requested": "[0.1.22-rc0012, )",
"resolved": "0.1.22-rc0012",
"contentHash": "lvvr3Q8JL5400qmAPV2ogLI3zXAI6YWIZavurxel+6E2oEYpSQ8ArNsjZM+i+xnetUWClcv/vE5cjR/BAMdUuw==",
"dependencies": {
"Monai.Deploy.Messaging": "0.1.22-rc0011",
"Monai.Deploy.Messaging": "0.1.22-rc0012",
"Polly": "7.2.3",
"RabbitMQ.Client": "6.4.0",
"System.Collections.Concurrent": "4.3.0"
Expand Down
6 changes: 3 additions & 3 deletions src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
~ Copyright 2022 MONAI Consortium
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -45,11 +45,11 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Security" Version="0.1.3" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0012" />
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.1.2" />
Expand Down
14 changes: 7 additions & 7 deletions src/WorkflowManager/WorkflowManager/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[0.1.22-rc0011, )",
"resolved": "0.1.22-rc0011",
"contentHash": "khBiYmQhw2AH1qJ61JDrlZ9jjjBumyFvYAiTdvCny0KaSVlj9CjzsvuD6TRrb+oFHuL1ZehFvvhD53vGcSD4zw==",
"requested": "[0.1.22-rc0012, )",
"resolved": "0.1.22-rc0012",
"contentHash": "L7iTbtpB41nEEb12qVSf92pljZkN9HowioY5uXJ1drZ39mUHnOIv5qcCgtcaf1eNsaTUMLOHLMv4XaESdKVRUw==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand All @@ -86,11 +86,11 @@
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Direct",
"requested": "[0.1.22-rc0011, )",
"resolved": "0.1.22-rc0011",
"contentHash": "OTFvY4tO00zNrP+zjF7QY5mjsILWKfa3SyLB9wvxcJw8zIOJlkGDWoXTq84fLdL5QR/L5GT7PeD3Yhl82h8rcg==",
"requested": "[0.1.22-rc0012, )",
"resolved": "0.1.22-rc0012",
"contentHash": "lvvr3Q8JL5400qmAPV2ogLI3zXAI6YWIZavurxel+6E2oEYpSQ8ArNsjZM+i+xnetUWClcv/vE5cjR/BAMdUuw==",
"dependencies": {
"Monai.Deploy.Messaging": "0.1.22-rc0011",
"Monai.Deploy.Messaging": "0.1.22-rc0012",
"Polly": "7.2.3",
"RabbitMQ.Client": "6.4.0",
"System.Collections.Concurrent": "4.3.0"
Expand Down
6 changes: 3 additions & 3 deletions ...Manager.IntegrationTests/Monai.Deploy.WorkflowManager.TaskManager.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
~ Copyright 2022 MONAI Consortium
~
~ Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -26,8 +26,8 @@
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Minio" Version="4.0.6" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.13" />
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
Expand Down
4 changes: 2 additions & 2 deletions ...or.IntegrationTests/Monai.Deploy.WorkflowManager.WorkflowExecutor.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Minio" Version="4.0.6" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0011" />
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.22-rc0012" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.13" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.13" />
<PackageReference Include="Polly" Version="7.2.3" />
Expand Down
14 changes: 7 additions & 7 deletions tests/UnitTests/WorkflowManager.Tests/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "0.1.22-rc0011",
"contentHash": "khBiYmQhw2AH1qJ61JDrlZ9jjjBumyFvYAiTdvCny0KaSVlj9CjzsvuD6TRrb+oFHuL1ZehFvvhD53vGcSD4zw==",
"resolved": "0.1.22-rc0012",
"contentHash": "L7iTbtpB41nEEb12qVSf92pljZkN9HowioY5uXJ1drZ39mUHnOIv5qcCgtcaf1eNsaTUMLOHLMv4XaESdKVRUw==",
"dependencies": {
"Ardalis.GuardClauses": "4.0.1",
"Microsoft.Extensions.Configuration": "6.0.1",
Expand All @@ -617,10 +617,10 @@
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Transitive",
"resolved": "0.1.22-rc0011",
"contentHash": "OTFvY4tO00zNrP+zjF7QY5mjsILWKfa3SyLB9wvxcJw8zIOJlkGDWoXTq84fLdL5QR/L5GT7PeD3Yhl82h8rcg==",
"resolved": "0.1.22-rc0012",
"contentHash": "lvvr3Q8JL5400qmAPV2ogLI3zXAI6YWIZavurxel+6E2oEYpSQ8ArNsjZM+i+xnetUWClcv/vE5cjR/BAMdUuw==",
"dependencies": {
"Monai.Deploy.Messaging": "0.1.22-rc0011",
"Monai.Deploy.Messaging": "0.1.22-rc0012",
"Polly": "7.2.3",
"RabbitMQ.Client": "6.4.0",
"System.Collections.Concurrent": "4.3.0"
Expand Down Expand Up @@ -1651,8 +1651,8 @@
"Microsoft.Extensions.DependencyInjection.Abstractions": "[7.0.0, )",
"Microsoft.Extensions.Hosting": "[7.0.1, )",
"Microsoft.Extensions.Options": "[7.0.1, )",
"Monai.Deploy.Messaging": "[0.1.22-rc0011, )",
"Monai.Deploy.Messaging.RabbitMQ": "[0.1.22-rc0011, )",
"Monai.Deploy.Messaging": "[0.1.22-rc0012, )",
"Monai.Deploy.Messaging.RabbitMQ": "[0.1.22-rc0012, )",
"Monai.Deploy.Security": "[0.1.3, )",
"Monai.Deploy.Storage": "[0.2.13, )",
"Monai.Deploy.Storage.MinIO": "[0.2.13, )",
Expand Down