compare fhir-examples.version against pom version before it changes (#…

…2677) * compare fhir-examples.version against pom version before it changes Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com> * bump the azure-storage-blob dependency version Version 12.6.0 of this dependency has gone mysteriously missing on Maven Central. The dependency is a bit outdated now anyway, so I opted to upgrade the version instead of chasing down the Maven issue. Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Aug 15, 2021 · 49202fc · 49202fc
1 parent 6d0a060
commit 49202fc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/build/release/bin/10_build/2_version.sh b/build/release/bin/10_build/2_version.sh
@@ -8,18 +8,10 @@ set -eu -o pipefail
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################################
 
-# set version per latest build_id 
-# Parameters: 
-#   PROJECT
-#   NEW_VERISON
-# 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-parent"  -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
+# Set the version of the variables in fhir-parent.
 
-# Reconcile the versions.
+# 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\(\))
 FHIR_EXAMPLES_VERSION=$(cat fhir-examples/pom.xml | xpath -q -e project/version/text\(\))
 if [[ "${FHIR_PARENT_VERSION}" == "${FHIR_EXAMPLES_VERSION}" ]]
@@ -28,4 +20,13 @@ then
 fi
 mvn org.codehaus.mojo:versions-maven-plugin:2.7:set-property -Dproperty=fhir-tools.version -DnewVersion="${BUILD_VERSION}" -f fhir-parent
 
-# EOF
+
+# 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-parent"  -DoldVersion="*" -DnewVersion="${BUILD_VERSION}"
+
+# EOF
diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml
@@ -558,17 +558,17 @@
             <dependency>
                 <groupId>com.azure</groupId>
                 <artifactId>azure-storage-blob</artifactId>
-                <version>12.6.0</version>
+                <version>12.13.0</version>
             </dependency>
             <dependency>
                 <groupId>com.azure</groupId>
                 <artifactId>azure-core-http-okhttp</artifactId>
-                <version>1.6.2</version>
+                <version>1.7.2</version>
             </dependency>
             <dependency>
                 <groupId>com.azure</groupId>
                 <artifactId>azure-core</artifactId>
-                <version>1.15.0</version>
+                <version>1.17.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>