LinuxForHealth · lmsurpre · Oct 15, 2021 · Oct 16, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,8 +48,10 @@ jobs:
       env:
         BASE: ${{ github['base_ref'] }}
       run: git fetch --no-tags --prune --depth=1 origin +refs/heads/${BASE}:refs/remotes/origin/${BASE}
-    - name: Build samples
-      run: mvn -B install --file fhir-examples --no-transfer-progress
+    - name: Build tools and samples
+      run: |
+        mvn -B install --file fhir-tools --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
+        mvn -B install --file fhir-examples --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
     - name: Build parent with tests
       env:
         BASE: origin/${{ github['base_ref'] }}
@@ -124,8 +126,10 @@ jobs:
       uses: joschi/setup-jdk@v2.3.0
       with:
         java-version: ${{ matrix.java }}
-    - name: Build samples
-      run: mvn -B install --file fhir-examples --no-transfer-progress
+    - name: Build samples and tools
+      run: |
+        mvn -B install --file fhir-examples --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
+        mvn -B install --file fhir-tools --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
     - name: Build parent without tests
       # As the e2e tests are the fastest, opting to put javadoc:javadoc in fhir-parent
       # The profile avoids UML diagram creation

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -21,8 +21,10 @@ jobs:
       uses: joschi/setup-jdk@v2.3.0
       with:
         java-version: ${{ matrix.java }}
-    - name: Build samples
-      run: mvn -B install --file fhir-examples --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
+    - name: Build tools and samples
+      run: |
+        mvn -B install --file fhir-tools --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
+        mvn -B install --file fhir-examples --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3
     - name: Build parent without tests
       run: |
         mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-parent -DexcludeReactor=true -Dmaven.wagon.http.retryHandler.count=3

diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -2,7 +2,7 @@ name: Javadocs Build for Site
 
 on:
   push:
-    tags: 
+    tags:
         - '*'
 
 jobs:
@@ -36,6 +36,10 @@ jobs:
       uses: joschi/setup-jdk@v2.3.0
       with:
         java-version: ${{ matrix.java }}
+    - name: Build fhir-tools
+      run: |
+            cd fhir
+            mvn -B -ntp clean install --file fhir-tools -Dmaven.wagon.http.retryHandler.count=3
     - name: Build fhir-examples
       run: |
             cd fhir
@@ -62,7 +66,7 @@ jobs:
             then
               rm -rf ./javadocs/latest/
             fi
-            # Helps debug the situation 
+            # Helps debug the situation
             ls -al javadocs
             echo "Starting the movement of the data around"
             mkdir -p javadocs/latest
@@ -75,7 +79,7 @@ jobs:
             echo "<html><title>Javadocs</title><body>" > javadocs/index.html
             for DIR in `find ./javadocs -type d -maxdepth 1 -mindepth 1 -exec basename {} \; | sort -r | grep -v rc3 `
             do
-              echo "<a href=\"https://ibm.github.io/FHIR/javadocs/${DIR}/index.html?overview-summary.html\">${DIR}</a>" >> javadocs/index.html 
+              echo "<a href=\"https://ibm.github.io/FHIR/javadocs/${DIR}/index.html?overview-summary.html\">${DIR}</a>" >> javadocs/index.html
               echo "<br>" >> javadocs/index.html
             done
             echo "</body></html>" >> javadocs/index.html

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,9 +27,11 @@ jobs:
         minimum-size: 8GB
         maximum-size: 8GB
         disk-root: "C:"
-    - name: Build samples
+    - name: Build tools and samples
       shell: powershell
-      run: mvn -B install --file fhir-examples/pom.xml --no-transfer-progress
+      run: |
+        mvn -B install --file fhir-tools --no-transfer-progress
+        mvn -B install --file fhir-examples --no-transfer-progress
     - name: Download Dependencies
       shell: powershell
       run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-parent -DexcludeReactor=true

