Skip to content

Commit

Permalink
Merge pull request #930 from Project-MONAI/nds-messaging
Browse files Browse the repository at this point in the history
upping messaging version
  • Loading branch information
neildsouth authored Dec 15, 2023
2 parents 3e9a443 + aa13e55 commit 460e86a
Show file tree
Hide file tree
Showing 26 changed files with 85 additions and 83 deletions.
2 changes: 1 addition & 1 deletion CallbackApp.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
FROM python:3.10-alpine

RUN apk update && apk upgrade
RUN apk add libcom_err=1.47.0-r2
RUN apk add libcom_err=1.47.0-r5
WORKDIR /app
COPY src/TaskManager/CallbackApp/app.py ./
COPY src/TaskManager/CallbackApp/requirements.txt ./
Expand Down
2 changes: 2 additions & 0 deletions doc/dependency_decisions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@
- 1.0.3
- 1.0.4
- 1.0.5
- 1.0.6
:when: 2023-24-10 11:43:10.781625468 Z
- - :approve
- Monai.Deploy.Messaging.RabbitMQ
Expand All @@ -774,6 +775,7 @@
- 1.0.3
- 1.0.4
- 1.0.5
- 1.0.6
:when: 2023-24-10 11:43:20.975488411 Z
- - :approve
- Monai.Deploy.Security
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.18" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions src/Common/Configuration/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[1.0.5, )",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"requested": "[1.0.6, )",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down
6 changes: 3 additions & 3 deletions src/Common/Miscellaneous/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -236,7 +236,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@


<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
<PackageReference Include="MongoDB.Bson" Version="2.21.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/TaskManager/API/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[1.0.5, )",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"requested": "[1.0.6, )",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down
6 changes: 3 additions & 3 deletions src/TaskManager/Database/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -684,7 +684,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -733,7 +733,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
Expand All @@ -747,7 +747,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
8 changes: 4 additions & 4 deletions src/TaskManager/Plug-ins/Argo/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -871,7 +871,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
Expand All @@ -885,7 +885,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.22" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
<PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="1.0.6" />
<PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.18">
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
Expand Down
18 changes: 9 additions & 9 deletions src/TaskManager/TaskManager/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
},
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[1.0.5, )",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"requested": "[1.0.6, )",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand All @@ -37,11 +37,11 @@
},
"Monai.Deploy.Messaging.RabbitMQ": {
"type": "Direct",
"requested": "[1.0.5, )",
"resolved": "1.0.5",
"contentHash": "L+BWU5Xq1ARjFRcpnefDJGuG52Zw4Iz3qql1tn8lYfqoC4B37fAUVz6k7Ar7v1OUwPo/JR8q4OP2IIMpqpKRRA==",
"requested": "[1.0.6, )",
"resolved": "1.0.6",
"contentHash": "Ka4K58/brPHv/GiUdiWsKPvnesfNqYrSN3GVa1sRp6iAGSmO7QA1Yl5/Pd/q494U55OGNI9JPtEbQZUx6G4/nQ==",
"dependencies": {
"Monai.Deploy.Messaging": "1.0.5",
"Monai.Deploy.Messaging": "1.0.6",
"Polly": "7.2.4",
"RabbitMQ.Client": "6.5.0"
}
Expand Down Expand Up @@ -1139,7 +1139,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
Expand All @@ -1161,7 +1161,7 @@
"monai.deploy.workflowmanager.taskmanager.api": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@


<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
<PackageReference Include="Mongo.Migration" Version="3.1.4" />
<PackageReference Include="MongoDB.Bson" Version="2.21.0" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/WorkflowManager/Database/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -685,7 +685,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
6 changes: 3 additions & 3 deletions src/WorkflowManager/Logging/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -641,7 +641,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
10 changes: 5 additions & 5 deletions src/WorkflowManager/PayloadListener/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -779,7 +779,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
Expand All @@ -802,7 +802,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down Expand Up @@ -833,7 +833,7 @@
"monai.deploy.workloadmanager.workflowexecuter": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.WorkflowManager.Common": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Common.Configuration": "[1.0.0, )",
"Monai.Deploy.WorkflowManager.Common.Miscellaneous": "[1.0.0, )",
Expand Down
8 changes: 4 additions & 4 deletions src/WorkflowManager/Services/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -733,14 +733,14 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
6 changes: 3 additions & 3 deletions src/WorkflowManager/Storage/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@
},
"Monai.Deploy.Messaging": {
"type": "Transitive",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -675,7 +675,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.5" />
<PackageReference Include="Monai.Deploy.Messaging" Version="1.0.6" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/WorkflowManager/WorkflowExecuter/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"Monai.Deploy.Messaging": {
"type": "Direct",
"requested": "[1.0.5, )",
"resolved": "1.0.5",
"contentHash": "J8Lskfy8PSVQLDE2uLqh53uaPpqpRJuSGVHpR2jrw+GYnTTDv21j/2gxwG8Hq2NgNOkWLNVi+fFnyWd6WFiUTA==",
"requested": "[1.0.6, )",
"resolved": "1.0.6",
"contentHash": "A4yyvJ0E01aKcCa8lF0gadiEAqe6AYVdmm3afjom+E89+n6oKydTbXYPYWDtUVPW1iAWtLS/BuOxBHRSljKmig==",
"dependencies": {
"Ardalis.GuardClauses": "4.1.1",
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.21",
Expand Down Expand Up @@ -780,7 +780,7 @@
"monai.deploy.workflowmanager.common.configuration": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Monai.Deploy.Storage": "[0.2.18, )"
}
},
Expand All @@ -803,7 +803,7 @@
"monai.deploy.workflowmanager.contracts": {
"type": "Project",
"dependencies": {
"Monai.Deploy.Messaging": "[1.0.5, )",
"Monai.Deploy.Messaging": "[1.0.6, )",
"Mongo.Migration": "[3.1.4, )",
"MongoDB.Bson": "[2.21.0, )"
}
Expand Down
Loading

0 comments on commit 460e86a

Please sign in to comment.