Update Juno packages to SR1 RC4

15 files changed, 16 insertions, 19 deletions

diff --git a/packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml b/packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml
index e33cde67..b5d481c3 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml
@@ -32,6 +32,6 @@
   <rcp version="4.2.1" />

 

   <!-- name, the name of the product, used in naming the created files. -->

-  <product name="eclipse-automotive-juno-SR1-RC3-incubation" />

+  <product name="eclipse-automotive-juno-SR1-RC4-incubation" />

 

 </configuration>

diff --git a/packages/org.eclipse.epp.package.common.feature/p2.inf b/packages/org.eclipse.epp.package.common.feature/p2.inf
index dea66aa0..122c9de6 100644
--- a/packages/org.eclipse.epp.package.common.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.common.feature/p2.inf
@@ -9,6 +9,3 @@ properties.1.value=false
 #instructions.unconfigure=\
 #org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/juno);\
 #org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/juno);
-
-
-
diff --git a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml
index d64c7357..a79de9bf 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml
@@ -45,6 +45,6 @@
 	<rcp version="4.2.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-cpp-juno-SR1-RC3" />
+	<product name="eclipse-cpp-juno-SR1-RC4" />
 
 </configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.dsl.feature/eclipse_dsl_juno.xml b/packages/org.eclipse.epp.package.dsl.feature/eclipse_dsl_juno.xml
index d272afa7..7a7b4e14 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/eclipse_dsl_juno.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/eclipse_dsl_juno.xml
@@ -28,6 +28,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-juno-SR1-RC3" />
+  <product name="eclipse-dsl-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml b/packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml
index 3636109f..0c8f7821 100644
--- a/packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml
+++ b/packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml
@@ -42,6 +42,6 @@
   <rcp version="4.2.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-juno-SR1-RC3" />
+	<product name="eclipse-java-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml
index fdb4c9ea..38d610f6 100644
--- a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml
@@ -42,6 +42,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-juno-SR1-RC3" />
+  <product name="eclipse-jee-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml b/packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml
index 83a98985..9db732e8 100644
--- a/packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml
+++ b/packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml
@@ -42,6 +42,6 @@
   <rcp version="4.2.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-mobile-juno-SR1-RC3" />
+	<product name="eclipse-mobile-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml
index 3dcc8b81..87c0a5ab 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml
@@ -49,6 +49,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-juno-SR1-RC3" />
+  <product name="eclipse-modeling-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml b/packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml
index 7c33f52a..ef32cc1d 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml
@@ -45,6 +45,6 @@
 	<rcp version="4.2.1" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-juno-SR1-RC3" />
+	<product name="eclipse-parallel-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml
index d3790985..dca28491 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml
@@ -44,6 +44,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-juno-SR1-RC3" />
+  <product name="eclipse-rcp-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml
index ae214682..13a47f4f 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml
@@ -43,6 +43,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-juno-SR1-RC3" />
+  <product name="eclipse-reporting-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml b/packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml
index 88ac218e..78c44a36 100644
--- a/packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml
@@ -39,6 +39,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-juno-SR1-RC3" />
+  <product name="eclipse-scout-juno-SR1-RC4" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml b/packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml
index ec728af6..7d28913c 100644
--- a/packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml
@@ -42,6 +42,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-testing-juno-SR1-RC3" />
+  <product name="eclipse-testing-juno-SR1-RC4" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml b/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml
index 0816c6f8..0c0664f2 100644
--- a/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml
+++ b/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml
@@ -13,7 +13,7 @@
        testPlan is the fully qualified URL to the test plan for this package
    -->
   <packageMetaData
-   packageName="Eclipse Classic 4.2.1 RC3"
+   packageName="Eclipse Classic 4.2.1"
    maintainer="Eclipse Platform Team"
    iconurl="http://www.eclipse.org/downloads/images/classic2.jpg"
    bugzillaComponentId=""
@@ -26,7 +26,7 @@
     </packageTesters>
     <FakePackage>True</FakePackage>
     <FakePackageLocation>
-      /eclipse/downloads/drops4/M20120905-2300/
+      /eclipse/downloads/drops4/R-4.2.1-201209141800/
     </FakePackageLocation>
   </packageMetaData>
   <MoreInfo>
@@ -40,6 +40,6 @@
   <rcp version="4.2.1" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-SDK-M20120905-2300" />
+  <product name="eclipse-SDK-4.2.1" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/startEPPJuno.sh b/releng/org.eclipse.epp.config/startEPPJuno.sh
index 8181e8bb..64a64993 100755
--- a/releng/org.eclipse.epp.config/startEPPJuno.sh
+++ b/releng/org.eclipse.epp.config/startEPPJuno.sh
@@ -26,7 +26,7 @@ fi
 
 # variables to adjust
 BASE_DIR=/shared/technology/epp/epp_build/juno
-RELEASE_NAME="-juno-SR1-RC3"
+RELEASE_NAME="-juno-SR1-RC4"
 
 # variables
 START_TIME=`date -u +%Y%m%d-%H%M`