Merge branch 'release' into upstream

Conflicts:
	main/libs/commons-lang3-3.3.2.jar.properties

32 files changed, 37 insertions, 23 deletions

diff --git a/main/build.gradle b/main/build.gradle
index 26b64e2..c7a3b14 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -27,12 +27,15 @@ gradle connectedCheck
 //https://github.com/stephanenicolas/Quality-Tools-for-Android
 
 def AAVersion = '3.2'
-def RXJavaVersion = '1.0.1'
+def RXJavaVersion = '1.0.2'
 def RXAndroidVersion = '0.23.0'
 def RXJavaAsyncUtilVersion = '0.21.0'
-def JacksonCoreVersion = '2.4.3'
-def JacksonDatabindVersion = '2.4.3'
-def JacksonAnnotationsVersion = '2.4.3'
+def JacksonCoreVersion = '2.4.4'
+def JacksonDatabindVersion = '2.4.4'
+def JacksonAnnotationsVersion = '2.4.4'
+def CommonsCollections4Version = '4.0'
+def CommonsLang3Version = '3.3.2'
+def CommonsIoVersion = '2.4'
 group = 'cgeo.geocaching'
 version = '0.0.1'
 
@@ -158,9 +161,9 @@ dependencies {
     compile 'com.google.android.gms:play-services:5.0.89'
 
     compile 'com.jakewharton:butterknife:6.0.0'
-    compile 'org.apache.commons:commons-collections4:4.0'
-    compile 'org.apache.commons:commons-lang3:3.3.2'
-    compile 'commons-io:commons-io:2.4'
+    compile "org.apache.commons:commons-collections4:$CommonsCollections4Version"
+    compile "org.apache.commons:commons-lang3:3.3.2:$CommonsLang3Version"
+    compile "commons-io:commons-io:$CommonsIoVersion"
     compile 'com.google.code.findbugs:annotations:3.0.0'
 
     compile "io.reactivex:rxjava:$RXJavaVersion"
diff --git a/main/libs/commons-collections4-4.0.jar.properties b/main/libs/commons-collections4-4.0.jar.properties
index a50b66c..1807323 100644
--- a/main/libs/commons-collections4-4.0.jar.properties
+++ b/main/libs/commons-collections4-4.0.jar.properties
@@ -1 +1,2 @@
-src=src/commons-collections4-4.0-sources.jar
\ No newline at end of file
+src=src/commons-collections4-4.0-sources.jar
+doc=src/commons-collections4-4.0-javadoc.jar
diff --git a/main/libs/commons-io-2.4.jar.properties b/main/libs/commons-io-2.4.jar.properties
index d160263..ff1c9c9 100644
--- a/main/libs/commons-io-2.4.jar.properties
+++ b/main/libs/commons-io-2.4.jar.properties
@@ -1,2 +1,2 @@
 src=src/commons-io-2.4-sources.jar
-doc=src/commons-io-2.4-javadoc.jar
\ No newline at end of file
+doc=src/commons-io-2.4-javadoc.jar
diff --git a/main/libs/commons-lang3-3.3.2.jar b/main/libs/commons-lang3-3.3.2.jar
index bb06979..2ce08ae 100644
--- a/main/libs/commons-lang3-3.3.2.jar
+++ b/main/libs/commons-lang3-3.3.2.jar
diff --git a/main/libs/commons-lang3-3.3.2.jar.properties b/main/libs/commons-lang3-3.3.2.jar.properties
index b45f505..08f905f 100644
--- a/main/libs/commons-lang3-3.3.2.jar.properties
+++ b/main/libs/commons-lang3-3.3.2.jar.properties
@@ -1,2 +1,2 @@
-src=src/commons-lang3-3.3.2-sources.jar\
-doc=src/commons-lang3-3.3.2-javadoc.jar
\ No newline at end of file
+src=src/commons-lang3-3.3.2-sources.jar
+doc=src/commons-lang3-3.3.2-javadoc.jar
diff --git a/main/libs/jackson-annotations-2.4.3.jar.properties b/main/libs/jackson-annotations-2.4.3.jar.properties
deleted file mode 100644
index 63aa0d8..0000000
--- a/main/libs/jackson-annotations-2.4.3.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/jackson-annotations-2.4.3-sources.jar
-doc=src/jackson-annotations-2.4.3-javadoc.jar
diff --git a/main/libs/jackson-annotations-2.4.3.jar b/main/libs/jackson-annotations-2.4.4.jar
index cea0698..4779188 100644
--- a/main/libs/jackson-annotations-2.4.3.jar
+++ b/main/libs/jackson-annotations-2.4.4.jar
diff --git a/main/libs/jackson-annotations-2.4.4.jar.properties b/main/libs/jackson-annotations-2.4.4.jar.properties
new file mode 100644
index 0000000..1a86cc6
--- /dev/null
+++ b/main/libs/jackson-annotations-2.4.4.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-annotations-2.4.4-sources.jar
+doc=src/jackson-annotations-2.4.4-javadoc.jar
diff --git a/main/libs/jackson-core-2.4.3.jar.properties b/main/libs/jackson-core-2.4.3.jar.properties
deleted file mode 100644
index e27d6b3..0000000
--- a/main/libs/jackson-core-2.4.3.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/jackson-core-2.4.3-sources.jar
-doc=src/jackson-core-2.4.3-javadoc.jar
diff --git a/main/libs/jackson-core-2.4.3.jar b/main/libs/jackson-core-2.4.4.jar
index eb74e61..da2a877 100644
--- a/main/libs/jackson-core-2.4.3.jar
+++ b/main/libs/jackson-core-2.4.4.jar
diff --git a/main/libs/jackson-core-2.4.4.jar.properties b/main/libs/jackson-core-2.4.4.jar.properties
new file mode 100644
index 0000000..20bc2ea
--- /dev/null
+++ b/main/libs/jackson-core-2.4.4.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-core-2.4.4-sources.jar
+doc=src/jackson-core-2.4.4-javadoc.jar
diff --git a/main/libs/jackson-databind-2.4.3.jar.properties b/main/libs/jackson-databind-2.4.3.jar.properties
deleted file mode 100644
index 42ac7ef..0000000
--- a/main/libs/jackson-databind-2.4.3.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/jackson-databind-2.4.3-sources.jar
-doc=src/jackson-databind-2.4.3-javadoc.jar
diff --git a/main/libs/jackson-databind-2.4.3.jar b/main/libs/jackson-databind-2.4.4.jar
index 79b5aad..e945e5e 100644
--- a/main/libs/jackson-databind-2.4.3.jar
+++ b/main/libs/jackson-databind-2.4.4.jar
diff --git a/main/libs/jackson-databind-2.4.4.jar.properties b/main/libs/jackson-databind-2.4.4.jar.properties
new file mode 100644
index 0000000..b9316cd
--- /dev/null
+++ b/main/libs/jackson-databind-2.4.4.jar.properties
@@ -0,0 +1,2 @@
+src=src/jackson-databind-2.4.4-sources.jar
+doc=src/jackson-databind-2.4.4-javadoc.jar
diff --git a/main/libs/rxjava-1.0.1.jar.properties b/main/libs/rxjava-1.0.1.jar.properties
deleted file mode 100644
index 779fd7a..0000000
--- a/main/libs/rxjava-1.0.1.jar.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-src=src/rxjava-1.0.1-sources.jar
-doc=src/rxjava-1.0.1-javadoc.jar
diff --git a/main/libs/rxjava-1.0.1.jar b/main/libs/rxjava-1.0.2.jar
index cd1a96b..4362a9f 100644
--- a/main/libs/rxjava-1.0.1.jar
+++ b/main/libs/rxjava-1.0.2.jar
diff --git a/main/libs/rxjava-1.0.2.jar.properties b/main/libs/rxjava-1.0.2.jar.properties
new file mode 100644
index 0000000..49609bd
--- /dev/null
+++ b/main/libs/rxjava-1.0.2.jar.properties
@@ -0,0 +1,2 @@
+src=src/rxjava-1.0.2-sources.jar
+doc=src/rxjava-1.0.2-javadoc.jar
diff --git a/main/libs/src/commons-collections4-4.0-javadoc.jar b/main/libs/src/commons-collections4-4.0-javadoc.jar
new file mode 100644
index 0000000..35989f8
--- /dev/null
+++ b/main/libs/src/commons-collections4-4.0-javadoc.jar
diff --git a/main/libs/src/commons-lang3-3.3.2-javadoc.jar b/main/libs/src/commons-lang3-3.3.2-javadoc.jar
index bd2f422..9cad4b1 100644
--- a/main/libs/src/commons-lang3-3.3.2-javadoc.jar
+++ b/main/libs/src/commons-lang3-3.3.2-javadoc.jar
diff --git a/main/libs/src/jackson-annotations-2.4.3-javadoc.jar b/main/libs/src/jackson-annotations-2.4.3-javadoc.jar
deleted file mode 100644
index 8d24c1e..0000000
--- a/main/libs/src/jackson-annotations-2.4.3-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/jackson-annotations-2.4.4-javadoc.jar b/main/libs/src/jackson-annotations-2.4.4-javadoc.jar
new file mode 100644
index 0000000..f98e974
--- /dev/null
+++ b/main/libs/src/jackson-annotations-2.4.4-javadoc.jar
diff --git a/main/libs/src/jackson-annotations-2.4.3-sources.jar b/main/libs/src/jackson-annotations-2.4.4-sources.jar
index 7c2cc48..27e6839 100644
--- a/main/libs/src/jackson-annotations-2.4.3-sources.jar
+++ b/main/libs/src/jackson-annotations-2.4.4-sources.jar
diff --git a/main/libs/src/jackson-core-2.4.3-javadoc.jar b/main/libs/src/jackson-core-2.4.3-javadoc.jar
deleted file mode 100644
index 91e941f..0000000
--- a/main/libs/src/jackson-core-2.4.3-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/jackson-core-2.4.4-javadoc.jar b/main/libs/src/jackson-core-2.4.4-javadoc.jar
new file mode 100644
index 0000000..61fc085
--- /dev/null
+++ b/main/libs/src/jackson-core-2.4.4-javadoc.jar
diff --git a/main/libs/src/jackson-core-2.4.3-sources.jar b/main/libs/src/jackson-core-2.4.4-sources.jar
index 2cb9eb0..c722e6f 100644
--- a/main/libs/src/jackson-core-2.4.3-sources.jar
+++ b/main/libs/src/jackson-core-2.4.4-sources.jar
diff --git a/main/libs/src/jackson-databind-2.4.3-javadoc.jar b/main/libs/src/jackson-databind-2.4.3-javadoc.jar
deleted file mode 100644
index 67682a7..0000000
--- a/main/libs/src/jackson-databind-2.4.3-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/jackson-databind-2.4.4-javadoc.jar b/main/libs/src/jackson-databind-2.4.4-javadoc.jar
new file mode 100644
index 0000000..c7b788a
--- /dev/null
+++ b/main/libs/src/jackson-databind-2.4.4-javadoc.jar
diff --git a/main/libs/src/jackson-databind-2.4.3-sources.jar b/main/libs/src/jackson-databind-2.4.4-sources.jar
index 71bb845..ca120e8 100644
--- a/main/libs/src/jackson-databind-2.4.3-sources.jar
+++ b/main/libs/src/jackson-databind-2.4.4-sources.jar
diff --git a/main/libs/src/rxjava-1.0.1-javadoc.jar b/main/libs/src/rxjava-1.0.1-javadoc.jar
deleted file mode 100644
index 7296918..0000000
--- a/main/libs/src/rxjava-1.0.1-javadoc.jar
+++ /dev/null
diff --git a/main/libs/src/rxjava-1.0.2-javadoc.jar b/main/libs/src/rxjava-1.0.2-javadoc.jar
new file mode 100644
index 0000000..afebe05
--- /dev/null
+++ b/main/libs/src/rxjava-1.0.2-javadoc.jar
diff --git a/main/libs/src/rxjava-1.0.1-sources.jar b/main/libs/src/rxjava-1.0.2-sources.jar
index 88ffb2d..178f8a1 100644
--- a/main/libs/src/rxjava-1.0.1-sources.jar
+++ b/main/libs/src/rxjava-1.0.2-sources.jar
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index 3a0a90c..d41d08d 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -1,12 +1,15 @@
 #! /bin/sh
 #
 
-RXJAVA=1.0.1
+RXJAVA=1.0.2
 RXANDROID=0.23.0
 RXJAVAASYNCUTIL=0.21.0
-JACKSONCORE=2.4.3
-JACKSONDATABIND=2.4.3
-JACKSONANNOTATIONS=2.4.3
+JACKSONCORE=2.4.4
+JACKSONDATABIND=2.4.4
+JACKSONANNOTATIONS=2.4.4
+COMMONSCOLLECTIONS4=4.0
+COMMONSLANG3=3.3.2
+COMMONSIO=2.4
 
 cd $(git rev-parse --show-toplevel)/main/libs
 
@@ -45,3 +48,10 @@ updatelib com/fasterxml/jackson/core jackson-databind $JACKSONDATABIND
 fixgradle JacksonDatabindVersion $JACKSONDATABIND
 updatelib com/fasterxml/jackson/core jackson-annotations $JACKSONANNOTATIONS
 fixgradle JacksonAnnotationsVersion $JACKSONANNOTATIONS
+
+updatelib org/apache/commons commons-collections4 $COMMONSCOLLECTIONS4
+fixgradle CommonsCollections4Version $COMMONSCOLLECTIONS4
+updatelib org/apache/commons commons-lang3 $COMMONSLANG3
+fixgradle CommonsLang3Version $COMMONSLANG3
+updatelib commons-io commons-io $COMMONSIO
+fixgradle CommonsIoVersion $COMMONSIO