From d77fa7f2b87113ee2bdb1c1d62b74c66bf0adff7 Mon Sep 17 00:00:00 2001
From: Greg Watson <g.watson@computer.org>
Date: Wed, 10 Dec 2014 19:01:53 -0500
Subject: [PATCH] Merge with master

Change-Id: I83939d136c0419f68601ddde8eae24e547869205
Signed-off-by: Greg Watson <g.watson@computer.org>
---
 features/org.eclipse.remote-feature/pom.xml | 32 +++++++++++++++++++++
 releng/org.eclipse.remote.build/pom.xml     | 17 +++++++++++
 releng/org.eclipse.remote.repo/category.xml |  1 +
 3 files changed, 50 insertions(+)

diff --git a/features/org.eclipse.remote-feature/pom.xml b/features/org.eclipse.remote-feature/pom.xml
index 9126663c017..5ad8e17cd2a 100644
--- a/features/org.eclipse.remote-feature/pom.xml
+++ b/features/org.eclipse.remote-feature/pom.xml
@@ -10,6 +10,38 @@
     <relativePath>../../releng/org.eclipse.remote.build/pom.xml</relativePath>
   </parent>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>source-feature</id>
+            <phase>package</phase>
+            <goals>
+              <goal>source-feature</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <executions>
+          <execution>
+            <id>attached-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <artifactId>org.eclipse.remote</artifactId>
   <version>1.1.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
diff --git a/releng/org.eclipse.remote.build/pom.xml b/releng/org.eclipse.remote.build/pom.xml
index d728f83932a..bc2f4fff666 100644
--- a/releng/org.eclipse.remote.build/pom.xml
+++ b/releng/org.eclipse.remote.build/pom.xml
@@ -138,6 +138,23 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-source-feature-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<includeBinaryFeature>false</includeBinaryFeature>
+				</configuration>
+				<executions>
+					<execution>
+						<id>source-feature</id>
+						<phase>package</phase>
+						<goals>
+							<goal>source-feature</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
diff --git a/releng/org.eclipse.remote.repo/category.xml b/releng/org.eclipse.remote.repo/category.xml
index 4fe8f479a4e..35019f01f07 100644
--- a/releng/org.eclipse.remote.repo/category.xml
+++ b/releng/org.eclipse.remote.repo/category.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
    <feature url="features/org.eclipse.remote_0.0.0.qualifier.jar" id="org.eclipse.remote" version="0.0.0"/>
+   <feature url="features/org.eclipse.remote.source_0.0.0.qualifier.jar" id="org.eclipse.remote.source" version="0.0.0"/>
 </site>