2 files changed, 90 insertions, 12 deletions
diff --git a/main/project/eclipse installation/cgeo eclipse components.p2f b/main/project/eclipse installation/cgeo eclipse components.p2f
index f758e68..3afac28 100644
--- a/main/project/eclipse installation/cgeo eclipse components.p2f
+++ b/main/project/eclipse installation/cgeo eclipse components.p2f
@@ -1,40 +1,108 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <?p2f version='1.0.0'?>
 <p2f version='1.0.0'>
-  <ius size='7'>
-    <iu id='com.android.ide.eclipse.ddms.feature.group' name='Android DDMS' version='22.2.1.v201309180102-833290'>
+  <ius size='20'>
+    <iu id='com.android.ide.eclipse.ddms.feature.feature.group' name='Android DDMS' version='23.0.2.1259578'>
       <repositories size='1'>
         <repository location='https://dl-ssl.google.com/android/eclipse/'/>
       </repositories>
     </iu>
-    <iu id='com.android.ide.eclipse.adt.feature.group' name='Android Development Tools' version='22.2.1.v201309180102-833290'>
+    <iu id='com.android.ide.eclipse.adt.feature.feature.group' name='Android Development Tools' version='23.0.2.1259578'>
       <repositories size='1'>
         <repository location='https://dl-ssl.google.com/android/eclipse/'/>
       </repositories>
     </iu>
-    <iu id='com.android.ide.eclipse.hierarchyviewer.feature.group' name='Android Hierarchy Viewer' version='22.2.1.v201309180102-833290'>
+    <iu id='com.android.ide.eclipse.hierarchyviewer.feature.feature.group' name='Android Hierarchy Viewer' version='23.0.2.1259578'>
       <repositories size='1'>
         <repository location='https://dl-ssl.google.com/android/eclipse/'/>
       </repositories>
     </iu>
-    <iu id='com.android.ide.eclipse.traceview.feature.group' name='Android Traceview' version='22.2.1.v201309180102-833290'>
+    <iu id='com.android.ide.eclipse.traceview.feature.feature.group' name='Android Traceview' version='23.0.2.1259578'>
       <repositories size='1'>
         <repository location='https://dl-ssl.google.com/android/eclipse/'/>
       </repositories>
     </iu>
-    <iu id='org.eclipse.mylyn.github.feature.feature.group' name='Eclipse GitHub integration with task focused interface' version='3.0.0.201306101825-r'>
+    <iu id='org.eclipse.recommenders.mylyn.rcp.feature.feature.group' name='Code Recommenders Mylyn Integration' version='2.1.0.v20140608-1213'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/releases/kepler'/>
+        <repository location='http://download.eclipse.org/releases/luna'/>
       </repositories>
     </iu>
-    <iu id='epp.package.java' name='Eclipse IDE for Java Developers' version='2.0.1.20130919-0803'>
+    <iu id='org.eclipse.recommenders.snipmatch.rcp.feature.feature.group' name='Code Recommenders Snipmatch' version='2.1.0.v20140606-1807'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/releases/kepler'/>
+        <repository location='http://download.eclipse.org/releases/luna'/>
       </repositories>
     </iu>
