Merge pull request #72 from hapifhir/rel_4_2_0

Start 4.2.0 release branch
hapifhir · Feb 16, 2020 · 7b5e0ae · 7b5e0ae
2 parents 61965fb + c2ee108
commit 7b5e0ae
Show file tree

Hide file tree

Showing 6 changed files with 411 additions and 384 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>ca.uhn.hapi.fhir</groupId>
         <artifactId>hapi-fhir</artifactId>
-        <version>4.1.0</version>
+        <version>4.2.0</version>
     </parent>
 
     <artifactId>hapi-fhir-jpaserver-starter</artifactId>
@@ -276,7 +276,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.4.22.v20191022</version>
+					 <version>${jetty_version}</version>
                 <configuration>
                     <webApp>
                         <contextPath>/hapi-fhir-jpaserver</contextPath>

diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -173,7 +173,13 @@ public BasicDataSource dataSource() throws ClassNotFoundException, NoSuchMethodE
   @Lazy
   @Bean
   public IBinaryStorageSvc binaryStorageSvc() {
-    return new DatabaseBlobBinaryStorageSvcImpl();
+    DatabaseBlobBinaryStorageSvcImpl binaryStorageSvc = new DatabaseBlobBinaryStorageSvcImpl();
+
+    if (HapiProperties.getMaxBinarySize() != null) {
+      binaryStorageSvc.setMaximumBinarySize(HapiProperties.getMaxBinarySize());
+    }
+
+    return binaryStorageSvc;
   }
 
   @Bean()