Bug 522339: [JUnit 5] Merge BETA_JUNIT5 branches to R4_7_maintenance
branches

Change-Id: Ib90bfecc907b1b12ddac398ba0b7ba392b0b00e6
Signed-off-by: Noopur Gupta <noopur_gupta@in.ibm.com>
diff --git a/org.eclipse.jdt-feature/feature.xml b/org.eclipse.jdt-feature/feature.xml
index 1f4a6c5..202bc70 100644
--- a/org.eclipse.jdt-feature/feature.xml
+++ b/org.eclipse.jdt-feature/feature.xml
@@ -140,6 +140,13 @@
          unpack="false"/>
 
    <plugin
+         id="org.eclipse.jdt.junit5.runtime"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jdt.launching"
          download-size="0"
          install-size="0"
@@ -167,6 +174,90 @@
          unpack="false"/>
 
    <plugin
+         id="org.junit.jupiter.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.jupiter.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.jupiter.migrationsupport"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.jupiter.params"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.platform.commons"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.platform.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.platform.launcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.platform.runner"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.platform.suite.api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.junit.vintage.engine"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.opentest4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apiguardian"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
          id="org.eclipse.jdt.doc.user"
          download-size="0"
          install-size="0"
diff --git a/org.eclipse.jdt-feature/forceQualifierUpdate.txt b/org.eclipse.jdt-feature/forceQualifierUpdate.txt
index 056dcb4..d9f07d5 100644
--- a/org.eclipse.jdt-feature/forceQualifierUpdate.txt
+++ b/org.eclipse.jdt-feature/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
 # To force a version qualifier update add the bug here
 Bug 467923 - Unusual feature qualifier issue caused I20150521-1400 build to fail
+Bug 518239: [JUnit 5] Feature patch for JUnit 5 support on 4.7