Merge remote-tracking branch 'origin/release-workflow' into release-w…

…orkflow

# Conflicts:
#	.github/workflows/release-build.yml

.ci/asciidoc-converter/src/main/kotlin/org/sdpi/ConvertAndVerifySupplement.kt

@@ -13,11 +13,11 @@ import org.sdpi.asciidoc.github.IssueImport
 import java.io.File
 import kotlin.system.exitProcess
 
-fun main(args: Array<String>) = ConvertAndVerifySupplement().main(
-    when (System.getenv().containsKey("CI")) {
-        true -> args.firstOrNull()?.split(" ") ?: listOf() // caution: blanks in quotes not covered here!
-        false -> args.toList()
-    }
+fun main(args: Array<String>) = ConvertAndVerifySupplement().main(args
+//    when (System.getenv().containsKey("CI")) {
+//        true -> args.firstOrNull()?.split(" ") ?: listOf() // caution: blanks in quotes not covered here!
+//        false -> args.toList()
+//    }
 )
 
 class ConvertAndVerifySupplement : CliktCommand("convert-supplement") {

.github/copy_images.sh

@@ -3,7 +3,7 @@ sudo apt install graphviz
 gem install asciidoctor
 gem install asciidoctor-diagram
 asciidoctor -V
-cd asciidoc
+cd asciidoc || exit
 asciidoctor -r asciidoctor-diagram -D ../ sdpi-supplement.adoc
 cd ..
 mkdir sdpi-supplement

.github/workflows/feature-review-build.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
     - name: Checkout branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
@@ -31,11 +31,12 @@ jobs:
         ruby-version: '3.0' # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
+    - name: Setup gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Create HTML with Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
-        build-root-directory: .ci/asciidoc-converter
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
+      working-directory: .ci/asciidoc-converter
 
     - name: Generate PlantUML diagrams and copy images
       run: .github/copy_images.sh
@@ -47,7 +48,7 @@ jobs:
 
     - name: Upload artifact
       # if: success() && github.ref == 'refs/heads/master'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: sdpi-supplement-${{ steps.extract_branch.outputs.branch }}
         path: sdpi-supplement

.github/workflows/latest-master-build.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
     - name: Checkout branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
@@ -33,12 +33,13 @@ jobs:
       with:
         ruby-version: '3.0' # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-
+
+    - name: Setup gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Create HTML with Gradle
-      uses: gradle/gradle-build-action@v2
-      with:
-        arguments: run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
-        build-root-directory: .ci/asciidoc-converter
+      run: ./gradlew run --args="--input-file ../../asciidoc/sdpi-supplement.adoc --output-folder ../../sdpi-supplement --github-token ${{ secrets.SDPI_API_ACCESS_TOKEN_SECRET }} --backend html"
+      working-directory: .ci/asciidoc-converter
 
     - name: Generate PlantUML diagrams and copy images
       run: .github/copy_images.sh

CHANGELOG.md

@@ -15,6 +15,35 @@ Each section shall contain a list of action items of the following format: `<bri
 
 ## [Unreleased]
 
+### Editorial Fixes
+
+- Correct SES section titles ([#272](https://github.com/IHE/DEV.SDPi/issues/272))
+- Implement semi-automatic version referencing by adding Asciidoc variables ( ([#284](https://github.com/IHE/DEV.SDPi/issues/284)))
+
+### Added
+
+- Add discovery proxy transactions scaffold and actor description ( ([152](https://github.com/IHE/DEV.SDPi/issues/152)))
+
+## [1.3.1] - 2024-04-05
+
+### Editorial Fixes
+
+- Remove / Update "1.2" comments from release 1.3.0 ([#282](https://github.com/IHE/DEV.SDPi/issues/282))
+
+## [1.3.0] - 2024-03-29
+
+### Added
+
+- Message mapping for DEV-39 ([#251](https://github.com/IHE/DEV.SDPi/issues/251))
+- Requirement to enforce serialization of any notification ([#259](https://github.com/IHE/DEV.SDPi/issues/259))
+- Info regarding correctness of message excerpts ([#260](https://github.com/IHE/DEV.SDPi/issues/260))
+- Modelling and requirements of compound metrics ([#228](https://github.com/IHE/DEV.SDPi/issues/228))
+
+### Editorial Fixes
+
+- Corrected the CDAS section title to correctly reflect the meaning of the acronym ([#265](https://github.com/IHE/DEV.SDPi/issues/265))
+- Reformatted the SDPi profiles scope section for readability ([270](https://github.com/IHE/DEV.SDPi/issues/270))
+
 ## [1.2.0] - 2023-12-07
 
 ### Added
@@ -25,18 +54,14 @@ Each section shall contain a list of action items of the following format: `<bri
 - Update Title Page to Better Reflect HL7 Aspects of the SDPi Standard ([#240](https://github.com/IHE/DEV.SDPi/issues/240))
 - Added R0702 on private coding system identification in volume 3 and updated private mdc code mapping in volume 2 gateways ([#57](https://github.com/IHE/DEV.SDPi/issues/57)).
 
-### Changed
-
 ### Removed
 
 - _OBX-17 field is not left empty_ as this would be interpreted as derivation method _auto_ ([#233](https://github.com/IHE/DEV.SDPi/issues/233)).
 
 ### Editorial Fixes
 
 - Moved reference content in glossary table between columns ([#166](https://github.com/IHE/DEV.SDPi/issues/166)).
-- Apply several editorial fixes ([#247](https://github.com/IHE/DEV.SDPi/issues/247)) 
-- Corrected the CDAS section title to correctly reflect the meaning of the acronym ([#265](https://github.com/IHE/DEV.SDPi/issues/265)) 
-- Reformatted the SDPi profiles scope section for readability ([270](https://github.com/IHE/DEV.SDPi/issues/270)) 
+- Apply several editorial fixes ([#247](https://github.com/IHE/DEV.SDPi/issues/247))
 
 ## [1.1.0] - 2023-07-21
 

asciidoc/docinfo.html

@@ -114,6 +114,21 @@
     margin: 1em;
 }
 
+.imageblock {
+    margin-bottom: 3em;
+    margin-top: 3em;
+}
+
+table.tableblock {
+    margin-bottom: 3em;
+    margin-top: 3em;
+}
+
+.listingblock {
+    margin-bottom: 3em;
+    margin-top: 3em;
+}
+
 #load-screen {
     width: 30%;
     height:100%;

asciidoc/document-declarations.adoc

@@ -16,7 +16,7 @@ NOTES:
 [%autowidth]
 [cols="1"]
 |===
-a| *SDPi Supplement Version Note*:
+a| *{supplement_note}*:
 
 The following table is included in this version of the supplement to capture *_"forward" declarations of acronyms and labels_* that are used in the text but are not intended to be part of the General Introduction Appendix D Glossary.
 "Forward" means that they are used BEFORE the document section in which they are formally defined.
@@ -93,6 +93,3 @@ NOTE:  Forward Declarations in the following table are being added "on demand" o
 | Use Case
 
 |===
-
-{empty} +
-