diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index a9df100b2..33533f59b 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -1137,17 +1137,17 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/staging/2022-06/</url>
 				</repository>
-
+<!--
 				<repository>
 					<id>platform-i-build</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/eclipse/updates/4.24-I-builds/</url>
 				</repository>
-
+-->
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/S20220517184036/repository</url>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository</url>
 				</repository>
 				<repository>
 					<id>m2e</id>
diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
index 3c20da63e..7bc082e4d 100644
--- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.test.util/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.springsource.ide.eclipse.commons.tests.util,
  org.eclipse.core.runtime,
  org.eclipse.swt,
  org.eclipse.ui,
- org.apache.log4j,
  org.junit
 Export-Package: org.springsource.ide.eclipse.commons.frameworks.test.util
+Import-Package: org.apache.log4j;resolution:=optional,
+ org.slf4j;resolution:=optional
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 e10aef5a1..985cc2feb 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
@@ -17,4 +17,5 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.springsource.ide.eclipse.commons.tests.util,
  org.springsource.ide.eclipse.commons.tests.util.swtbot
-Import-Package: org.apache.log4j
+Import-Package: org.apache.log4j;resolution:=optional,
+ org.slf4j;resolution:=optional
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index ca37ee087..5dd22ea5a 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -483,7 +483,7 @@
 				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/tools/orbit/downloads/drops/S20220403232146/repository</url>
+					<url>https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository</url>
 				</repository>
 				<repository>
 					<id>mylyn-markdown</id>