resolve changelog conflict

Author: r-i-v-a

CHANGELOG.md

@@ -8,7 +8,9 @@ Categories for each release: Added, Changed, Deprecated, Removed, Fixed, Securit
 
 ### Security
 
-* Updated dependencies in Java wrapper: httpclient 4.5.14
+* Updated dependencies in Java wrapper
+  * commons-io 2.18.0
+  * httpclient 4.5.14
 
 ## [389.0] - beta
 

src/java/Readme.md

@@ -12,7 +12,15 @@ Development
 
 ### Build dependencies
 
-* Maven (`apt-get install maven`)
+* Maven
+
+```bash
+apt-get install maven
+````
+
+```bash
+brew install maven
+```
 
 ### Building
 

src/java/pom.xml

@@ -62,7 +62,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.5</version>
+      <version>2.18.0</version>
       <scope>compile</scope>
     </dependency>
 

src/python/dxpy/bindings/dxfile.py

@@ -47,6 +47,7 @@
 
 MD5_READ_CHUNK_SIZE = 1024*1024*4
 FILE_REQUEST_TIMEOUT = 60
+PART_UPLOAD_REQUEST_TIMEOUT_SECONDS = 300
 
 
 def _validate_headers(headers):
@@ -715,7 +716,7 @@ def get_upload_url_and_headers():
                            jsonify_data=False,
                            prepend_srv=False,
                            always_retry=True,
-                           timeout=FILE_REQUEST_TIMEOUT,
+                           timeout=PART_UPLOAD_REQUEST_TIMEOUT_SECONDS,
                            auth=None,
                            method='PUT')