diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
index 2fa86aa3c..806b08896 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
@@ -109,7 +109,7 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi
 				// Add resource listener
 				ResourcesPlugin.getWorkspace().addResourceChangeListener(fResourceListener = new ResourceListener(languageServer, Arrays.asList(
 						FileSystems.getDefault().getPathMatcher("glob:**/pom.xml"),
-						FileSystems.getDefault().getPathMatcher("glob:**/build.gradle")
+						FileSystems.getDefault().getPathMatcher("glob:**/*.gradle")
 				)));
 			}
 		}
diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
index c4e9fde1a..cef457221 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
@@ -42,6 +42,8 @@ public class GradleCore {
 	}
 	
 	static final String GRADLE_BUILD_FILE = "build.gradle";
+
+	static final String GLOB_GRADLE_FILE = "**/*.gradle";
 	
 	private static GradleCore defaultInstance = null;
 	
diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinder.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinder.java
index abdaddc94..1fc807d82 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinder.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleProjectFinder.java
@@ -11,6 +11,10 @@
 package org.springframework.ide.vscode.commons.gradle;
 
 import java.io.File;
+import java.nio.file.FileSystems;
+import java.nio.file.PathMatcher;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.ide.vscode.commons.java.IJavaProject;
@@ -25,6 +29,11 @@ import org.springframework.ide.vscode.commons.util.FileUtils;
  */
 public class GradleProjectFinder extends FileBasedJavaProjectFinder {
 	
+	private static List<PathMatcher> PATH_MATCHERS = Arrays.asList(
+			FileSystems.getDefault().getPathMatcher("glob:**/" + GradleCore.GRADLE_BUILD_FILE),
+			FileSystems.getDefault().getPathMatcher("glob:" + GradleCore.GLOB_GRADLE_FILE)
+		);
+	
 	private GradleProjectCache cache;
 	
 	public GradleProjectFinder(GradleProjectCache cache) {
@@ -34,7 +43,6 @@ public class GradleProjectFinder extends FileBasedJavaProjectFinder {
 
 	@Override
 	public Optional<IJavaProject> find(File file) {
-		File gradlebuild = FileUtils.findFile(file, GradleCore.GRADLE_BUILD_FILE);
-		return Optional.ofNullable(cache.project(gradlebuild));
+		return FileUtils.findFile(file, PATH_MATCHERS, true).map(f -> cache.project(f));
 	}
 }
diff --git a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
index 312cd0588..2068c29a1 100644
--- a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
+++ b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
@@ -19,6 +19,7 @@ import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -93,5 +94,26 @@ public class GradleProjectTest {
 		assertEquals(cachedProject, projectDeleted[0]);
 	}
 
+	@Test
+	public void findGradleProjectWithStandardBuildFile() throws Exception {
+		GradleProjectFinder finder = new GradleProjectFinder(new GradleProjectCache(new BasicFileObserver(), GradleCore.getDefault()));
+		File sourceFile = new File(GradleProjectTest.class.getResource("/test-app-1/src/main/java/Library.java").toURI());
+		Optional<IJavaProject> project = finder.find(sourceFile);
+		assertTrue(project.isPresent());
+		assertTrue(project.get() instanceof GradleJavaProject);
+		GradleJavaProject gradleProject = (GradleJavaProject) project.get();
+		assertEquals(new File(GradleProjectTest.class.getResource("/test-app-1").toURI()), gradleProject.getLocation());
+	}
 
+	@Test
+	public void findGradleProjectWithNonStandardBuildFile() throws Exception {
+		GradleProjectFinder finder = new GradleProjectFinder(new GradleProjectCache(new BasicFileObserver(), GradleCore.getDefault()));
+		File sourceFile = new File(GradleProjectTest.class.getResource("/test-app-2/src/main/java/Library.java").toURI());
+		Optional<IJavaProject> project = finder.find(sourceFile);
+		assertTrue(project.isPresent());
+		assertTrue(project.get() instanceof GradleJavaProject);
+		GradleJavaProject gradleProject = (GradleJavaProject) project.get();
+		assertEquals(new File(GradleProjectTest.class.getResource("/test-app-2").toURI()), gradleProject.getLocation());
+	}
+	
 }
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileHashes.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileHashes.bin
new file mode 100644
index 000000000..e80e08a00
Binary files /dev/null and b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileHashes.bin differ
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileSnapshots.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 000000000..15b63715c
Binary files /dev/null and b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/fileSnapshots.bin differ
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.bin b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 000000000..33f6a081c
Binary files /dev/null and b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.bin differ
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.lock b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.lock
new file mode 100644
index 000000000..ae4ecd12e
Binary files /dev/null and b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.gradle/3.3/taskArtifacts/taskArtifacts.lock differ
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.project b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.project
new file mode 100644
index 000000000..02c6ace72
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>test-app-1</name>
+	<comment>Project test-app-1 created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.settings/org.eclipse.buildship.core.prefs b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.settings/org.eclipse.buildship.core.prefs
new file mode 100644
index 000000000..af9fff3c0
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+#Wed Nov 08 18:25:52 EST 2017
+connection.project.dir=
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..49bf4f6c9
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Feb 07 11:31:46 EST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew
new file mode 100755
index 000000000..4453ccea3
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew.bat b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/project.gradle b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/project.gradle
new file mode 100644
index 000000000..fd99219f5
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/project.gradle
@@ -0,0 +1,28 @@
+/*
+ * This build file was generated by the Gradle 'init' task.
+ *
+ * This generated file contains a sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at https://docs.gradle.org/3.3/userguide/tutorial_java_projects.html
+ */
+
+// Apply the java plugin to add support for Java
+apply plugin: 'java'
+
+// In this section you declare where to find the dependencies of your project
+repositories {
+    // Use jcenter for resolving your dependencies.
+    // You can declare any Maven/Ivy/file repository here.
+    jcenter()
+}
+
+dependencies {
+    // The production code uses Guava
+    compile 'com.google.guava:guava:20.0'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '1.5.1.RELEASE'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.1.RELEASE'
+
+    // Use JUnit test framework
+    testCompile 'junit:junit:4.12'
+}
+
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/settings.gradle b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/settings.gradle
new file mode 100644
index 000000000..aa96911ff
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/settings.gradle
@@ -0,0 +1,20 @@
+/*
+ * This settings file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/3.3/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'test-app-1'
+//org.gradle.java.home = '/Library/Java/JavaVirtualMachines/jdk1.7.0_60.jdk/Contents/Home'
+
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/main/java/Library.java b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/main/java/Library.java
new file mode 100644
index 000000000..fa1b41a26
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/main/java/Library.java
@@ -0,0 +1,8 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+public class Library {
+    public boolean someLibraryMethod() {
+        return true;
+    }
+}
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/java/LibraryTest.java b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/java/LibraryTest.java
new file mode 100644
index 000000000..645740d03
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/java/LibraryTest.java
@@ -0,0 +1,12 @@
+/*
+ * This Java source file was generated by the Gradle 'init' task.
+ */
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class LibraryTest {
+    @Test public void testSomeLibraryMethod() {
+        Library classUnderTest = new Library();
+        assertTrue("someLibraryMethod should return 'true'", classUnderTest.someLibraryMethod());
+    }
+}
diff --git a/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/resources/test-resource-1.txt b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/resources/test-resource-1.txt
new file mode 100644
index 000000000..9dbfeeee5
--- /dev/null
+++ b/headless-services/commons/commons-gradle/src/test/resources/test-app-2/src/test/resources/test-resource-1.txt
@@ -0,0 +1 @@
+Some text
\ No newline at end of file
diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
index ad6314658..e0dcb11e4 100644
--- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
+++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/FileUtils.java
@@ -11,6 +11,11 @@
 package org.springframework.ide.vscode.commons.util;
 
 import java.io.File;
+import java.nio.file.PathMatcher;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 
 /**
  * Utilitity methods for working with files
@@ -42,5 +47,21 @@ public class FileUtils {
 		}
 		return null;
 	}
+	
+	public static Optional<File> findFile(File folder, List<PathMatcher> matchers, boolean recursiveUp) {
+		if (folder != null && folder.exists()) {
+			Optional<File> found = (folder.isDirectory() ? Arrays.stream(folder.listFiles()) : Stream.of(folder))
+					.map(f -> f.toPath())
+					.filter(p -> matchers.stream().filter(m -> m.matches(p)).findFirst().isPresent())
+					.findFirst()
+					.map(p -> p.toFile());
+			if (found.isPresent()) {
+				return found;
+			} else {
+				return recursiveUp ? findFile(folder.getParentFile(), matchers, recursiveUp) : found;
+			}
+		}
+		return Optional.empty();
+	}
 
 }