diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 797b79b1..aaf35d0a 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -673,7 +673,7 @@
 				<Directory Id='DataJava' Name='java'>
 
 					<Component Id='JavaGuavaJar' Guid='*' Win64="$(var.Win64)">
-						<File Id='JavaGuava' Name='guava-18.0.jar' DiskId='1' Source='./../../../bin/app/data/java/guava-18.0.jar' KeyPath='yes' />
+						<File Id='JavaGuava' Name='guava-21.0.jar' DiskId='1' Source='./../../../bin/app/data/java/guava-21.0.jar' KeyPath='yes' />
 					</Component>
 					<Component Id='JavaJavaIndexerJar' Guid='*' Win64="$(var.Win64)">
 						<File Id='JavaJavaIndexer' Name='java-indexer.jar' DiskId='1' Source='./../../../bin/app/data/java/java-indexer.jar' KeyPath='yes' />
diff --git a/setup/jars/windows/guava-18.0.jar b/setup/jars/windows/guava-18.0.jar
deleted file mode 100644
index 8f89e490..00000000
Binary files a/setup/jars/windows/guava-18.0.jar and /dev/null differ
diff --git a/setup/jars/windows/guava-21.0.jar b/setup/jars/windows/guava-21.0.jar
new file mode 100644
index 00000000..06181959
Binary files /dev/null and b/setup/jars/windows/guava-21.0.jar differ
diff --git a/setup/jars/windows/java-symbol-solver-core.jar b/setup/jars/windows/java-symbol-solver-core.jar
index 876e84ea..4b0ca94d 100644
Binary files a/setup/jars/windows/java-symbol-solver-core.jar and b/setup/jars/windows/java-symbol-solver-core.jar differ
diff --git a/setup/jars/windows/java-symbol-solver-logic.jar b/setup/jars/windows/java-symbol-solver-logic.jar
index c31f577b..0aaa2d06 100644
Binary files a/setup/jars/windows/java-symbol-solver-logic.jar and b/setup/jars/windows/java-symbol-solver-logic.jar differ
diff --git a/setup/jars/windows/java-symbol-solver-model.jar b/setup/jars/windows/java-symbol-solver-model.jar
index f600b5a7..333fa396 100644
Binary files a/setup/jars/windows/java-symbol-solver-model.jar and b/setup/jars/windows/java-symbol-solver-model.jar differ
diff --git a/setup/jars/windows/javaparser-core.jar b/setup/jars/windows/javaparser-core.jar
index b5056345..d3af50e2 100644
Binary files a/setup/jars/windows/javaparser-core.jar and b/setup/jars/windows/javaparser-core.jar differ
diff --git a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
index 6fccad8c..998bc6ac 100644
--- a/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
+++ b/src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
@@ -28,9 +28,9 @@ void JavaEnvironmentFactory::createInstance(std::string classPath, std::string&
 	}
 
 	std::function<jint (JavaVM**, void**, void*)> createInstanceFunction;
-
+	const FilePath javaPath(ApplicationSettings::getInstance()->getJavaPath());
 	createInstanceFunction = utility::loadFunctionFromLibrary<jint, JavaVM**, void**, void*>(
-		FilePath(ApplicationSettings::getInstance()->getJavaPath()),
+		javaPath,
 		"JNI_CreateJavaVM",
 		errorString
 	);
diff --git a/src/lib_java/data/parser/java/JavaParser.cpp b/src/lib_java/data/parser/java/JavaParser.cpp
index 4d3b7b35..7318fc93 100644
--- a/src/lib_java/data/parser/java/JavaParser.cpp
+++ b/src/lib_java/data/parser/java/JavaParser.cpp
@@ -24,7 +24,7 @@ std::string JavaParser::prepareJavaEnvironment()
 		const std::string separator = ":";
 #endif
 		JavaEnvironmentFactory::createInstance(
-			ResourcePaths::getJavaPath().str() + "guava-18.0.jar" + separator +
+			ResourcePaths::getJavaPath().str() + "guava-21.0.jar" + separator +
 			ResourcePaths::getJavaPath().str() + "java-indexer.jar" + separator +
 			ResourcePaths::getJavaPath().str() + "javaparser-core.jar" + separator +
 			ResourcePaths::getJavaPath().str() + "javaslang-2.0.3.jar" + separator +
diff --git a/src/lib_java/project/SourceGroupJava.cpp b/src/lib_java/project/SourceGroupJava.cpp
index 5ad5610a..5438dd96 100644
--- a/src/lib_java/project/SourceGroupJava.cpp
+++ b/src/lib_java/project/SourceGroupJava.cpp
@@ -108,6 +108,7 @@ std::vector<std::shared_ptr<IndexerCommand>> SourceGroupJava::getIndexerCommands
 bool SourceGroupJava::prepareJavaEnvironment()
 {
 	const std::string errorString = JavaParser::prepareJavaEnvironment();
+
 	if (errorString.size() > 0)
 	{
 		LOG_ERROR(errorString);
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index b6535280..b7458f9e 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -817,7 +817,7 @@ private:
 			const std::string separator = ":";
 #endif
 			JavaEnvironmentFactory::createInstance(
-				"../app/data/java/guava-18.0.jar" + separator +
+				"../app/data/java/guava-21.0.jar" + separator +
 				"../app/data/java/java-indexer.jar" + separator +
 				"../app/data/java/javaparser-core.jar" + separator +
 				"../app/data/java/javaslang-2.0.3.jar" + separator +