diff --git a/deployment/windows/wixSetup/installDir.wxs b/deployment/windows/wixSetup/installDir.wxs
index a3839656..b6779946 100644
--- a/deployment/windows/wixSetup/installDir.wxs
+++ b/deployment/windows/wixSetup/installDir.wxs
@@ -1267,7 +1267,7 @@
 							<File Id='OrgEclipseCoreCommands' Name='org.eclipse.core.commands-3.9.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.commands-3.9.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreContenttypeJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreContenttype' Name='org.eclipse.core.contenttype-3.7.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.contenttype-3.7.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreContenttype' Name='org.eclipse.core.contenttype-3.7.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.contenttype-3.7.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreExpressionsJar' Guid='*' Win64="$(var.Win64)">
 							<File Id='OrgEclipseCoreExpressions' Name='org.eclipse.core.expressions-3.6.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.expressions-3.6.200.jar' KeyPath='yes' />
@@ -1276,34 +1276,34 @@
 							<File Id='OrgEclipseCoreFilesystem' Name='org.eclipse.core.filesystem-1.7.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.filesystem-1.7.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreJobsJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.10.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.10.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreJobs' Name='org.eclipse.core.jobs-3.10.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.jobs-3.10.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreResourcesJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreResources' Name='org.eclipse.core.resources-3.13.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.resources-3.13.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreResources' Name='org.eclipse.core.resources-3.13.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.resources-3.13.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseCoreRuntimeJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseCoreRuntime' Name='org.eclipse.core.runtime-3.15.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.runtime-3.15.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseCoreRuntime' Name='org.eclipse.core.runtime-3.15.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.core.runtime-3.15.100.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinox.app' Name='org.eclipse.equinox.app-1.3.600.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.app-1.3.600.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinox.app' Name='org.eclipse.equinox.app-1.4.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.app-1.4.0.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxCommonJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinoxCommon' Name='org.eclipse.equinox.common-3.10.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.common-3.10.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinoxCommon' Name='org.eclipse.equinox.common-3.10.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.common-3.10.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxPreferencesJar' Guid='*' Win64="$(var.Win64)">
 							<File Id='OrgEclipseEquinoxPreferences' Name='org.eclipse.equinox.preferences-3.7.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.preferences-3.7.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseEquinoxRegistryJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseEquinoxRegistry' Name='org.eclipse.equinox.registry-3.8.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.registry-3.8.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseEquinoxRegistry' Name='org.eclipse.equinox.registry-3.8.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.equinox.registry-3.8.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseJdtCoreJar' Guid='*' Win64="$(var.Win64)">
 							<File Id='OrgEclipseJdtCore' Name='org.eclipse.jdt.core-3.13.102.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.jdt.core-3.13.102.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseOsgiJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.13.100.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.13.100.jar' KeyPath='yes' />
+							<File Id='OrgEclipseOsgi' Name='org.eclipse.osgi-3.13.200.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.osgi-3.13.200.jar' KeyPath='yes' />
 						</Component>
 						<Component Id='JavaOrgEclipseTextJar' Guid='*' Win64="$(var.Win64)">
