Condense packaged JSON resources during the build phase via profile

.github/workflows/build.yml

@@ -23,10 +23,10 @@ jobs:
         java-version: ${{ matrix.java }}
     - name: Build tools
       run: mvn -B install --file fhir-tools -Dmaven.wagon.http.retryHandler.count=3
-    - name: Build samples
-      run: mvn -B install --file fhir-examples -Dmaven.wagon.http.retryHandler.count=3
-    - name: Build parent without tests
-      run: mvn -B install --file fhir-parent -DskipTests -P integration -Dmaven.wagon.http.retryHandler.count=3
+    - name: Build samples with condensed json
+      run: mvn -B install --file fhir-examples -P condense-json -Dmaven.wagon.http.retryHandler.count=3
+    - name: Build parent with condensed json
+      run: mvn -B install --file fhir-parent -P integration,condense-json -Dmaven.wagon.http.retryHandler.count=3
     - name: Build sample generator
       run: mvn -B package --file fhir-examples-generator -Dmaven.wagon.http.retryHandler.count=3
     - name: Build benchmark
@@ -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'] }}
@@ -78,7 +80,7 @@ jobs:
           fhir-persistence-schema/src/main
           fhir-examples
         )
-        PROFILES_ARR=(integration)
+        PROFILES_ARR=(integration condense-json)
 
         if [ -n "$(git --no-pager diff --name-only ${BASE} ${GITHUB_SHA} -- ${model_paths[@]})" ]; then
           echo "Changes affect fhir-model, running ALL"
@@ -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 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
       # As the e2e tests are the fastest, opting to put javadoc:javadoc in fhir-parent
       # The profile avoids UML diagram creation
@@ -138,7 +142,7 @@ jobs:
         fi
         mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-parent --no-transfer-progress -DexcludeReactor=true -Dmaven.wagon.http.retryHandler.count=3
         mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -f fhir-parent --no-transfer-progress -DexcludeReactor=true -Dmaven.wagon.http.retryHandler.count=3
-        mvn -B ${JAVADOC_GOAL} install --file fhir-parent -DskipTests -P include-fhir-igs,integration --no-transfer-progress -Dmaven.wagon.httpconnectionManager.ttlSeconds=240 -Dmaven.wagon.http.retryHandler.count=3
+        mvn -B ${JAVADOC_GOAL} install --file fhir-parent -DskipTests -P include-fhir-igs,integration,condense-json --no-transfer-progress -Dmaven.wagon.httpconnectionManager.ttlSeconds=240 -Dmaven.wagon.http.retryHandler.count=3
     - name: free disk space
       run: |
         # create and remove a 200 MB file to make sure we have the room needed later

.github/workflows/javadocs.yml

@@ -2,7 +2,7 @@ name: Javadocs Build for Site
 
 on:
   push:
-    tags: 
+    tags:
         - '*'
 
 jobs:
@@ -62,7 +62,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 +75,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

.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
@@ -38,7 +40,7 @@ jobs:
       run: mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -f fhir-parent -DexcludeReactor=true
     - name: Build parent without tests
       shell: powershell
-      run: mvn -B install --file fhir-parent/pom.xml -P include-fhir-igs --no-transfer-progress
+      run: mvn -B install --file fhir-parent -P include-fhir-igs,condense-json --no-transfer-progress
     - name: Server Integration Tests
       shell: powershell
       run: |

build/release/bin/10_build/0_cache.sh

@@ -8,9 +8,10 @@ set -eu -o pipefail
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################################
 
-# Cache all dependencies and plugins used in build to avoid downstream timeouts during 
+# Cache all dependencies and plugins used in build to avoid downstream timeouts during
 # content fetches
 
+mvn clean install -f fhir-tools -DskipTests
 mvn clean install -f fhir-examples -DskipTests
 mvn -T2C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-examples -DexcludeReactor=true
 mvn -T2C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -f fhir-examples -DexcludeReactor=true
@@ -22,4 +23,4 @@ mvn clean package install -ntp -B -N -f fhir-parent
 mvn -T2C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -f fhir-parent -DexcludeReactor=true
 mvn -T2C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:resolve-plugins -f fhir-parent -DexcludeReactor=true
 
-# EOF
+# EOF

build/release/bin/10_build/1_clean.sh

@@ -11,8 +11,8 @@ set -eu -o pipefail
 # cleans the given projects
 # Reference https://maven.apache.org/plugins/maven-clean-plugin/
 
-mvn -T2C clean -f fhir-examples
 mvn -T2C clean -f fhir-tools
+mvn -T2C clean -f fhir-examples
 mvn -T2C clean -f fhir-parent
 
-# EOF
+# EOF

build/release/bin/10_build/2_version.sh

@@ -10,6 +10,8 @@ set -eu -o pipefail
 
 # Set the version of the variables in fhir-parent.
 
+mvn org.codehaus.mojo:versions-maven-plugin:2.7:set-property -Dproperty=fhir-tools.version -DnewVersion="${BUILD_VERSION}" -f fhir-parent
+
 # Only update the fhir-examples.version variable if it matches the version, usually a SNAPSHOT,
 # of the fhir-examples module.
 FHIR_PARENT_VERSION=$(cat fhir-parent/pom.xml | xpath -q -e project/properties/fhir-examples.version/text\(\))
