diff --git a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
index 39c24041..f83ea742 100644
--- a/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
+++ b/bin/test/data/JavaIndexSampleProjectsTestSuite/JavaSymbolSolver060/expected_output/java-symbol-solver-core_com_github_javaparser_symbolsolver_javaparsermodel_declarations_JavaParserAnonymousClassDeclaration.txt
@@ -380,39 +380,39 @@ QUALIFIER: com.github.javaparser.ast [JavaParserAnonymousClassDeclaration.java <
 QUALIFIER: com.github.javaparser [JavaParserAnonymousClassDeclaration.java <111:38 111:47>]
 QUALIFIER: com.github [JavaParserAnonymousClassDeclaration.java <111:31 111:36>]
 QUALIFIER: com [JavaParserAnonymousClassDeclaration.java <111:27 111:29>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [JavaParserAnonymousClassDeclaration.java <113:22 113:26>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavaParserAnonymousClassDeclaration.java <113:22 113:26>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.stream.Stream<R> java.util.stream.Stream<T>.map<R>(java.util.function.Function<? super T, ? extends R>) [JavaParserAnonymousClassDeclaration.java <115:32 115:34>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.stream.Stream<java.util.Collection<E>.E> java.util.Collection<E>.stream() [JavaParserAnonymousClassDeclaration.java <114:47 114:52>]
 SYMBOL_METHOD com.github.javaparser.ast.NodeList<com.github.javaparser.ast.body.VariableDeclarator> com.github.javaparser.ast.body.FieldDeclaration.getVariables()
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.ast.NodeList<com.github.javaparser.ast.body.VariableDeclarator> com.github.javaparser.ast.body.FieldDeclaration.getVariables() [JavaParserAnonymousClassDeclaration.java <114:32 114:43>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [JavaParserAnonymousClassDeclaration.java <114:26 114:30>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavaParserAnonymousClassDeclaration.java <115:36 115:43>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavaParserAnonymousClassDeclaration.java <114:26 114:30>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<5> [JavaParserAnonymousClassDeclaration.java <115:36 115:43>]
 SYMBOL_METHOD com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.JavaParserFieldDeclaration(com.github.javaparser.ast.body.VariableDeclarator, com.github.javaparser.symbolsolver.model.resolution.TypeSolver)
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration.JavaParserFieldDeclaration(com.github.javaparser.ast.body.VariableDeclarator, com.github.javaparser.symbolsolver.model.resolution.TypeSolver) [JavaParserAnonymousClassDeclaration.java <115:52 115:77>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration [JavaParserAnonymousClassDeclaration.java <115:52 115:77>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavaParserAnonymousClassDeclaration.java <115:79 115:86>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<5> [JavaParserAnonymousClassDeclaration.java <115:79 115:86>]
 REFERENCE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.resolution.TypeSolver com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.typeSolver [JavaParserAnonymousClassDeclaration.java <116:79 116:88>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> static java.util.stream.Collector<T, ?, java.util.List<T>> java.util.stream.Collectors.toList<T>() [JavaParserAnonymousClassDeclaration.java <117:33 117:38>]
 QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java <117:22 117:31>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <119:5 119:8>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserAnonymousClassDeclaration.java <119:10 119:25>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<7> [JavaParserAnonymousClassDeclaration.java <119:28 119:43>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<6> [JavaParserAnonymousClassDeclaration.java <119:28 119:43>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserAnonymousClassDeclaration.java <120:46 120:57>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.getTypeDeclaration() [JavaParserAnonymousClassDeclaration.java <120:25 120:42>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.typesystem.ReferenceType com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getSuperClass() [JavaParserAnonymousClassDeclaration.java <120:9 120:21>]
 REFERENCE_TYPE_USAGE java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<E> [JavaParserAnonymousClassDeclaration.java <122:5 122:8>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserAnonymousClassDeclaration.java <122:10 122:25>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<8> [JavaParserAnonymousClassDeclaration.java <122:28 122:42>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<7> [JavaParserAnonymousClassDeclaration.java <122:28 122:42>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> R java.util.stream.Stream<T>.collect<R, A>(java.util.stream.Collector<? super T, A, R>) [JavaParserAnonymousClassDeclaration.java <125:25 125:31>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.stream.Stream<R> java.util.stream.Stream<T>.flatMap<R>(java.util.function.Function<? super T, ? extends Stream<? extends R>>) [JavaParserAnonymousClassDeclaration.java <124:25 124:31>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.stream.Stream<java.util.Collection<E>.E> java.util.Collection<E>.stream() [JavaParserAnonymousClassDeclaration.java <123:25 123:30>]
 SYMBOL_METHOD java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces()
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.typesystem.ReferenceType> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getInterfaces() [JavaParserAnonymousClassDeclaration.java <123:9 123:21>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<10> [JavaParserAnonymousClassDeclaration.java <124:33 124:40>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<9> [JavaParserAnonymousClassDeclaration.java <124:33 124:40>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.stream.Stream<java.util.Collection<E>.E> java.util.Collection<E>.stream() [JavaParserAnonymousClassDeclaration.java <124:90 124:95>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getAllFields() [JavaParserAnonymousClassDeclaration.java <124:75 124:86>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration com.github.javaparser.symbolsolver.model.typesystem.ReferenceType.getTypeDeclaration() [JavaParserAnonymousClassDeclaration.java <124:54 124:71>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<10> [JavaParserAnonymousClassDeclaration.java <124:45 124:52>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<9> [JavaParserAnonymousClassDeclaration.java <124:45 124:52>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> static java.util.stream.Collector<T, ?, java.util.List<T>> java.util.stream.Collectors.toList<T>() [JavaParserAnonymousClassDeclaration.java <125:44 125:49>]
 QUALIFIER: java.util.stream.Collectors [JavaParserAnonymousClassDeclaration.java <125:33 125:42>]
 REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.google.common.collect.ImmutableList<com.google.common.collect.ImmutableList<E>.Builder<E>.E> com.google.common.collect.ImmutableList<E>.Builder<E>.build() [JavaParserAnonymousClassDeclaration.java <133:10 133:14>]
@@ -423,8 +423,8 @@ REFERENCE_CALL java.util.List<com.github.javaparser.symbolsolver.model.declarati
 QUALIFIER: com.google.common.collect.ImmutableList [JavaParserAnonymousClassDeclaration.java <128:9 128:21>]
 REFERENCE_TYPE_ARGUMENT java.util.List<com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields() -> com.github.javaparser.symbolsolver.model.declarations.FieldDeclaration [JavaParserAnonymousClassDeclaration.java <129:11 129:26>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<0> [JavaParserAnonymousClassDeclaration.java <130:17 130:24>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<7> [JavaParserAnonymousClassDeclaration.java <131:17 131:32>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<8> [JavaParserAnonymousClassDeclaration.java <132:17 132:31>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<6> [JavaParserAnonymousClassDeclaration.java <131:17 131:32>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getAllFields<7> [JavaParserAnonymousClassDeclaration.java <132:17 132:31>]
 SYMBOL_METHOD public java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() [JavaParserAnonymousClassDeclaration.java <136:3 <137:33 137:50> 143:3>]
 SYMBOL_METHOD java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods()
 REFERENCE_OVERRIDE java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserAnonymousClassDeclaration.getDeclaredMethods() -> java.util.Set<com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration> com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.getDeclaredMethods() [JavaParserAnonymousClassDeclaration.java <137:33 137:50>]
diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index 1611be04..7c7b6516 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -807,46 +807,46 @@
 							<File Id='JavaJavaIndexer' Name='java-indexer.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/java-indexer.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreCommandsJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreCommands' Name='org.eclipse.core.commands-3.8.1.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.commands-3.8.1.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreCommands' Name='org.eclipse.core.commands-3.9.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.commands-3.9.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreContenttypeJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreContenttype' Name='org.eclipse.core.contenttype-3.5.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.contenttype-3.5.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreContenttype' Name='org.eclipse.core.contenttype-3.6.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.contenttype-3.6.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreExpressionsJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreExpressions' Name='org.eclipse.core.expressions-3.5.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.expressions-3.5.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreExpressions' Name='org.eclipse.core.expressions-3.6.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.expressions-3.6.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreFilesystemJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreFilesystem' Name='org.eclipse.core.filesystem-1.6.1.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.filesystem-1.6.1.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreFilesystem' Name='org.eclipse.core.filesystem-1.7.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.filesystem-1.7.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreJobsJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.8.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.8.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.9.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.9.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreResourcesJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreResources' Name='org.eclipse.core.resources-3.11.1.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.resources-3.11.1.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreResources' Name='org.eclipse.core.resources-3.12.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.resources-3.12.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreRuntimeJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreRuntime' Name='org.eclipse.core.runtime-3.12.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.runtime-3.12.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreRuntime' Name='org.eclipse.core.runtime-3.13.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.runtime-3.13.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxJar' Guid='*' Win64="$(var.Win64)">
 							<File Id='OrgEclipseEquinox.app' Name='org.eclipse.equinox.app-1.3.400.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.app-1.3.400.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxCommonJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinoxCommon' Name='org.eclipse.equinox.common-3.8.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.common-3.8.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinoxCommon' Name='org.eclipse.equinox.common-3.9.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.common-3.9.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxPreferencesJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinoxPreferences' Name='org.eclipse.equinox.preferences-3.6.1.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.preferences-3.6.1.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinoxPreferences' Name='org.eclipse.equinox.preferences-3.7.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.preferences-3.7.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxRegistryJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinoxRegistry' Name='org.eclipse.equinox.registry-3.6.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.registry-3.6.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinoxRegistry' Name='org.eclipse.equinox.registry-3.7.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.registry-3.7.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseJdtCoreJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseJdtCore' Name='org.eclipse.jdt.core-3.12.3.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.jdt.core-3.12.3.jar' KeyPath='yes' />
+							<File Id='OrgEclipseJdtCore' Name='org.eclipse.jdt.core-3.13.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.jdt.core-3.13.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseOsgiJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.11.3.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.11.3.jar' KeyPath='yes' />
+							<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.12.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.12.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseTextJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseText' Name='org.eclipse.text-3.6.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.text-3.6.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseText' Name='org.eclipse.text-3.6.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.text-3.6.100.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='Slf4jApiJar' Guid='*' Win64="$(var.Win64)">
 							<File Id='Slf4jApi' Name='slf4j-api-1.7.10.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/slf4j-api-1.7.10.jar' KeyPath='yes' />
diff --git a/java_indexer/pom.xml b/java_indexer/pom.xml
index cce7cebc..1369c44d 100644
--- a/java_indexer/pom.xml
+++ b/java_indexer/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.12.3</version>
+			<version>3.13.0</version>
 		</dependency>
 		
 		<dependency>
diff --git a/src/lib_java/utility/utilityJava.cpp b/src/lib_java/utility/utilityJava.cpp
index f374320b..04629c3d 100644
--- a/src/lib_java/utility/utilityJava.cpp
+++ b/src/lib_java/utility/utilityJava.cpp
@@ -12,20 +12,20 @@ namespace utility
 
 			"gradle-tooling-api-4.2.jar",
 			"java-indexer.jar",
-			"org.eclipse.core.commands-3.8.1.jar",
-			"org.eclipse.core.contenttype-3.5.100.jar",
-			"org.eclipse.core.expressions-3.5.100.jar",
-			"org.eclipse.core.filesystem-1.6.1.jar",
-			"org.eclipse.core.jobs-3.8.0.jar",
-			"org.eclipse.core.resources-3.11.1.jar",
-			"org.eclipse.core.runtime-3.12.0.jar",
+			"org.eclipse.core.commands-3.9.0.jar",
+			"org.eclipse.core.contenttype-3.6.0.jar",
+			"org.eclipse.core.expressions-3.6.0.jar",
+			"org.eclipse.core.filesystem-1.7.0.jar",
+			"org.eclipse.core.jobs-3.9.0.jar",
+			"org.eclipse.core.resources-3.12.0.jar",
+			"org.eclipse.core.runtime-3.13.0.jar",
 			"org.eclipse.equinox.app-1.3.400.jar",
-			"org.eclipse.equinox.common-3.8.0.jar",
-			"org.eclipse.equinox.preferences-3.6.1.jar",
-			"org.eclipse.equinox.registry-3.6.100.jar",
-			"org.eclipse.jdt.core-3.12.3.jar",
-			"org.eclipse.osgi-3.11.3.jar",
-			"org.eclipse.text-3.6.0.jar",
+			"org.eclipse.equinox.common-3.9.0.jar",
+			"org.eclipse.equinox.preferences-3.7.0.jar",
+			"org.eclipse.equinox.registry-3.7.0.jar",
+			"org.eclipse.jdt.core-3.13.0.jar",
+			"org.eclipse.osgi-3.12.0.jar",
+			"org.eclipse.text-3.6.100.jar",
 			"slf4j-api-1.7.10.jar",
 			"slf4j-simple-1.7.10.jar"
 		};
diff --git a/src/test/JavaParserTestSuite.h b/src/test/JavaParserTestSuite.h
index 4cbae877..32f46d46 100644
--- a/src/test/JavaParserTestSuite.h
+++ b/src/test/JavaParserTestSuite.h
@@ -17,6 +17,16 @@ public:
 ///////////////////////////////////////////////////////////////////////////////
 // test finding symbol definitions and declarations
 
+	void test_java_parser_finds_all_jar_dependencies()
+	{
+		const std::vector<std::string> jarNames = utility::getRequiredJarNames();
+		for (const std::string& jarName : utility::getRequiredJarNames())
+		{
+			FilePath jarPath("../app/data/java/lib/" + jarName);
+			TSM_ASSERT("Jar dependency path does not exist: " + jarPath.str(), jarPath.exists());
+		}
+	}
+
 	void test_java_parser_can_setup_environment_factory()
 	{
 		std::vector<FilePath> javaPaths = utility::getJavaRuntimePathDetector()->getPaths();