ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "logic: update java indexer to new version of Java dependencies"

Browse Source 
This reverts commit da2b44bd25.
This commit is contained in:
Eberhard Graether
2017-05-08 14:17:22 +02:00
parent a224d42079
commit ad1a48bce4
11 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/data/parser/java/JavaEnvironmentFactory.cpp
+2 -2
View File
@@ -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*>(
javaPath,
FilePath(ApplicationSettings::getInstance()->getJavaPath()),
"JNI_CreateJavaVM",
errorString
);
src/lib_java/data/parser/java/JavaParser.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ std::string JavaParser::prepareJavaEnvironment()
const std::string separator = ":";
#endif
JavaEnvironmentFactory::createInstance(
ResourcePaths::getJavaPath().str() + "guava-21.0.jar" + separator +
ResourcePaths::getJavaPath().str() + "guava-18.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 +