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

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

5 files changed, 16 insertions, 6 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project
index 44eabfb57..b6283c2b0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eclipse.releng.repository.java9patch</name>
+	<name>eclipse.releng.repository.junit5patch</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml
index bf4ef0111..6433e4c28 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/eclipse.releng.repository.junit5patch/pom.xml
@@ -158,7 +158,7 @@
         <version>${tycho.version}</version>
         <executions>
           <execution>
-            <id>categories-java9patch</id>
+            <id>categories-junit5patch</id>
             <phase>package</phase>
             <goals>
               <goal>publish-categories</goal>
@@ -175,7 +175,7 @@
         </configuration>
         <executions>
           <execution>
-            <id>assemble-java9patch</id>
+            <id>assemble-junit5patch</id>
             <phase>package</phase>
             <configuration>
               <repositoryName>Early Access of JUnit 5 support</repositoryName>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project
index c9de8d73c..22a07839c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.jdt.java9patch</name>
+	<name>org.eclipse.jdt.junit5patch</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml
index 831f1a961..d37d34a44 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/junit5patch/org.eclipse.jdt.junit5patch/pom.xml
@@ -16,7 +16,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java9patch47</artifactId>
+    <artifactId>eclipse.platform.releng.junit5patch</artifactId>
     <version>4.7.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index e710794e9..781a7fa18 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -653,7 +653,17 @@ fn-gather-repo ()
   BUILD_DIR="$1"; shift
   if [[ -n "${PATCH_BUILD}" ]]
   then
-    PATCH_BUILD_GENERIC=java9patch
+    case "${PATCH_BUILD}" in
+      "junit5patch" )
+            PATCH_BUILD_GENERIC=junit5patch
+            ;;
+      "java9patch47" )
+      		PATCH_BUILD_GENERIC=java9patch
+      		;;
+      * )
+      		PATCH_BUILD_GENERIC=java9patch
+      		;;   
+    esac
     ORIG_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD_GENERIC}/target/site
     TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD_GENERIC}/target/repository
     ORIG_DIR_REPOSITORY=$REPO_DIR/${ORIG_PATH}