diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 54c77958b..77b2b126d 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,8 +10,6 @@ updates: - rkm - tznind - jas88 - ignore: - - dependency-name: "fo-dicom*" - package-ecosystem: maven directory: "/src/common/com.smi.microservices.parent" schedule: diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a8444f0d..dc34d8726 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,67 @@ A raw git diff can be seen [here][unreleased]. +## [5.1.0] 2022-06-23 + +## Feature + +- [#1074](https://github.com/SMI/SmiServices/pull/1074) by rkm. Switch CI to + GitHub Actions +- [#1134](https://github.com/SMI/SmiServices/pull/1134) by jas88. Remove + DeadLetterReprocessor and associated code, more elegant native RabbitMQ + approach available if needed. +- [#1190](https://github.com/SMI/SmiServices/pull/1190) by howff. Anonymise + names and dates in SRs, just in case (useful for demo). Proceed without ID + mapping if DB unavailable (useful for testing). +- [#1199](https://github.com/SMI/SmiServices/pull/1199) by tznind. Added Setup + utility for checking config settings (connection strings, queue setup etc) +- [#1200](https://github.com/SMI/SmiServices/pull/1200) by jas88. Add new + DicomLoader CLI application for batch-loading DICOM files and archives + +## Bugfix + +- [#1087](https://github.com/SMI/SmiServices/pull/1087) by rkm. [CI] Misc. CI + fixes + - Fixes the build scripts to respect any intermediate non-zero return + codes + - Fixes the build scripts to only build `linux-x64` and `win-x64` + - Fixes the build scripts to select the correct build configuration + - Removes a bogus test leftover from #1089 + - Temporarily disables a few tests requiring a fix for the `leptonica` + libs +- [#1088](https://github.com/SMI/SmiServices/pull/1088) by rkm. Use + DirectConnection instead of obsolete ConnectionMode. Fixes #990 +- [#1089](https://github.com/SMI/SmiServices/pull/1089) by rkm. Remove invalid + extraction modality check. Fixes #1059 +- [#1128](https://github.com/SMI/SmiServices/pull/1128) by jas88. Update + RabbitMQ Nuget package and associated API calls +- [#1138](https://github.com/SMI/SmiServices/pull/1138) by jas88. Use + Chocolatey to install SQL 2019 LocalDB instead of Powershell script +- [#929](https://github.com/SMI/SmiServices/pull/929) by howff. Structured + Reports improvements from PR#929 + - Updated documentation + - Simplify SRAnonTool using external program semehr_anon.py + - Handle ConceptNameCodeSequence which has VR but no Value + - Ensure 'replaced' flag is not reset + - Write replacement DICOM whichever content tag is found + - Extract metadata from Mongo to go alongside anonymised text + - Redact numeric DICOM tags with all '9' not all 'X' + - Allow badly-formatted text content which contains HTML but does not + escape non-HTML symbols + +## Change + +- [#1023](https://github.com/SMI/SmiServices/pull/1023) by jas88. RabbitMQ + tidyup + - Fix both C# and Java server version check logic + - Reuse Connection more per RabbitMQ guidance + - Tidy up some Java exception handling logic + +## Meta + +- [#1082](https://github.com/SMI/SmiServices/pull/1082) by rkm. CI: Don't exit + early if a single test project has failures + ## [5.0.1] 2022-02-18 ## Bugfix @@ -1035,7 +1096,8 @@ First stable release after importing the repository from the private - Anonymous `MappingTableName` must now be fully specified to pass validation (e.g. `mydb.mytbl`). Previously skipping database portion was supported. -[unreleased]: https://github.com/SMI/SmiServices/compare/v5.0.1...master +[unreleased]: https://github.com/SMI/SmiServices/compare/v5.1.0...master +[5.1.0]: https://github.com/SMI/SmiServices/compare/v5.0.1...v5.1.0 [5.0.1]: https://github.com/SMI/SmiServices/compare/v5.0.0...v5.0.1 [5.0.0]: https://github.com/SMI/SmiServices/compare/v4.0.0...v5.0.0 [4.0.0]: https://github.com/SMI/SmiServices/compare/v3.2.1...v4.0.0 diff --git a/README.md b/README.md index 14f848c5b..9b3d1c241 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ![GitHub](https://img.shields.io/github/license/SMI/SmiServices) [![Total alerts](https://img.shields.io/lgtm/alerts/g/SMI/SmiServices.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/SMI/SmiServices/alerts/) -Version: `5.0.1` +Version: `5.1.0` # SMI Services diff --git a/bin/release/missing-news.sh b/bin/release/missing-news.sh new file mode 100755 index 000000000..381d405d1 --- /dev/null +++ b/bin/release/missing-news.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +if [ ! -d news ] +then + echo Must be run from main SmiServices directory! + exit +fi + +lasttag=$(git tag -l|tail -n1) + +for i in `git log --oneline ${lasttag}..|egrep -v "dependabot|Bump|pre-commit-ci"|egrep -o 'Merge pull request #\d+'|cut -d'#' -f2` +do + if ! find news -name "${i}*.md" -print -quit | grep -q . + then + echo -n "Missing news file for PR #${i}:" + curl -s https://api.github.com/repos/SMI/SmiServices/pulls/${i} | grep \"title\"|cut -d'"' -f4 | grep . || echo + fi +done + diff --git a/docs/RELEASING.md b/docs/RELEASING.md index 093cee1a4..cb8ebbfc2 100644 --- a/docs/RELEASING.md +++ b/docs/RELEASING.md @@ -12,18 +12,11 @@ The release workflow is to checkout a new `release/` branch from master, update - Check that a [news file][news_files] is present for each merged PR since the previous release. To do this, checkout the latest `master` commit and list all the merged PRs since the last release, e.g.: ```console - $ git checkout master && git pull - $ git log --oneline .. | grep -vP "dependabot|Bump|pre-commit-ci" | grep -P '#\d+' - ec182696 Merge pull request #430 from SMI/feature/extraction-fixes - 051a134e Merge pull request #444 from SMI/feature/trigger-updates - 65fcfe41 Merge pull request #440 from SMI/feature/value-updater - 8515f059 Merge pull request #438 from SMI/feature/consensus-tidyup - 38e25c2a Merge pull request #434 from SMI/feature/consensus-rule - 9d81b942 Merge branch 'master' into develop - ee39d850 Merge pull request #408 from SMI/feature/isidentifiable-more-logs - c709f7ed Merge pull request #404 from SMI/feature/no-an-suffix - d7d90f4a Merge pull request #402 from SMI/feature/update-docs - 830bac67 Merge branch 'master' into develop + $ git checkout master && git pull && ./bin/release/missing-news.sh + Missing news file for PR #1151:Explicitly initialise LocalDB on Windows + Missing news file for PR #1042:Is ident package use + Missing news file for PR #1079:bump all HIC libraries to latest, and fo-dicom to 4.0.8 + Missing news file for PR #1057:[Snyk] Security upgrade edu.stanford.nlp:stanford-corenlp from 3.9.2 to 4.3.1 ``` Go through these PRs and check each has an accurate [news file][news_files] entry. Create any missing files if needed. @@ -43,7 +36,7 @@ The release workflow is to checkout a new `release/` branch from master, update Switched to a new branch 'release/v1.2.3' ``` -- Update the [CHANGELOG](/CHANGELOG.md) for the new release. This involves running the `utils/updateChangelog.py` script. Review the diff and check for any obvious errors. +- Update the [CHANGELOG](/CHANGELOG.md) for the new release. This involves running the `bin/release/updateChangelog.py` script. Review the diff and check for any obvious errors. - Update any other files referencing the version. To see an example, check the previous release PR. At time of writing, these are: - `README.md`: Bump the version in the header diff --git a/news/1023-change.md b/news/1023-change.md deleted file mode 100644 index b6fc26cfe..000000000 --- a/news/1023-change.md +++ /dev/null @@ -1,4 +0,0 @@ -RabbitMQ tidyup -- Fix both C# and Java server version check logic -- Reuse Connection more per RabbitMQ guidance -- Tidy up some Java exception handling logic diff --git a/news/1074-feature.md b/news/1074-feature.md deleted file mode 100644 index db945441d..000000000 --- a/news/1074-feature.md +++ /dev/null @@ -1 +0,0 @@ -Switch CI to GitHub Actions diff --git a/news/1082-meta.md b/news/1082-meta.md deleted file mode 100644 index 03e9ddbe9..000000000 --- a/news/1082-meta.md +++ /dev/null @@ -1 +0,0 @@ -CI: Don't exit early if a single test project has failures diff --git a/news/1087-bugfix.md b/news/1087-bugfix.md deleted file mode 100644 index 049b4ca48..000000000 --- a/news/1087-bugfix.md +++ /dev/null @@ -1,6 +0,0 @@ -[CI] Misc. CI fixes -- Fixes the build scripts to respect any intermediate non-zero return codes -- Fixes the build scripts to only build `linux-x64` and `win-x64` -- Fixes the build scripts to select the correct build configuration -- Removes a bogus test leftover from #1089 -- Temporarily disables a few tests requiring a fix for the `leptonica` libs diff --git a/news/1088-bugfix.md b/news/1088-bugfix.md deleted file mode 100644 index 875b52d67..000000000 --- a/news/1088-bugfix.md +++ /dev/null @@ -1,2 +0,0 @@ -Use DirectConnection instead of obsolete ConnectionMode. Fixes #990 - diff --git a/news/1089-bugfix.md b/news/1089-bugfix.md deleted file mode 100644 index 3895ea4dd..000000000 --- a/news/1089-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Remove invalid extraction modality check. Fixes #1059 diff --git a/news/1128-bugfix.md b/news/1128-bugfix.md deleted file mode 100644 index bc0115209..000000000 --- a/news/1128-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Update RabbitMQ Nuget package and associated API calls \ No newline at end of file diff --git a/news/1134-feature.md b/news/1134-feature.md deleted file mode 100644 index b3ed8cbb3..000000000 --- a/news/1134-feature.md +++ /dev/null @@ -1 +0,0 @@ -Remove DeadLetterReprocessor and associated code, more elegant native RabbitMQ approach available if needed. diff --git a/news/1138-bugfix.md b/news/1138-bugfix.md deleted file mode 100644 index 7410dee30..000000000 --- a/news/1138-bugfix.md +++ /dev/null @@ -1 +0,0 @@ -Use Chocolatey to install SQL 2019 LocalDB instead of Powershell script diff --git a/news/1190-feature.md b/news/1190-feature.md deleted file mode 100644 index 40a897408..000000000 --- a/news/1190-feature.md +++ /dev/null @@ -1 +0,0 @@ -Anonymise names and dates in SRs, just in case (useful for demo). Proceed without ID mapping if DB unavailable (useful for testing). diff --git a/news/1199-feature.md b/news/1199-feature.md deleted file mode 100644 index bde8eef30..000000000 --- a/news/1199-feature.md +++ /dev/null @@ -1 +0,0 @@ -Added Setup utility for checking config settings (connection strings, queue setup etc) \ No newline at end of file diff --git a/news/1200-feature.md b/news/1200-feature.md deleted file mode 100644 index f5d493219..000000000 --- a/news/1200-feature.md +++ /dev/null @@ -1 +0,0 @@ -Add new DicomLoader CLI application for batch-loading DICOM files and archives diff --git a/news/929-bugfix.md b/news/929-bugfix.md deleted file mode 100644 index 632173b62..000000000 --- a/news/929-bugfix.md +++ /dev/null @@ -1,10 +0,0 @@ -Structured Reports improvements from PR#929 - -* Updated documentation -* Simplify SRAnonTool using external program semehr_anon.py -* Handle ConceptNameCodeSequence which has VR but no Value -* Ensure 'replaced' flag is not reset -* Write replacement DICOM whichever content tag is found -* Extract metadata from Mongo to go alongside anonymised text -* Redact numeric DICOM tags with all '9' not all 'X' -* Allow badly-formatted text content which contains HTML but does not escape non-HTML symbols \ No newline at end of file diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index d23d41e6e..02135270f 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyCulture("")] // These should be overwritten by release builds -[assembly: AssemblyVersion("5.0.1")] -[assembly: AssemblyFileVersion("5.0.1")] -[assembly: AssemblyInformationalVersion("5.0.1")] // This one can have the extra build info after it +[assembly: AssemblyVersion("5.1.0")] +[assembly: AssemblyFileVersion("5.1.0")] +[assembly: AssemblyInformationalVersion("5.1.0")] // This one can have the extra build info after it