From d6fc0d4cacb2f188d410222eccbe3b3a07c80503 Mon Sep 17 00:00:00 2001
From: jrm <jrm@fb.com>
Date: Wed, 15 Jul 2015 17:29:02 -0700
Subject: [PATCH] [infer][java] update the installation process to use javalib
 2.3.1 and sawja 1.5.1

Summary:
Bumping up the version of the libraries javalib and sawja to 2.3.1 and 1.5.1 respectively in order to use the upstream fix about classnames with $$.
---
 INSTALL.md             |  4 ++--
 infer/src/java/INSTALL | 46 ------------------------------------------
 opam                   |  4 ++--
 3 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 infer/src/java/INSTALL

diff --git a/INSTALL.md b/INSTALL.md
index 5fb8348d1..2470c5a15 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -49,7 +49,7 @@ Install the OCaml dependencies:
 ```bash
 opam init --comp=4.01.0  # (answer 'y' to the question)
 eval `opam config env`
-opam install sawja.1.5 atdgen.1.6.0 javalib.2.3a extlib.1.5.4
+opam install extlib.1.5.4 atdgen.1.6.0 javalib.2.3.1 sawja.1.5.1
 ```
 
 If you do not require support for the C/Objective-C analysis in Infer,
@@ -93,7 +93,7 @@ wget https://github.com/ocaml/opam/releases/download/1.2.2/opam-1.2.2-x86_64-Lin
 chmod +x opam
 ./opam init --comp=4.01.0 #(then say 'y' to the final question)
 eval `./opam config env`
-./opam install sawja.1.5 atdgen.1.6.0 javalib.2.3a extlib.1.5.4 #(then say 'y' to the question)
+./opam install extlib.1.5.4 atdgen.1.6.0 javalib.2.3.1 sawja.1.5.1 #(then say 'y' to the question)
 ```
 
 If you do not require support for the C/Objective-C analysis in Infer,
diff --git a/infer/src/java/INSTALL b/infer/src/java/INSTALL
deleted file mode 100644
index 060da3bc5..000000000
--- a/infer/src/java/INSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
-
-This file contains the instructions to compile a version of Infer to verify
-Java programs.
-
-In order to avoid problems with some dependencies that may occur at compile time,
-it is best to use the OCaml Batteries Included distribution.
-
-Step 1) Install Javalib and Sawja with the following the instruction:
-
-a) install libzip-dev:
-
-	On ubuntu, install: libzip-ocaml-dev
-
-b) first install javalib by going to:
-
-  	 dependencies/javalib-2.2.2
-
-  and run
-    ./configure.sh
-
-  and follow the instructions. 
-
-c) install Sawja:
-
-  go to
-
-	dependencies/sawja-1.4
-
-  and then:
-
-	./configure.sh
-  	 make && sudo make install
-
-Step 2) InferJava can now be compiled by going to the directory:
-	
-	infer/java
-
- and typing:
-
-	make
-
-This will automatically compile the InferJava binary and move it to
-
-	infer/bin
-
-Note that folder with the binary should be added to PATH
diff --git a/opam b/opam
index 5d007a612..dc5ddaf69 100644
--- a/opam
+++ b/opam
@@ -12,9 +12,9 @@ install: []
 remove: []
 depends: [
   "ocamlfind" {build}
-  "sawja" {>="1.5"}
+  "sawja" {>="1.5.1"}
   "atdgen" {>="1.6"}
-  "javalib" {>="2.3"}
+  "javalib" {>="2.3.1"}
   "extlib" {>="1.5.4"}
 ]
 depexts: [