From 927aba4e42b78b2de1a7fd57137fa29b6848b57e Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Mon, 1 Jul 2019 11:11:56 -0400
Subject: [PATCH 1/6] Test deploy dependencies

Change-Id: I0cc3098a5691dcf2521930b531b8f7970fdf41e5
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.build/pom.xml   | 42 ++++++++++-------
 releng/org.eclipse.remote.deploy/.project | 11 +++++
 releng/org.eclipse.remote.deploy/pom.xml  | 57 +++++++++++++++++++++++
 3 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 releng/org.eclipse.remote.deploy/.project
 create mode 100644 releng/org.eclipse.remote.deploy/pom.xml

diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index 27451688c6c..0cfb352e4c4 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -25,6 +25,7 @@
 		<tm-site>http://download.eclipse.org/tm/terminal/builds/development/nightly/</tm-site>
 		<cdt-site>http://download.eclipse.org/tools/cdt/builds/master/nightly/</cdt-site>
 		<remote-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/remote/${remote-release}</remote-install-dir>
+  		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 
 	<licenses>
@@ -76,6 +77,7 @@
 		<module>../../bundles/org.eclipse.remote.doc.isv</module>
 		<!-- Repository -->
 		<module>../../releng/org.eclipse.remote.repo</module>
+		<module>../../releng/org.eclipse.remote.deploy</module>
 	</modules>
 
 	<repositories>
@@ -101,22 +103,22 @@
 
 	<build>
 		<plugins>
-		      <plugin>
-		        <groupId>org.codehaus.mojo</groupId>
-		        <artifactId>flatten-maven-plugin</artifactId>
-		        <version>1.1.0</version>
-		        <configuration>
-		        </configuration>
-		        <executions>
-		          <execution>
-		            <id>flatten</id>
-		            <phase>process-resources</phase>
-		            <goals>
-		              <goal>flatten</goal>
-		            </goals>
-		          </execution>
-		        </executions>
-		      </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -237,6 +239,14 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<deployAtEnd>true</deployAtEnd>
+				</configuration>
+			</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/releng/org.eclipse.remote.deploy/.project b/releng/org.eclipse.remote.deploy/.project
new file mode 100644
index 00000000000..9f9927e0873
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.remote.deploy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
new file mode 100644
index 00000000000..def564e6c0e
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.remote</groupId>
+		<artifactId>remote-parent</artifactId>
+		<version>3.0.1-SNAPSHOT</version>
+		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.eclipse.remote</groupId>
+	<artifactId>remote-core</artifactId>
+	<version>3.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<properties>
+  		<maven.deploy.skip>false</maven.deploy.skip>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.remote.core</artifactId>
+			<version>4.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.remote.jsch.core</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <!-- configure the plugin here -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+		</plugins>
+	</build>
+</project>

From 34569c7f244c2bb9244b2bd05ec7e465e3b83ad4 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Mon, 1 Jul 2019 11:14:37 -0400
Subject: [PATCH 2/6] Test deploy

Change-Id: Ic1f6d59a8693535c18c2a7001638861f82e01fdf
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.build/pom.xml   | 42 ++++++++++-------
 releng/org.eclipse.remote.deploy/.project | 11 +++++
 releng/org.eclipse.remote.deploy/pom.xml  | 57 +++++++++++++++++++++++
 3 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 releng/org.eclipse.remote.deploy/.project
 create mode 100644 releng/org.eclipse.remote.deploy/pom.xml

diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index 27451688c6c..0cfb352e4c4 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -25,6 +25,7 @@
 		<tm-site>http://download.eclipse.org/tm/terminal/builds/development/nightly/</tm-site>
 		<cdt-site>http://download.eclipse.org/tools/cdt/builds/master/nightly/</cdt-site>
 		<remote-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/remote/${remote-release}</remote-install-dir>
+  		<maven.deploy.skip>true</maven.deploy.skip>
 	</properties>
 
 	<licenses>
@@ -76,6 +77,7 @@
 		<module>../../bundles/org.eclipse.remote.doc.isv</module>
 		<!-- Repository -->
 		<module>../../releng/org.eclipse.remote.repo</module>