-							<File Id='OrgEclipseText' Name='org.eclipse.text-3.7.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.text-3.7.0.jar' KeyPath='yes' />
+							<File Id='OrgEclipseText' Name='org.eclipse.text-3.8.0.jar' DiskId='1' Source='./../../../bin/app/data/java/lib/org.eclipse.text-3.8.0.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/lib/gradle-api-4.0.1.jar b/java_indexer/lib/gradle-api-4.0.1.jar
deleted file mode 100644
index aef7a9cc..00000000
Binary files a/java_indexer/lib/gradle-api-4.0.1.jar and /dev/null differ
diff --git a/java_indexer/lib/gradle-tooling-api-4.2.jar b/java_indexer/lib/gradle-tooling-api-4.2.jar
new file mode 100644
index 00000000..29f98473
Binary files /dev/null and b/java_indexer/lib/gradle-tooling-api-4.2.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.commands-3.9.200.jar b/java_indexer/lib/org.eclipse.core.commands-3.9.200.jar
new file mode 100644
index 00000000..b042ee63
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.commands-3.9.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.contenttype-3.7.200.jar b/java_indexer/lib/org.eclipse.core.contenttype-3.7.200.jar
new file mode 100644
index 00000000..809949df
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.contenttype-3.7.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.expressions-3.6.200.jar b/java_indexer/lib/org.eclipse.core.expressions-3.6.200.jar
new file mode 100644
index 00000000..b958d206
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.expressions-3.6.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.filesystem-1.7.200.jar b/java_indexer/lib/org.eclipse.core.filesystem-1.7.200.jar
new file mode 100644
index 00000000..2de8865d
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.filesystem-1.7.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.jobs-3.10.200.jar b/java_indexer/lib/org.eclipse.core.jobs-3.10.200.jar
new file mode 100644
index 00000000..d0e2294e
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.jobs-3.10.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.resources-3.13.200.jar b/java_indexer/lib/org.eclipse.core.resources-3.13.200.jar
new file mode 100644
index 00000000..b55e7c0e
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.resources-3.13.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.core.runtime-3.15.100.jar b/java_indexer/lib/org.eclipse.core.runtime-3.15.100.jar
new file mode 100644
index 00000000..5ce8bf72
Binary files /dev/null and b/java_indexer/lib/org.eclipse.core.runtime-3.15.100.jar differ
diff --git a/java_indexer/lib/org.eclipse.equinox.app-1.4.0.jar b/java_indexer/lib/org.eclipse.equinox.app-1.4.0.jar
new file mode 100644
index 00000000..6c66526c
Binary files /dev/null and b/java_indexer/lib/org.eclipse.equinox.app-1.4.0.jar differ
diff --git a/java_indexer/lib/org.eclipse.equinox.common-3.10.200.jar b/java_indexer/lib/org.eclipse.equinox.common-3.10.200.jar
new file mode 100644
index 00000000..fd7334f6
Binary files /dev/null and b/java_indexer/lib/org.eclipse.equinox.common-3.10.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.equinox.preferences-3.7.200.jar b/java_indexer/lib/org.eclipse.equinox.preferences-3.7.200.jar
new file mode 100644
index 00000000..817b354d
Binary files /dev/null and b/java_indexer/lib/org.eclipse.equinox.preferences-3.7.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.equinox.registry-3.8.200.jar b/java_indexer/lib/org.eclipse.equinox.registry-3.8.200.jar
new file mode 100644
index 00000000..767d62bd
Binary files /dev/null and b/java_indexer/lib/org.eclipse.equinox.registry-3.8.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.jdt.core-3.13.102.jar b/java_indexer/lib/org.eclipse.jdt.core-3.13.102.jar
new file mode 100644
index 00000000..0f4df749
Binary files /dev/null and b/java_indexer/lib/org.eclipse.jdt.core-3.13.102.jar differ
diff --git a/java_indexer/lib/org.eclipse.osgi-3.13.200.jar b/java_indexer/lib/org.eclipse.osgi-3.13.200.jar
new file mode 100644
index 00000000..7faef12c
Binary files /dev/null and b/java_indexer/lib/org.eclipse.osgi-3.13.200.jar differ
diff --git a/java_indexer/lib/org.eclipse.text-3.8.0.jar b/java_indexer/lib/org.eclipse.text-3.8.0.jar
new file mode 100644
index 00000000..e772599d
Binary files /dev/null and b/java_indexer/lib/org.eclipse.text-3.8.0.jar differ
diff --git a/java_indexer/lib/slf4j-api-1.7.10.jar b/java_indexer/lib/slf4j-api-1.7.10.jar
new file mode 100644
index 00000000..744e9ec5
Binary files /dev/null and b/java_indexer/lib/slf4j-api-1.7.10.jar differ
diff --git a/java_indexer/lib/slf4j-simple-1.7.10.jar b/java_indexer/lib/slf4j-simple-1.7.10.jar
new file mode 100644
index 00000000..b40be298
Binary files /dev/null and b/java_indexer/lib/slf4j-simple-1.7.10.jar differ
diff --git a/java_indexer/pom.xml b/java_indexer/pom.xml
index f543985b..f109515f 100644
--- a/java_indexer/pom.xml
+++ b/java_indexer/pom.xml
@@ -38,23 +38,124 @@
 	</repositories>
 	
 	<dependencies>
-		<dependency>
-			<groupId>org.eclipse.jdt</groupId>
-			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.13.102</version>
-		</dependency>
-		
 		<dependency>
 			<groupId>org.gradle</groupId>
 			<artifactId>gradle-tooling-api</artifactId>
 			<version>4.2</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/gradle-tooling-api-4.2.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.commands</artifactId>
