Merge pull request #1578 from IBM/lee-master

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Oct 14, 2020 · 8ac1af9 · 8ac1af9
2 parents 81cea9f + 08ba9c2
commit 8ac1af9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/fhir-install/Dockerfile b/fhir-install/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # ----------------------------------------------------------------------------
 
-FROM openliberty/open-liberty:20.0.0.6-full-java8-openj9-ubi as base
+FROM openliberty/open-liberty:20.0.0.9-full-java8-openj9-ubi as base
 
 ENV LICENSE accept
 
@@ -20,7 +20,7 @@ RUN unzip -qq /tmp/fhir-server-distribution.zip -d /tmp && \
 
 # ----------------------------------------------------------------------------
 
-FROM openliberty/open-liberty:20.0.0.6-full-java8-openj9-ubi
+FROM openliberty/open-liberty:20.0.0.9-full-java8-openj9-ubi
 COPY --chown=1001:0 --from=base /opt/ol/wlp /opt/ol/wlp
 
 MAINTAINER Lee Surprenant <lmsurpre@us.ibm.com>

diff --git a/fhir-install/src/main/resources/scripts/install.bat b/fhir-install/src/main/resources/scripts/install.bat
@@ -7,7 +7,7 @@
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
-set LIBERTY_VERSION=20.0.0.6
+set LIBERTY_VERSION=20.0.0.9
 
 echo Executing %0 to deploy the fhir-server web application...
 

diff --git a/fhir-install/src/main/resources/scripts/install.sh b/fhir-install/src/main/resources/scripts/install.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################################
 
-export LIBERTY_VERSION="20.0.0.6"
+export LIBERTY_VERSION="20.0.0.9"
 
 echo "
 Executing $0 to deploy the fhir-server web application...

diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml
@@ -10,7 +10,7 @@
     <name>IBM FHIR Server</name>
 
     <properties>
-        <liberty.version>20.0.0.6</liberty.version>
+        <liberty.version>20.0.0.9</liberty.version>
         <derby.version>10.14.2.0</derby.version>
         <db2.version>11.5.0.0</db2.version>
         <postgresql.version>42.2.12</postgresql.version>
@@ -590,7 +590,8 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <!-- 3.0.1 is the highest version we support as 3.1.0 changes the ability to aggregate multi-module projects.  It's not possible--> 
+                    <!-- 3.0.1 is the highest version we support as 3.1.0 
+                        changes the ability to aggregate multi-module projects. It's not possible -->
                     <version>3.0.1</version>
                     <configuration>
                         <!-- speed up the build -->
@@ -607,7 +608,8 @@
                         <maxmemory>2g</maxmemory>
                         <!-- doclint is none, otherwise build breaks -->
                         <doclint>none</doclint>
-                        <additionalparam>-Xdoclint:none -Djava.awt.headless=true</additionalparam>
+                        <additionalparam>-Xdoclint:none
+                            -Djava.awt.headless=true</additionalparam>
                         <detectLinks>true</detectLinks>
                         <docletArtifact>
                             <groupId>nl.talsmasoftware</groupId>
@@ -921,7 +923,8 @@
                             <source>8</source>
                             <verbose>true</verbose>
                             <doclint>none</doclint>
-                            <additionalparam>-Xdoclint:none -Djava.awt.headless=true</additionalparam>
+                            <additionalparam>-Xdoclint:none
+                                -Djava.awt.headless=true</additionalparam>
                             <minmemory>2g</minmemory>
                             <maxmemory>2g</maxmemory>
                             <nohelp>true</nohelp>
@@ -979,7 +982,8 @@
                     <maxmemory>2g</maxmemory>
                     <!-- doclint is none, otherwise build breaks -->
                     <doclint>none</doclint>
-                    <additionalparam>-Xdoclint:none -Djava.awt.headless=true</additionalparam>
+                    <additionalparam>-Xdoclint:none
+                        -Djava.awt.headless=true</additionalparam>
                     <detectLinks>true</detectLinks>
                     <docletArtifact>
                         <groupId>nl.talsmasoftware</groupId>