diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/IndexRoutines.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/IndexRoutines.java
index fe0a8bce4..59a49a192 100644
--- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/IndexRoutines.java
+++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/jandex/IndexRoutines.java
@@ -163,7 +163,7 @@ public class IndexRoutines {
 
 	private static IndexView indexFolder(File folder) {
 		Indexer indexer = new Indexer();
-		for (Iterator<File> itr = com.google.common.io.Files.fileTreeTraverser().breadthFirstTraversal(folder)
+		for (Iterator<File> itr = com.google.common.io.Files.fileTraverser().breadthFirst(folder)
 				.iterator(); itr.hasNext();) {
 			File file = itr.next();
 			if (file.isFile() && file.getName().endsWith(".class")) {
diff --git a/headless-services/commons/commons-maven/pom.xml b/headless-services/commons/commons-maven/pom.xml
index c476a0a3f..a3c05ab85 100644
--- a/headless-services/commons/commons-maven/pom.xml
+++ b/headless-services/commons/commons-maven/pom.xml
@@ -42,6 +42,11 @@
 			<version>${maven-wagon.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-compat</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.maven.wagon</groupId>
 			<artifactId>wagon-file</artifactId>
@@ -52,6 +57,11 @@
 			<artifactId>wagon-provider-api</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.eclipse.sisu</groupId>
+			<artifactId>org.eclipse.sisu.inject</artifactId>
+		</dependency>
+
 		<!-- Java Model -->
 		<dependency>
 			<groupId>org.springframework.ide.vscode</groupId>
diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 4786cb84f..9aee4bb5c 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -95,7 +95,7 @@
 		<junit-version>4.13.1</junit-version>
 		<assertj-version>3.5.2</assertj-version>
 		<slf4j-version>1.7.25</slf4j-version>
-		<guava-version>19.0</guava-version>
+		<guava-version>31.1-jre</guava-version>
 		<mockito-version>1.10.19</mockito-version>
 		<jackson-2-version>2.5.0</jackson-2-version>
 		<jersey-2-version>2.10</jersey-2-version>