+		<module>../../releng/org.eclipse.remote.deploy</module>
 	</modules>
 
 	<repositories>
@@ -101,22 +103,22 @@
 
 	<build>
 		<plugins>
-		      <plugin>
-		        <groupId>org.codehaus.mojo</groupId>
-		        <artifactId>flatten-maven-plugin</artifactId>
-		        <version>1.1.0</version>
-		        <configuration>
-		        </configuration>
-		        <executions>
-		          <execution>
-		            <id>flatten</id>
-		            <phase>process-resources</phase>
-		            <goals>
-		              <goal>flatten</goal>
-		            </goals>
-		          </execution>
-		        </executions>
-		      </plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
@@ -237,6 +239,14 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+				<configuration>
+					<deployAtEnd>true</deployAtEnd>
+				</configuration>
+			</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/releng/org.eclipse.remote.deploy/.project b/releng/org.eclipse.remote.deploy/.project
new file mode 100644
index 00000000000..9f9927e0873
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.remote.deploy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
new file mode 100644
index 00000000000..def564e6c0e
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.remote</groupId>
+		<artifactId>remote-parent</artifactId>
+		<version>3.0.1-SNAPSHOT</version>
+		<relativePath>../org.eclipse.remote.build/pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.eclipse.remote</groupId>
+	<artifactId>remote-core</artifactId>
+	<version>3.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	
+	<properties>
+  		<maven.deploy.skip>false</maven.deploy.skip>
+	</properties>
+	
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.remote.core</artifactId>
+			<version>4.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.remote.jsch.core</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.1.1</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <!-- configure the plugin here -->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+		</plugins>
+	</build>
+</project>

From b2ed22cc17b0946df3e9f019ed3023a087028932 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Mon, 1 Jul 2019 15:18:59 -0400
Subject: [PATCH 3/6] Try to deploy dependencies.

Change-Id: Ic57da40bd49fa78d54cadf2b77cb058e68c3d7bb
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.deploy/assembly.xml | 26 ++++++++
 releng/org.eclipse.remote.deploy/pom.xml      | 62 ++++++++++++-------
 2 files changed, 67 insertions(+), 21 deletions(-)
 create mode 100644 releng/org.eclipse.remote.deploy/assembly.xml

diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
new file mode 100644
index 00000000000..a6cdb50b844
--- /dev/null
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -0,0 +1,26 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+
+	<id>assemble</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+	<dependencySets>
+		<dependencySet>
+			<useProjectArtifact>false</useProjectArtifact>
+			<useTransitiveDependencies>false</useTransitiveDependencies>
+			<unpack>false</unpack>
+		</dependencySet>
+	</dependencySets>
+
+	<fileSets>
+		<fileSet>
+			<directory>${project.build.directory}/dependency</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+	</fileSets>
+
+</assembly>
\ No newline at end of file
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index def564e6c0e..bb53ca01e6b 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -15,11 +16,11 @@
 	<artifactId>remote-core</artifactId>
 	<version>3.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
+
 	<properties>
-  		<maven.deploy.skip>false</maven.deploy.skip>
+		<maven.deploy.skip>false</maven.deploy.skip>
 	</properties>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -35,23 +36,42 @@
 
 	<build>
 		<plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <!-- configure the plugin here -->
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+			<!-- Generate the dependencies and copy to the dependency directory in the plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- Create the assembly -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<descriptors>
+						<descriptor>assembly.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>

From 3275fce38bf139fc751d238663dae999c635f61d Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Mon, 1 Jul 2019 18:56:41 -0400
Subject: [PATCH 4/6] Try jar format.

Change-Id: I6bf7e0ca0af14ab65cc73d5c3a54a5c8e403b805
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.deploy/assembly.xml | 4 ++--
 releng/org.eclipse.remote.deploy/pom.xml      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
index a6cdb50b844..ab46f1bf765 100644
--- a/releng/org.eclipse.remote.deploy/assembly.xml
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -4,7 +4,7 @@
 
 	<id>assemble</id>
 	<formats>
-		<format>zip</format>
+		<format>jar</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
@@ -12,7 +12,7 @@
 		<dependencySet>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useTransitiveDependencies>false</useTransitiveDependencies>
