Bug 400518 - [CBI] CBI build pulls in "latest" version of 3rd party

bundles from Orbit

rename change os 'sdk prereqs'

6 files changed, 9 insertions, 6 deletions

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index b6c38e047..65de2b6cb 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -202,7 +202,7 @@
           <target>
             <artifact>
               <groupId>org.eclipse</groupId>
-              <artifactId>orbit-prereqs</artifactId>
+              <artifactId>eclipse-sdk-prereqs</artifactId>
               <version>4.4.0-SNAPSHOT</version>
             </artifact>
           </target>
diff --git a/eclipse.platform.releng.prereqs.orbit/.gitignore b/eclipse.platform.releng.prereqs.sdk/.gitignore
index bc9597050..bc9597050 100644
--- a/eclipse.platform.releng.prereqs.orbit/.gitignore
+++ b/eclipse.platform.releng.prereqs.sdk/.gitignore
diff --git a/eclipse.platform.releng.prereqs.orbit/orbit-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index 7928bc511..5c1b134c7 100644
--- a/eclipse.platform.releng.prereqs.orbit/orbit-prereqs.target
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.5"?>
 
-<target name="orbit-prereqs">
+<target name="eclipse-sdk-prereqs">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" type="InstallableUnit">
 <unit id="com.ibm.icu" version="50.1.1.v201304230130" />
@@ -70,7 +70,7 @@
 <!-- specific (additional) to test framework -->
 <unit id="org.easymock" version="2.4.0.v20090202-0900" />
 
-<!-- will need eventually, for Luna. See bug 422102 -->
+<!-- don't need? See bug 422102 -->
 <unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830" />
 
 <!-- should not need. See bug 422101 -->
diff --git a/eclipse.platform.releng.prereqs.orbit/pom.xml b/eclipse.platform.releng.prereqs.sdk/pom.xml
index 0920ea90c..610ab7494 100644
--- a/eclipse.platform.releng.prereqs.orbit/pom.xml
+++ b/eclipse.platform.releng.prereqs.sdk/pom.xml
@@ -4,10 +4,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.eclipse</groupId>
-    <artifactId>orbit-prereqs</artifactId>
+    <artifactId>eclipse-sdk-prereqs</artifactId>
     <version>4.4.0-SNAPSHOT</version>
     <packaging>eclipse-target-definition</packaging>
-    <name>orbit-prereqs</name>
+    <name>eclipse-sdk-prereqs</name>
 
   <parent>
     <groupId>org.eclipse</groupId>
diff --git a/pom.xml b/pom.xml
index 23d65e41f..0a3fd55a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,9 +18,10 @@
   <packaging>pom</packaging>
 
   <modules>
+
     <module>eclipse-platform-parent</module>
 
-    <module>eclipse.platform.releng.prereqs.orbit</module>
+    <module>eclipse.platform.releng.prereqs.sdk</module>
 
     <module>eclipse.jdt/</module>
     <module>eclipse.jdt.core</module>
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index aa4ede6ce..52b2f2d2d 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -616,6 +616,7 @@ fn-tag-build-inputs ()
 # TODO: depends on TMP_DIR being exported/global
 fn-pom-version-updater () 
 {
+
     checkNArgs $# 4
     if [[ $? != 0 ]]; then return 1; fi
     REPO_DIR="$1"; shift
@@ -672,6 +673,7 @@ fn-pom-version-updater ()
 #   SIGNING: true
 fn-pom-version-update-with-commit () 
 {
+
     checkNArgs $# 3
     if [[ $? != 0 ]]; then return 1; fi
     BUILD_ID="$1"; shift