diff --git a/atom-extensions/atom-manifest-yaml/README.MD b/atom-extensions/atom-manifest-yaml/README.MD
index 20c4bf2dd..dc75d0ee3 100644
--- a/atom-extensions/atom-manifest-yaml/README.MD
+++ b/atom-extensions/atom-manifest-yaml/README.MD
@@ -1,4 +1,4 @@
-#CF Manifest YAML for Atom
+# CF Manifest YAML for Atom
 
 ## Dev environment setup:
 **Prerequisite**: Node 6.x.x or higher is installed, Atom 1.17 or higher is installed
@@ -7,4 +7,4 @@
 3. Run `npm install`
 4. Execute `apm link .` from the folder above
 5. Perform `Reload Window` in Atom (Cmd-Shift-P opens commands palette, search for `reaload`, select, press `Return`)
-6. Open any `manifest.yml` file in Atom observe reconciling, content assist and other IDE features
\ No newline at end of file
+6. Open any `manifest.yml` file in Atom observe reconciling, content assist and other IDE features
diff --git a/headless-services/commons/commons-java/pom.xml b/headless-services/commons/commons-java/pom.xml
index 3079ee659..530f4eedb 100644
--- a/headless-services/commons/commons-java/pom.xml
+++ b/headless-services/commons/commons-java/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.github.javaparser</groupId>
 			<artifactId>javaparser-core</artifactId>
-			<version>2.5.1</version>
+			<version>3.2.12</version>
 		</dependency>
 		<!-- Reactor -->
 		<dependency>
diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
index fa43588b3..a37a96c5b 100644
--- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
+++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/CompilationUnitIndex.java
@@ -10,14 +10,12 @@
  *******************************************************************************/
 package org.springframework.ide.vscode.commons.java.parser;
 
-import java.io.InputStream;
 import java.net.URL;
 import java.util.concurrent.ExecutionException;
 
 import org.springframework.ide.vscode.commons.util.Log;
 
 import com.github.javaparser.JavaParser;
-import com.github.javaparser.ParseException;
 import com.github.javaparser.ast.CompilationUnit;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -31,14 +29,7 @@ public interface CompilationUnitIndex {
 
 			@Override
 			public CompilationUnit load(URL url) throws Exception {
-				InputStream in = url.openStream();
-				try {
-					return JavaParser.parse(in);
-				} catch (ParseException e) {
-					in.close();
-					Log.log("Failed to parse java source file: " + url, e);
-				}
-				return null;
+				return JavaParser.parse(url.openStream());
 			}
 			
 		});
diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
index aa6b4f00a..ae6de6c70 100644
--- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
+++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/java/parser/ParserJavadocProvider.java
@@ -43,10 +43,10 @@ public class ParserJavadocProvider implements IJavadocProvider {
 	public IJavadoc getJavadoc(IType type) {
 		if (type.isEnum()) {
 			EnumDeclaration declaration = getEnumDeclaration(type);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		} else {
 			ClassOrInterfaceDeclaration declaration = getClassOrInterfaceDeclaration(type);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		}
 	}
 	
@@ -54,10 +54,10 @@ public class ParserJavadocProvider implements IJavadocProvider {
 		IType declaringType = field.getDeclaringType();
 		if (declaringType.isEnum()) {
 			EnumConstantDeclaration declaration = createVisitorToFindEnumConstant(field).visit(getEnumDeclaration(declaringType), null);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		} else {
 			FieldDeclaration declaration = createVisitorToFindField(field).visit(getClassOrInterfaceDeclaration(declaringType), null);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		}
 	}
 	
@@ -68,10 +68,10 @@ public class ParserJavadocProvider implements IJavadocProvider {
 		IType declaringType = method.getDeclaringType();
 		if (declaringType.isEnum()) {
 			MethodDeclaration declaration = createVisitorToFindMethod(method).visit(getEnumDeclaration(declaringType), null);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		} else {
 			MethodDeclaration declaration = createVisitorToFindMethod(method).visit(getClassOrInterfaceDeclaration(declaringType), null);
-			return declaration.getJavaDoc() == null ? null : new RawJavadoc(declaration.getJavaDoc().toString());
+			return declaration.getJavadoc() == null ? null : new RawJavadoc(declaration.getJavadocComment().get().toString());
 		}
 	}
 	
@@ -126,7 +126,7 @@ public class ParserJavadocProvider implements IJavadocProvider {
 
 			@Override
 			public ClassOrInterfaceDeclaration visit(ClassOrInterfaceDeclaration n, Object arg) {
-				if (n.getName().equals(type.getElementName())) {
+				if (n.getName().toString().equals(type.getElementName())) {
 					return n;
 				} else {
 					return super.visit(n, arg);
@@ -141,7 +141,7 @@ public class ParserJavadocProvider implements IJavadocProvider {
 
 			@Override
 			public EnumDeclaration visit(EnumDeclaration n, Object arg) {
-				if (n.getName().equals(type.getElementName())) {
+				if (n.getName().toString().equals(type.getElementName())) {
 					return n;
 				} else {
 					return super.visit(n, arg);
@@ -155,7 +155,7 @@ public class ParserJavadocProvider implements IJavadocProvider {
 		return new GenericVisitorAdapter<MethodDeclaration, Object>() {
 			@Override
 			public MethodDeclaration visit(MethodDeclaration n, Object arg) {
-				if (n.getParameters().isEmpty() && n.getName().equals(method.getElementName())) {
+				if (n.getParameters().isEmpty() && n.getName().toString().equals(method.getElementName())) {
 					return n;
 				}
 				return null;
@@ -167,7 +167,7 @@ public class ParserJavadocProvider implements IJavadocProvider {
 		return new GenericVisitorAdapter<FieldDeclaration, Object>() {
 			@Override
 			public FieldDeclaration visit(FieldDeclaration n, Object arg) {
-				Optional<VariableDeclarator> variable = n.getVariables().stream().filter(v -> v.getId().getName().equals(field.getElementName())).findFirst();
+				Optional<VariableDeclarator> variable = n.getVariables().stream().filter(v -> v.getName().toString().equals(field.getElementName())).findFirst();
 				return variable.isPresent() ? n : null;
 			}
 		};
@@ -177,7 +177,7 @@ public class ParserJavadocProvider implements IJavadocProvider {
 		return new GenericVisitorAdapter<EnumConstantDeclaration, Object>() {
 			@Override
 			public EnumConstantDeclaration visit(EnumConstantDeclaration n, Object arg) {
-				if (n.getName().equals(field.getElementName())) {
+				if (n.getName().toString().equals(field.getElementName())) {
 					return n;
 				} else {
 					return null;