-    <iu id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' name='FindBugs Feature' version='2.0.2.20121210'>
+    <iu id='org.eclipse.mylyn.github.feature.feature.group' name='Eclipse GitHub integration with task focused interface' version='3.4.0.201406110918-r'>
+      <repositories size='2'>
+        <repository location='http://download.eclipse.org/releases/luna'/>
+        <repository location='http://download.eclipse.org/egit/github/updates'/>
+      </repositories>
+    </iu>
+    <iu id='epp.package.java' name='Eclipse IDE for Java Developers' version='4.4.0.20140612-0500'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/releases/luna'/>
+      </repositories>
+    </iu>
+    <iu id='edu.umd.cs.findbugs.plugin.eclipse.feature.group' name='FindBugs Feature' version='3.0.0.20140625-7bb789f'>
+      <repositories size='1'>
+        <repository location='http://findbugs.cs.umd.edu/eclipse/'/>
+      </repositories>
+    </iu>
+    <iu id='com.genymobile.genymotion.ide.eclipse.feature.group' name='Genymotion Eclipse Tools' version='1.0.3.201403261147'>
+      <repositories size='1'>
+        <repository location='http://plugins.genymotion.com/eclipse'/>
+      </repositories>
+    </iu>
+    <iu id='org.springsource.ide.eclipse.gradle.feature.feature.group' name='Gradle IDE' version='3.6.0.201407080553-RELEASE'>
+      <repositories size='1'>
+        <repository location='http://dist.springsource.com/release/TOOLS/gradle'/>
+      </repositories>
+    </iu>
+    <iu id='org.eclipse.jgit.http.apache.feature.group' name='Java implementation of Git - optional Http support using Apache httpclient' version='3.4.1.201406201815-r'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/egit/updates'/>
+      </repositories>
+    </iu>
+    <iu id='org.eclipse.jgit.java7.feature.group' name='Java implementation of Git - optional Java 7 libraries' version='3.4.1.201406201815-r'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/egit/updates'/>
+      </repositories>
+    </iu>
+    <iu id='org.eclipse.wst.jsdt.feature.feature.group' name='JavaScript Development Tools' version='1.6.0.v201405071612-7G7FFyXFBBoPc8Pvc8c0wn'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/releases/luna'/>
+      </repositories>
+    </iu>
+    <iu id='markdown.editor.feature.feature.group' name='Markdown Editor' version='0.2.3'>
+      <repositories size='1'>
+        <repository location='http://www.winterwell.com/software/updatesite/'/>
+      </repositories>
+    </iu>
+    <iu id='org.moreunit.feature.group' name='MoreUnit For Java' version='3.0.4'>
       <repositories size='1'>
-        <repository location='http://findbugs.cs.umd.edu/eclipse'/>
+        <repository location='http://moreunit.sourceforge.net/update-site/'/>
+      </repositories>
+    </iu>
+    <iu id='org.eclipse.mylyn.gerrit.feature.feature.group' name='Mylyn Reviews Connector: Gerrit' version='2.3.0.v20140605-1717'>
+      <repositories size='3'>
+        <repository location='http://download.eclipse.org/releases/luna'/>
+        <repository location='http://download.eclipse.org/mylyn/releases/luna'/>
+        <repository location='http://download.eclipse.org/mylyn/releases/latest'/>
+      </repositories>
+    </iu>
+    <iu id='org.eclipse.oomph.winexplorer.feature.group' name='Oomph Windows Explorer' version='1.0.0.v20140803-0627'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/oomph/updates/'/>
+      </repositories>
+    </iu>
+    <iu id='org.projectusus.feature.group' name='Project Usus' version='0.7.4.201401122006'>
+      <repositories size='1'>
+        <repository location='http://projectusus.googlecode.com/svn/updates/'/>
+      </repositories>
+    </iu>
+    <iu id='com.android.ide.eclipse.gldebugger.feature.feature.group' name='Tracer for OpenGL ES' version='23.0.2.1259578'>
+      <repositories size='1'>
+        <repository location='https://dl-ssl.google.com/android/eclipse/'/>
       </repositories>
     </iu>
   </ius>
diff --git a/main/project/libraries/update-libs.sh b/main/project/libraries/update-libs.sh
index f2e9ced..a2db911 100755
--- a/main/project/libraries/update-libs.sh
+++ b/main/project/libraries/update-libs.sh
@@ -1,7 +1,10 @@
 #! /bin/sh
 #
 
-RXJAVA=0.19.6
+RXJAVA=0.20.4
+JACKSONCORE=2.4.1.1
+JACKSONDATABIND=2.4.1.3
+JACKSONANNOTATIONS=2.4.1
 
 cd $(git rev-parse --show-toplevel)/main/libs
 
@@ -31,3 +34,10 @@ updatelib com/netflix/rxjava rxjava-core $RXJAVA
 updatelib com/netflix/rxjava rxjava-android $RXJAVA
 updatelib com/netflix/rxjava rxjava-async-util $RXJAVA
 fixgradle RXVersion $RXJAVA
+
+updatelib com/fasterxml/jackson/core jackson-core $JACKSONCORE
+fixgradle JacksonCoreVersion $JACKSONCORE
+updatelib com/fasterxml/jackson/core jackson-databind $JACKSONDATABIND
+fixgradle JacksonDatabindVersion $JACKSONDATABIND
+updatelib com/fasterxml/jackson/core jackson-annotations $JACKSONANNOTATIONS
+fixgradle JacksonAnnotationsVersion $JACKSONANNOTATIONS