diff --git a/build/audit/bin/setup-prerequisites.sh b/build/audit/bin/setup-prerequisites.sh
@@ -18,6 +18,7 @@ required_build(){
     fi
 
     # build binaries
+    mvn -B install --file fhir-tools --no-transfer-progress
     mvn -B install --file fhir-examples --no-transfer-progress
     mvn -B install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress
 
@@ -40,10 +41,10 @@ audit_build(){
 pushd $(pwd) > /dev/null
 
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo "The WORKSPACE value is unset"
     exit -1
-fi 
+fi
 
 # Change to the release directory
 cd "${WORKSPACE}"
@@ -54,5 +55,5 @@ audit_build "${1}"
 # Reset to Original Directory
 popd > /dev/null
 
-# EOF 
-###############################################################################
+# EOF
+###############################################################################
diff --git a/build/migration/bin/1_previous-setup.sh b/build/migration/bin/1_previous-setup.sh
@@ -20,6 +20,7 @@ required_build(){
     fi
 
     # build binaries
+    mvn -T2C -B install --file fhir-tools --no-transfer-progress
     mvn -T2C -B install --file fhir-examples --no-transfer-progress
 
     # 12.6.0 no longer exists.
@@ -63,10 +64,10 @@ migration_build(){
 pushd $(pwd) > /dev/null
 
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo "The WORKSPACE value is unset"
     exit -1
-fi 
+fi
 
 # Change to the release directory
 cd "${WORKSPACE}/prev"
@@ -77,5 +78,5 @@ migration_build "${1}"
 # Reset to Original Directory
 popd > /dev/null
 
-# EOF 
-###############################################################################
+# EOF
+###############################################################################
diff --git a/build/migration/bin/4_current-migrate.sh b/build/migration/bin/4_current-migrate.sh
@@ -15,6 +15,7 @@ run_migrate(){
     echo "Building the current docker image and the current java artifacts"
     pushd $(pwd) > /dev/null
     cd "${WORKSPACE}/fhir"
+    mvn -T2C -B install --file fhir-tools --no-transfer-progress
     mvn -T2C -B install --file fhir-examples --no-transfer-progress
     mvn -T2C -B install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress
 
@@ -24,7 +25,7 @@ run_migrate(){
     popd > /dev/null
 
     if [ ! -z "${migration}" ] && [ -f "${WORKSPACE}/fhir/build/migration/${migration}/4_current-migrate.sh" ]
-    then 
+    then
         echo "Running [${migration}] migration"
         bash ${WORKSPACE}/fhir/build/migration/${migration}/4_current-migrate.sh
     fi
@@ -44,4 +45,4 @@ run_migrate "${1}"
 popd > /dev/null
 
 # EOF
-###############################################################################
+###############################################################################
diff --git a/build/notifications/bin/setup-prerequisites.sh b/build/notifications/bin/setup-prerequisites.sh
@@ -18,6 +18,7 @@ required_build(){
     fi
 
     # build binaries
+    mvn -B install --file fhir-tools --no-transfer-progress
     mvn -B install --file fhir-examples --no-transfer-progress
     mvn -B install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress
 
@@ -40,10 +41,10 @@ notifications_build(){
 pushd $(pwd) > /dev/null
 
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo "The WORKSPACE value is unset"
     exit -1
-fi 
+fi
 
 # Change to the release directory
 cd "${WORKSPACE}"
@@ -54,5 +55,5 @@ notifications_build "${1}"
 # Reset to Original Directory
 popd > /dev/null
 
-# EOF 
-###############################################################################
+# EOF
+###############################################################################
diff --git a/build/persistence/bin/setup-prerequisites.sh b/build/persistence/bin/setup-prerequisites.sh
@@ -18,6 +18,7 @@ required_build(){
     fi
 
     # build binaries
+    mvn -B install --file fhir-tools --no-transfer-progress
     mvn -B install --file fhir-examples --no-transfer-progress
     mvn -B install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress
 
@@ -40,10 +41,10 @@ persistence_build(){
 pushd $(pwd) > /dev/null
 
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo "The WORKSPACE value is unset"
     exit -1
-fi 
+fi
 
 # Change to the release directory
 cd "${WORKSPACE}"
@@ -54,5 +55,5 @@ persistence_build "${1}"
 # Reset to Original Directory
 popd > /dev/null
 
-# EOF 
-###############################################################################
+# EOF
+###############################################################################
diff --git a/build/reindex/bin/setup-prerequisites.sh b/build/reindex/bin/setup-prerequisites.sh
@@ -19,6 +19,7 @@ required_build(){
     fi
 
     # build binaries
+    mvn -T2C -B install --file fhir-tools --no-transfer-progress
     mvn -T2C -B install --file fhir-examples --no-transfer-progress
     mvn -T2C -B install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress
 
@@ -53,10 +54,10 @@ reindex_build(){
 pushd $(pwd) > /dev/null
 
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo "The WORKSPACE value is unset"
     exit -1
-fi 
+fi
 
 # Change to the release directory
 cd "${WORKSPACE}"
@@ -67,5 +68,5 @@ reindex_build "${1}"
 # Reset to Original Directory
 popd > /dev/null
 
-# EOF 
-###############################################################################
+# EOF
+###############################################################################
diff --git a/build/security/setup.sh b/build/security/setup.sh
@@ -5,11 +5,11 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################################
 
-# Create the artifacts and the docker image so that the layer can be compiled in 
+# Create the artifacts and the docker image so that the layer can be compiled in
 
 # Only run if workspace is set
 if [ -z "${WORKSPACE}" ]
-then 
+then
     echo 'Export Variable is not set "${WORKSPACE}"'
 else
     pushd `pwd`
@@ -18,20 +18,21 @@ else
 
     # Creates the Temporary Folder to park intermediate results
     if [ -d build/security/logs/tmp ]
-    then 
+    then
         rm -rf build/security/logs/tmp
     fi
     if [ -d build/security/logs/output ]
-    then 
+    then
         rm -rf build/security/logs/output
     fi
     mkdir -p build/security/logs/tmp
     mkdir -p build/security/logs/output
 
+    mvn clean install -f fhir-tools/ -DskipTests -B -ntp
     mvn clean install -f fhir-examples/ -DskipTests -B -ntp
     mvn clean install -f fhir-parent/ -DskipTests  -B -ntp
     docker build fhir-install -t ibmcom/ibm-fhir-server
     popd `pwd`
     echo "Finished the setup"
 fi
-# EOF
+# EOF
diff --git a/conformance/fhir-ig-carin-bb/pom.xml b/conformance/fhir-ig-carin-bb/pom.xml
@@ -56,4 +56,21 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>fhir-tools</artifactId>
+                <version>${fhir-tools.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>condense-json</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>