-			<unpack>false</unpack>
+			<unpack>true</unpack>
 		</dependencySet>
 	</dependencySets>
 
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index bb53ca01e6b..ba83ff3519f 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -43,12 +43,13 @@
 				<version>3.1.1</version>
 				<executions>
 					<execution>
-						<id>copy-dependencies</id>
+						<id>dependencies</id>
 						<phase>package</phase>
 						<goals>
-							<goal>copy-dependencies</goal>
+							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
+							<useRepositoryLayout>true</useRepositoryLayout>
 						</configuration>
 					</execution>
 				</executions>

From 9565430a5bae137b8b532e47c286208f82e4a20e Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 3 Jul 2019 19:25:56 -0400
Subject: [PATCH 5/6] Build uber jar.

Change-Id: Ia200cc07f4c73b288d1c6626de89216d269dc1f1
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.deploy/assembly.xml | 22 ++++++-------------
 releng/org.eclipse.remote.deploy/pom.xml      |  5 ++++-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/releng/org.eclipse.remote.deploy/assembly.xml b/releng/org.eclipse.remote.deploy/assembly.xml
index ab46f1bf765..08df261b713 100644
--- a/releng/org.eclipse.remote.deploy/assembly.xml
+++ b/releng/org.eclipse.remote.deploy/assembly.xml
@@ -8,19 +8,11 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
-	<dependencySets>
-		<dependencySet>
-			<useProjectArtifact>false</useProjectArtifact>
-			<useTransitiveDependencies>false</useTransitiveDependencies>
-			<unpack>true</unpack>
-		</dependencySet>
-	</dependencySets>
-
-	<fileSets>
-		<fileSet>
-			<directory>${project.build.directory}/dependency</directory>
-			<outputDirectory>/</outputDirectory>
-		</fileSet>
-	</fileSets>
-
+    <fileSets>
+      <fileSet>
+        <directory>${project.build.directory}/dependency/</directory>
+        <outputDirectory>/</outputDirectory>
+        <useDefaultExcludes>true</useDefaultExcludes>
+      </fileSet>
+    </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/releng/org.eclipse.remote.deploy/pom.xml b/releng/org.eclipse.remote.deploy/pom.xml
index ba83ff3519f..07b046c24e6 100644
--- a/releng/org.eclipse.remote.deploy/pom.xml
+++ b/releng/org.eclipse.remote.deploy/pom.xml
@@ -49,7 +49,9 @@
 							<goal>unpack-dependencies</goal>
 						</goals>
 						<configuration>
-							<useRepositoryLayout>true</useRepositoryLayout>
+							<outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
 						</configuration>
 					</execution>
 				</executions>
@@ -63,6 +65,7 @@
 					<descriptors>
 						<descriptor>assembly.xml</descriptor>
 					</descriptors>
+					<appendAssemblyId>false</appendAssemblyId>
 				</configuration>
 				<executions>
 					<execution>

From 7063b3e0097ddfad68df55f7c653024d64216ef8 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Tue, 3 Sep 2019 10:27:05 -0400
Subject: [PATCH 6/6] Update target for 2019-09

Change-Id: If51d6e314f1cba1b8350123c91fa7e4d5bd38d3e
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 releng/org.eclipse.remote.target/photon.target | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/releng/org.eclipse.remote.target/photon.target b/releng/org.eclipse.remote.target/photon.target
index 2a27e59a10b..cdb3058503a 100644
--- a/releng/org.eclipse.remote.target/photon.target
+++ b/releng/org.eclipse.remote.target/photon.target
@@ -13,17 +13,17 @@
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.12/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.13milestones/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.core" version="0.0.0"/>
 <unit id="org.eclipse.cdt.native.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.native.serial" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/cdt/builds/master/nightly/"/>
+<repository location="https://download.eclipse.org/tools/cdt/builds/9.9/cdt-9.9.0-simrel-2019-09-m3"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tm/terminal/builds/development/nightly/"/>
+<repository location="https://download.eclipse.org/tm/updates/4.5.102-SNAPSHOT/repository/"/>
 </location>
 </locations>
 </target>