diff --git a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml
index e9f36ff3b..d5193c170 100644
--- a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml
+++ b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml
@@ -6,7 +6,6 @@ concurrency:
 
 on:
   workflow_dispatch:
-on:
   push:
     branches:
       - 'main'
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
index ed76b1bde..b6986a398 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.tests.util/META-INF/MANIFEST.MF
@@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.springsource.ide.eclipse.commons.core,
  org.springsource.ide.eclipse.commons.frameworks.core
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.springsource.ide.eclipse.commons.tests.util,
- org.springsource.ide.eclipse.commons.tests.util.swtbot
+Export-Package: org.springsource.ide.eclipse.commons.tests.util
 Import-Package: org.apache.log4j;resolution:=optional,
  org.slf4j;resolution:=optional
 Automatic-Module-Name: org.springsource.ide.eclipse.commons.tests.util
diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
index d31644b77..905f2fc2f 100644
--- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
+++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/utils/SpringIndexerJava.java
@@ -642,6 +642,13 @@ public class SpringIndexerJava implements SpringIndexer {
 			}
 		});
 		
+		
+		reconcile(context);
+		
+		dependencyTracker.update(context.getFile(), context.getDependencies());;
+	}
+	
+	private void reconcile(SpringIndexerJavaContext context) {
 		// reconciling
 		IProblemCollector problemCollector = new IProblemCollector() {
 			
@@ -678,8 +685,6 @@ public class SpringIndexerJava implements SpringIndexer {
 				context.getNextPassFiles().add(context.getFile());
 			}
 		}
-		
-		dependencyTracker.update(context.getFile(), context.getDependencies());;
 	}
 
 	private void extractSymbolInformation(TypeDeclaration typeDeclaration, final SpringIndexerJavaContext context) throws Exception {