+			<version>3.9.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.commands-3.9.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.contenttype</artifactId>
+			<version>3.7.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.contenttype-3.7.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.expressions</artifactId>
+			<version>3.6.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.expressions-3.6.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.filesystem</artifactId>
+			<version>1.7.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.filesystem-1.7.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.jobs</artifactId>
+			<version>3.10.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.jobs-3.10.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.resources</artifactId>
+			<version>3.13.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.resources-3.13.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.core</groupId>
+			<artifactId>org.eclipse.core.runtime</artifactId>
+			<version>3.15.100</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.core.runtime-3.15.100.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.app</artifactId>
+			<version>1.4.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.app-1.4.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.common</artifactId>
+			<version>3.10.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.common-3.10.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.preferences</artifactId>
+			<version>3.7.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.preferences-3.7.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.equinox</groupId>
+			<artifactId>org.eclipse.equinox.registry</artifactId>
+			<version>3.8.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.registry-3.8.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jdt</groupId>
+			<artifactId>org.eclipse.jdt.core</artifactId>
+			<version>3.13.102</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.jdt.core-3.13.102.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>3.13.200</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.osgi-3.13.200.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse</groupId>
+			<artifactId>org.eclipse.text</artifactId>
+			<version>3.8.0</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/org.eclipse.text-3.8.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.10</version>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/slf4j-api-1.7.10.jar</systemPath>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>1.7.10</version>
-			<scope>test</scope>
+			<scope>system</scope>
+			<systemPath>${basedir}/lib/slf4j-simple-1.7.10.jar</systemPath>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/script/update_java_indexer.sh b/script/update_java_indexer.sh
index f1e01c12..18e302f6 100755
--- a/script/update_java_indexer.sh
+++ b/script/update_java_indexer.sh
@@ -30,7 +30,7 @@ cd $ROOT_DIR/
 cd java_indexer
 
 echo "cleaning and building java_indexer.jar"
-mvn clean package dependency:copy-dependencies
+mvn clean package
 
 cd ../
 
@@ -38,4 +38,4 @@ echo -e $INFO "copy jars"
 mkdir -p bin/app/data/java/lib/
 rm -rf bin/app/data/java/lib/*
 cp -r java_indexer/target/java-indexer-1.0.jar bin/app/data/java/lib/java-indexer.jar
-cp -r java_indexer/target/dependency/*.jar bin/app/data/java/lib
+cp -r java_indexer/lib/*.jar bin/app/data/java/lib
diff --git a/src/lib_java/utility/utilityJava.cpp b/src/lib_java/utility/utilityJava.cpp
index e895d079..f7491fcb 100644
--- a/src/lib_java/utility/utilityJava.cpp
+++ b/src/lib_java/utility/utilityJava.cpp
@@ -21,19 +21,19 @@ namespace utility
 			L"gradle-tooling-api-4.2.jar",
 			L"java-indexer.jar",
 			L"org.eclipse.core.commands-3.9.200.jar",
-			L"org.eclipse.core.contenttype-3.7.100.jar",
+			L"org.eclipse.core.contenttype-3.7.200.jar",
 			L"org.eclipse.core.expressions-3.6.200.jar",
 			L"org.eclipse.core.filesystem-1.7.200.jar",
-			L"org.eclipse.core.jobs-3.10.100.jar",
-			L"org.eclipse.core.resources-3.13.100.jar",
-			L"org.eclipse.core.runtime-3.15.0.jar",
-			L"org.eclipse.equinox.app-1.3.600.jar",
-			L"org.eclipse.equinox.common-3.10.100.jar",
+			L"org.eclipse.core.jobs-3.10.200.jar",
+			L"org.eclipse.core.resources-3.13.200.jar",
+			L"org.eclipse.core.runtime-3.15.100.jar",
+			L"org.eclipse.equinox.app-1.4.0.jar",
+			L"org.eclipse.equinox.common-3.10.200.jar",
 			L"org.eclipse.equinox.preferences-3.7.200.jar",
-			L"org.eclipse.equinox.registry-3.8.100.jar",
+			L"org.eclipse.equinox.registry-3.8.200.jar",
 			L"org.eclipse.jdt.core-3.13.102.jar",
-			L"org.eclipse.osgi-3.13.100.jar",
-			L"org.eclipse.text-3.7.0.jar",
+			L"org.eclipse.osgi-3.13.200.jar",
+			L"org.eclipse.text-3.8.0.jar",
 			L"slf4j-api-1.7.10.jar",
 			L"slf4j-simple-1.7.10.jar"
 		};