Merge "Update target for 2019-09"

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>
+			<plugin>
-		        <groupId>org.codehaus.mojo</groupId>
+				<groupId>org.codehaus.mojo</groupId>
-		        <artifactId>flatten-maven-plugin</artifactId>
+				<artifactId>flatten-maven-plugin</artifactId>
-		        <version>1.1.0</version>
+				<version>1.1.0</version>
-		        <configuration>
+				<configuration>
-		        </configuration>
+				</configuration>
-		        <executions>
+				<executions>
-		          <execution>
+					<execution>
-		            <id>flatten</id>
+						<id>flatten</id>
-		            <phase>process-resources</phase>
+						<phase>process-resources</phase>
-		            <goals>
+						<goals>
-		              <goal>flatten</goal>
+							<goal>flatten</goal>
-		            </goals>
+						</goals>
-		          </execution>
+					</execution>
-		        </executions>
+				</executions>
-		      </plugin>
+			</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>

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>

releng/org.eclipse.remote.deploy/assembly.xml

@@ -0,0 +1,18 @@
+<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>jar</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+      <fileSet>
+        <directory>${project.build.directory}/dependency/</directory>
+        <outputDirectory>/</outputDirectory>
+        <useDefaultExcludes>true</useDefaultExcludes>
+      </fileSet>
+    </fileSets>
+</assembly>

releng/org.eclipse.remote.deploy/pom.xml

@@ -0,0 +1,81 @@
+<?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>
+			<!-- 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>dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>unpack-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+						</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>
+					<appendAssemblyId>false</appendAssemblyId>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

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>