@@ -18,15 +20,13 @@ if [[ "${FHIR_PARENT_VERSION}" == "${FHIR_EXAMPLES_VERSION}" ]]
 then
     mvn org.codehaus.mojo:versions-maven-plugin:2.7:set-property -Dproperty=fhir-examples.version -DnewVersion="${BUILD_VERSION}" -f fhir-parent
 fi
-mvn org.codehaus.mojo:versions-maven-plugin:2.7:set-property -Dproperty=fhir-tools.version -DnewVersion="${BUILD_VERSION}" -f fhir-parent
-
 
 # Set the project version in all the poms.
 
 # Reference https://www.mojohaus.org/versions-maven-plugin/set-mojo.html
 # use versions:revert - option to revert the change.
-mvn versions:set  -f "fhir-examples" -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
 mvn versions:set  -f "fhir-tools" -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
+mvn versions:set  -f "fhir-examples" -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
 mvn versions:set  -f "fhir-parent"  -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
 
 # EOF

build/release/bin/10_build/3_build.sh

@@ -10,23 +10,23 @@ set -eu -o pipefail
 
 # Runs the build with all the preconfigured profiles
 
-# fhir-examples
-export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-examples").profiles | map(.) | join(",")' build/release/config/release.json)"
-mvn -T2C install source:jar source:test-jar javadoc:jar -f fhir-examples \
-        -DadditionalJOption=-Xdoclint:none \
-        -f fhir-examples -P "${BUILD_PROFILES}" -DskipTests
-
 # fhir-tools
 export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-tools").profiles | map(.) | join(",")' build/release/config/release.json)"
 mvn -T2C install source:jar source:test-jar javadoc:jar -f fhir-tools \
         -DadditionalJOption=-Xdoclint:none \
         -f fhir-tools -P "${BUILD_PROFILES}" -DskipTests
 
+# fhir-examples
+export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-examples").profiles | map(.) | join(",")' build/release/config/release.json)"
+mvn -T2C install source:jar source:test-jar javadoc:jar -f fhir-examples \
+        -DadditionalJOption=-Xdoclint:none \
+        -f fhir-examples -P "${BUILD_PROFILES}" -DskipTests
+
 # fhir-parent
 export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-parent").profiles | map(.) | join(",")' build/release/config/release.json)"
 mvn -T2C install -f fhir-parent -DskipTests
 mvn -T2C install source:jar source:test-jar javadoc:jar -f fhir-parent \
         -DadditionalJOption=-Xdoclint:none \
         -f fhir-parent -P "${BUILD_PROFILES}" -DskipTests
 
-# EOF
+# EOF

build/release/bin/20_test/1_code_coverage.sh

@@ -10,16 +10,16 @@ set -eu -o pipefail
 
 # verify and generate code coverage jacoco.exec and xml files
 
-# fhir-examples
-export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-examples").profiles | map(.) | join(",")' build/release/config/release.json)"
-mvn -T2C test org.jacoco:jacoco-maven-plugin:0.8.6:report-aggregate -f fhir-examples
-
 # fhir-tools
 export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-tools").profiles | map(.) | join(",")' build/release/config/release.json)"
 mvn -T2C test org.jacoco:jacoco-maven-plugin:0.8.6:report-aggregate -f fhir-tools
 
+# fhir-examples
+export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-examples").profiles | map(.) | join(",")' build/release/config/release.json)"
+mvn -T2C test org.jacoco:jacoco-maven-plugin:0.8.6:report-aggregate -f fhir-examples
+
 # fhir-parent
 export BUILD_PROFILES=" $(jq -r '.build[] | select(.type == "fhir-parent").profiles | map(.) | join(",")' build/release/config/release.json)"
 mvn -T2C test org.jacoco:jacoco-maven-plugin:0.8.6:report-aggregate -f fhir-parent -P "${BUILD_PROFILES}"
 
-# EOF
+# EOF

build/release/config/release.json

@@ -34,23 +34,24 @@
     },
     "build": [
         {
-            "type": "fhir-examples", 
+            "type": "fhir-tools",
             "profiles": [
                 "generate-javadoc",
                 "sign-artifact",
                 "build-artifact"
             ]
         },
         {
-            "type": "fhir-tools", 
+            "type": "fhir-examples",
             "profiles": [
                 "generate-javadoc",
                 "sign-artifact",
-                "build-artifact"
+                "build-artifact",
+                "condense-json"
             ]
         },
         {
-            "type": "fhir-parent", 
+            "type": "fhir-parent",
             "profiles": [
                 "generate-javadoc",
                 "sign-artifact",
@@ -68,7 +69,8 @@
                 "model-all-tests",
                 "validation-all-tests",
                 "search-all-tests",
-                "jdbc-all-tests"
+                "jdbc-all-tests",
+                "condense-json"
             ]
         }
     ],
@@ -86,4 +88,4 @@
         "fhir-install/target/fhir-server-distribution.zip",
         "fhir-install/target/fhir-server-distribution.zip.asc"
     ]
-}
+}