From 21f74e705ab41ed0566b203b7c64cec8da8f87e4 Mon Sep 17 00:00:00 2001
From: Martin Lippert <lippertm@vmware.com>
Date: Fri, 29 Jul 2022 09:37:31 +0200
Subject: [PATCH] enable staging repo for early 2022-09-based builds

---
 eclipse-distribution/pom.xml                  | 19 ++++++++++++-------
 .../META-INF/MANIFEST.MF                      |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 1e8ac17a6..ae7af14b1 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -98,7 +98,7 @@
 
 		<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
 		
-		<tycho-version>2.7.3</tycho-version>
+		<tycho-version>2.7.4</tycho-version>
 		<encoding>UTF-8</encoding>
 
 		<misc.p2.repo.version>3.9.4.202003091750</misc.p2.repo.version>
@@ -527,16 +527,16 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/releases/2022-09/</url>
 				</repository> -->
-<!--				<repository>
+				<repository>
 					<id>2022-09-staging</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/staging/2022-09/</url>
-				</repository> -->
-				<repository>
+				</repository>
+<!--				<repository>
 					<id>2022-06</id>
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/releases/2022-06/</url>
-				</repository>
+				</repository> -->
 				<repository>
 					<id>2022-09-platform-i-builds</id>
 					<layout>p2</layout>
@@ -622,7 +622,12 @@
 					<layout>p2</layout>
 					<url>https://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
-
+				<repository>
+					<id>tm4e-snapshots</id>
+					<layout>p2</layout>
+					<url>https://download.eclipse.org/tm4e/snapshots/</url>
+				</repository>
+				
 				<!--				<repository>
 					<id>lsp4e</id>
 					<layout>p2</layout>
@@ -883,7 +888,7 @@
 					<version>${tycho-version}</version>
 					<configuration>
 						<resolver>p2</resolver>
-						<pomDependencies>consider</pomDependencies>
+						<pomDependencies>ignore</pomDependencies>
 						<ignoreTychoRepositories>true</ignoreTychoRepositories>
 						<!--						<dependency-resolution>
 							<optionalDependencies>ignore</optionalDependencies>
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
index a4dc86048..4a322522c 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.springframework.ide.eclipse.boot.launch,
  org.eclipse.jdt.launching,
  org.eclipse.debug.ui,
- org.mockito;bundle-version="1.9.5",
+ org.mockito,
  org.springframework.ide.eclipse.boot,
  org.eclipse.core.expressions,
  org.springframework.ide.eclipse.boot.test,
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.lang,
  javax.ws.rs;bundle-version="2.0.1",
  org.eclipse.osgi,
- org.hamcrest;bundle-version="1.1.0"
+ org.hamcrest.library
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy