Bug 518239 - [JUnit 5] Feature patch for JUnit 5 support on 4.7

Change-Id: Iec1fdab5d0be8864b6c73b2a8ea3b957f5998ef2
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

26 files changed, 480 insertions, 15 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project
new file mode 100644
index 000000000..18dff936d
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jdt-feature-dummy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..99f26c020
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 000000000..5a0ad22d2
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties
new file mode 100644
index 000000000..9cac5adb0
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/build.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2000, 2016 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bin.includes=\
+feature.xml,\
+feature.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties
new file mode 100644
index 000000000..ff73caca5
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.properties
@@ -0,0 +1,36 @@
+###############################################################################
+# Copyright (c) 2000, 2016 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse Java Development Tools - Dummy, for build only. 
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "description" property - description of the feature
+description=Dummy feature for build-time constraint.
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2017 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml
new file mode 100644
index 000000000..9ba8b40b8
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/feature.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jdt"
+      label="%featureName"
+      version="3.13.0.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <plugin
+         id="org.eclipse.jdt.dummy"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
new file mode 100644
index 000000000..b7a663775
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
@@ -0,0 +1,3 @@
+# To force a version qualifier update add the bug here
+Copyright Change
+[Bug 509505] Create Java9 patch build for Oxygen M4
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml
new file mode 100644
index 000000000..9c31a446a
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt-feature-dummy/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+     Igor Fedorenko - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>eclipse.platform.releng</groupId>
+    <artifactId>eclipse.platform.releng.junit5</artifactId>
+    <version>4.8.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.jdt.feature</groupId>
+  <artifactId>org.eclipse.jdt</artifactId>
+  <version>3.13.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+
+</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath
new file mode 100644
index 000000000..eca7bdba8
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore
new file mode 100644
index 000000000..5f875e59d
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.gitignore
@@ -0,0 +1,2 @@
+# special case of ignoring "src" since this is a "dummy" plugin, with no source
+/src/
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project
new file mode 100644
index 000000000..6de05941f
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jdt.dummy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..0c68a61dc
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..f8d881a04
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Dummy
+Bundle-SymbolicName: org.eclipse.jdt.dummy
+Bundle-Version: 1.0.1.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties
new file mode 100644
index 000000000..34d2e4d2d
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml
new file mode 100644
index 000000000..75b592810
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.dummy/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2014 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+     Igor Fedorenko - initial implementation
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>eclipse.platform.releng</groupId>
+    <artifactId>eclipse.platform.releng.junit5</artifactId>
+    <version>4.8.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.jdt</groupId>
+  <artifactId>org.eclipse.jdt.dummy</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <!--  I do not think this version (format) matters, to the patch.  -->
+        <configuration>
+          <format>'v20160301-1504'</format>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml
new file mode 100644
index 000000000..3cf8fe293
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/category.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.jdt.junit5patch" version="0.0.0">
+      <category name="org.eclipse.jdt"/>
+   </feature>
+   <category-def name="org.eclipse.jdt" label="Junit 5"/>
+</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/site.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/site.xml
deleted file mode 100644
index 5e2183f07..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5/site.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.jdt_3.13.0.v20170710-2000.jar" id="org.eclipse.jdt" version="3.13.0.v20170710-2000">
-      <category name="org.eclipse.jdt"/>
-   </feature>
-   <feature url="features/org.eclipse.jdt.source_3.13.0.v20170710-2000.jar" id="org.eclipse.jdt.source" version="3.13.0.v20170710-2000">
-      <category name="org.eclipse.jdt"/>
-   </feature>
-   <category-def name="org.eclipse.jdt" label="Junit 5 support"/>
-</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project
new file mode 100644
index 000000000..c9de8d73c
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.jdt.java9patch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties
new file mode 100644
index 000000000..583b21d9c
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/build.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2016 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation and others - initial API and implementation
+###############################################################################
+bin.includes = feature.xml,\
+               feature.properties
+
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties
new file mode 100644
index 000000000..4beb68a93
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.properties
@@ -0,0 +1,36 @@
+###############################################################################
+# Copyright (c) 2000, 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation and others - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse JDT (Java Development Tools) Patch with Java 9 support (BETA) for Oxygen development stream
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "description" property - description of the feature
+description=Eclipse Java 9 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2017 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation and others - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml
new file mode 100644
index 000000000..9fb198311
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/feature.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jdt.junit5patch"
+      label="%featureName"
+      version="0.0.1.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.1.v20140414-1359">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.jdt" version="3.13.0.qualifier"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.jdt.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.ui.tests"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.junit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.junit.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.junit.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.junit4.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt
new file mode 100644
index 000000000..95d2526b5
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/forceQualifierUpdate.txt
@@ -0,0 +1,5 @@
+Bug 479660 - [BETA_JAVA9] Build Eclipse SDK from 'BETA_JAVA9' branches
+-- there are 4 or 6 places to modify when updating. 
+Bug 486749 - [BETA_JAVA9] Build Eclipse SDK patch from 'BETA_JAVA9' branches 
+Updating to Oxygen
+[Bug 509505] Create Java9 patch build for Oxygen M4
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml
new file mode 100644
index 000000000..5569122e4
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2016 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+     IBM Corporation and others - initial implementation
+-->
+<project
+  xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>eclipse.platform.releng</groupId>
+    <artifactId>eclipse.platform.releng.junit5</artifactId>
+    <version>4.8.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.jdt.feature</groupId>
+  <artifactId>org.eclipse.jdt.junit5patch</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+
+  <build>
+
+    <plugins>
+
+
+      <plugin>
+        <groupId>org.eclipse.tycho.extras</groupId>
+        <artifactId>tycho-source-feature-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <id>source-feature</id>
+            <goals>
+              <goal>source-feature</goal>
+            </goals>
+            <!-- 
+            <configuration>
+              <plugins>
+                <plugin id="org.eclipse.jdt.doc.isv" versionRange="0.0.0"/>
+              </plugins>
+              <excludes>
+                <plugin id="org.eclipse.jdt"/>
+                <plugin id="org.eclipse.jdt.doc.user"/>
+              </excludes>
+            </configuration>
+             -->
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-plugin</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>attached-p2-metadata</id>
+            <phase>package</phase>
+            <goals>
+              <goal>p2-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties
new file mode 100644
index 000000000..33fd135a2
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/feature.properties
@@ -0,0 +1,36 @@
+###############################################################################
+# Copyright (c) 2000, 2017 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+# 
+# Contributors:
+#     IBM Corporation and others - initial API and implementation
+###############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=Eclipse JDT (Java Development Tools) Source Patch with Junit 5 support (BETA) for Oxygen development stream
+
+# "providerName" property - name of the company that provides the feature
+providerName=Eclipse.org
+
+# "description" property - description of the feature
+description=Eclipse Junit 5 Support (BETA) for Oxygen development stream - This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP. - This feature includes only runtime code and source bundles. It is intended only for Oxygen development stream, and if used on other versions or streams, may cause bundles to be down-leveled or up-leveled.\n
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2000, 2017 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+    IBM Corporation and others - initial API and implementation\n
+################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf
new file mode 100644
index 000000000..ae1a208ff
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/org.eclipse.jdt.junit5patch/sourceTemplateFeature/p2.inf
@@ -0,0 +1,2 @@
+properties.0.name = org.eclipse.equinox.p2.type.patch
+properties.0.value = false
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml
index 99ef717e2..8a1ee6932 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5/pom.xml
@@ -15,14 +15,12 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-<!-- 
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.7.0-SNAPSHOT</version>
+    <version>4.8.0-SNAPSHOT</version>
     <relativePath>../../eclipse-platform-parent</relativePath>
   </parent>
--->
 
   <groupId>eclipse.platform.releng</groupId>
   <artifactId>eclipse.platform.releng.junit5</artifactId>
@@ -64,8 +62,11 @@
     <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit.core</module>
     <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit.runtime</module>
     <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit4.runtime</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit5.runtime</module>
+    
     <module>../../eclipse.jdt/org.eclipse.jdt-feature</module>
-    <module>org.eclipse.jdt.junit5</module> 
+    <module>../../eclipse.jdt/org.eclipse.jdt</module>
+    <module>org.eclipse.jdt.junit5</module>
+    <module>org.eclipse.jdt.junit5patch</module>
+    
   </modules>
 </project>