From 49d3e3113d50cdf56d2f97d87a23eb2d30eefe2e Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Fri, 21 Jul 2023 13:58:04 -0400
Subject: [PATCH] Move back to Linux Tools Docker nightly

The commit resolves the resolution error that was raised in
https://github.com/eclipse-linuxtools/org.eclipse.linuxtools/issues/232

I have raised an issue in PDE here:
https://github.com/eclipse-pde/eclipse.pde/issues/675
---
 releng/org.eclipse.cdt.target/cdt.target | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 1b6fa66acd7..d71ce8e7604 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -19,7 +19,7 @@
 			<unit id="org.eclipse.egit.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/linuxtools/update-docker" />
+			<repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly" />
 			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0" />
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -146,6 +146,18 @@
 					<version>5.13.0</version>
 					<type>jar</type>
 				</dependency>
+				<dependency>
+					<groupId>com.google.guava</groupId>
+					<artifactId>guava</artifactId>
+					<version>32.1.1-jre</version>
+					<type>jar</type>
+				</dependency>
+				<dependency>
+					<groupId>com.google.guava</groupId>
+					<artifactId>failureaccess</artifactId>
+					<version>1.0.1</version>
+					<type>jar</type>
+				</dependency>
 			</dependencies>
 		</location>
 		<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="ASM" missingManifest="error" type="Maven">
@@ -182,6 +194,15 @@
 				</dependency>
 			</dependencies>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly"/>
+			<!-- failureaccess is causing resolution issues when referenced from Maven directly, so rely on the already p2-ifed repo to access it.
+			     But to make sure it ends up in orbit-aggregation we need to list it in the maven dependencies too.
+
+			     See https://github.com/eclipse-pde/eclipse.pde/issues/675
+			     -->
+			<unit id="com.google.guava.failureaccess" version="0.0.0" />
+		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17" />
 	<launcherArgs>