Merge branch 'master' of ssh://btibbitts@git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git

17 files changed, 18 insertions, 31 deletions

diff --git a/features/org.eclipse.epp.allpackages.juno.feature/build.xml b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
index 6148675a..3ebe930f 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
@@ -7,7 +7,6 @@
 	<property file="${build.root}/build.properties" />
 	<property name="bm.headless.site" value="http://download.eclipse.org/tools/buckminster/headless-3.5/" />
 	<property name="juno.site" value="http://download.eclipse.org/releases/staging" />
-	<property name="platform.site" value="http://download.eclipse.org/eclipse/updates/4.2milestones/" />
 	<property name="buildtools" location="${build.root}/tools" />
 	<property name="workspace" location="${build.root}/ws" />
 	<property name="targetPlatformPath" location="${build.root}/TP" />
@@ -87,7 +86,6 @@
 		</eclipse.launch>
 		<eclipse.launch app="buckminster">
 			<args>
-				<jvmarg value="-Dplatform.site=${platform.site}" />
 				<jvmarg value="-Djuno.site=${juno.site}" />
 				<arg value="-data" />
 				<arg value="${workspace}" />
@@ -108,7 +106,6 @@
 	<target name="build.workspace" depends="build.tp">
 		<eclipse.launch app="buckminster">
 			<args>
-				<jvmarg value="-Dplatform.site=${platform.site}" />
 				<jvmarg value="-Djuno.site=${juno.site}" />
 				<arg value="-data" />
 				<arg value="${workspace}" />
diff --git a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
index cb6a7538..a91ec6d3 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
+++ b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
@@ -3,8 +3,7 @@
   <rm:locator pattern="^org\.eclipse\.epp\.allpackages\..*$" searchPathRef="org.eclipse.epp.allpackages.juno"/>
   <rm:locator pattern="^org\.eclipse\.epp\.package\..*\.feature$" searchPathRef="org.eclipse.epp.packages.feature"/>
   <rm:locator pattern="^org\.eclipse\.epp\.package\..*$" searchPathRef="org.eclipse.epp.packages"/>
-  <rm:locator searchPathRef="platform" failOnError="false"/>
-  <rm:locator searchPathRef="juno"/>
+  <rm:locator searchPathRef="juno" failOnError="false"/>
   <rm:searchPath name="org.eclipse.epp.allpackages.juno">
     <rm:provider componentTypes="eclipse.feature" readerType="git">
       <rm:uri format="{0}/org.eclipse.epp.packages,features/{1}">
@@ -41,13 +40,4 @@
       <rm:property key="buckminster.source" value="false" />
     </rm:provider>
   </rm:searchPath>
-  <rm:searchPath name="platform">
-    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
-      <rm:uri format="{0}?importType=binary">
-        <bc:propertyRef key="platform.site"/>
-      </rm:uri>
-      <rm:property key="buckminster.mutable" value="false"/>
-      <rm:property key="buckminster.source" value="false"/>
-    </rm:provider>
-  </rm:searchPath>
 </rm:rmap>
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 8c3bb4c4..d4fb4582 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
@@ -10,7 +10,7 @@
   <packageMetaData

    packageName="Eclipse IDE for Automotive Software Developers"

    maintainer="Eclipse Automotive Industry Working Group"

-   iconurl="http://www.eclipse.org/downloads/images/automotive.png"

+   iconurl="http://www.eclipse.org/downloads/images/classic.jpg"

    bugzillaComponentId="automotive-package"

    testPlan="http://www.eclipse.org/epp/testplan.php" >

     <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->

@@ -29,6 +29,6 @@
   <rcp version="4.2.0" />

 

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

-  <product name="eclipse-automotive-juno-RC1" />

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

 

 </configuration>

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 ac096d3e..043050d3 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
@@ -42,6 +42,6 @@
 	<rcp version="4.2.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-cpp-juno-RC1" />
+	<product name="eclipse-cpp-juno-RC3" />
 
 </configuration>
\ No newline at end of file
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 25cd4e88..c670da2a 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
@@ -39,6 +39,6 @@
   <rcp version="4.2.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-juno-RC1" />
+	<product name="eclipse-java-juno-RC3" />
 
 </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 a51ca171..9ecc1e8b 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
@@ -43,6 +43,6 @@
   <rcp version="4.2.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-juno-RC1" />
+  <product name="eclipse-jee-juno-RC3" />
 
 </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 21922101..a4aa14f3 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.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-mobile-juno-RC1" />
+	<product name="eclipse-mobile-juno-RC3" />
 
 </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 bb33c5d4..267e2e98 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.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-juno-RC1" />
+  <product name="eclipse-modeling-juno-RC3" />
 
 </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 8c5504d4..99a4d4bb 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
@@ -42,6 +42,6 @@
 	<rcp version="4.2.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-juno-RC1" />
+	<product name="eclipse-parallel-juno-RC3" />
 
-</configuration>
\ No newline at end of file
+</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 7316671f..6e42143c 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
@@ -41,6 +41,6 @@
   <rcp version="4.2.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-juno-RC1" />
+  <product name="eclipse-rcp-juno-RC3" />
 
 </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 f2705c1b..a51326cb 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.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-juno-RC1" />
+  <product name="eclipse-reporting-juno-RC3" />
 
 </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 ca1de801..674342d4 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.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-juno-RC1" />
+  <product name="eclipse-scout-juno-RC3" />
 
 </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 dd4af1a1..3db1a285 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
@@ -39,6 +39,6 @@
   <rcp version="4.2.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-testing-juno-RC1" />
+  <product name="eclipse-testing-juno-RC3" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml b/releng/org.eclipse.epp.config/eclipse_sdk_juno.xml
index c6d3b7c5..801f14d9 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 RC1"
+   packageName="Eclipse Classic 4.2 RC3"
    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/S-4.2M7-201205031800/
+      /eclipse/downloads/drops4/S-4.2RC2-201205242100/
     </FakePackageLocation>
   </packageMetaData>
   <MoreInfo>
@@ -58,6 +58,6 @@
   <rcp version="4.2" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-SDK-4.2M7" />
+  <product name="eclipse-SDK-4.2RC3" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/startEPPJuno.sh b/releng/org.eclipse.epp.config/startEPPJuno.sh
index 1982a583..1a0dd407 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-RC1"
+RELEASE_NAME="-juno-RC3"
 
 # variables
 START_TIME=`date -u +%Y%m%d-%H%M`
diff --git a/releng/org.eclipse.epp.config/tools/functions.sh b/releng/org.eclipse.epp.config/tools/functions.sh
index c60cbafe..c60cbafe 100644..100755
--- a/releng/org.eclipse.epp.config/tools/functions.sh
+++ b/releng/org.eclipse.epp.config/tools/functions.sh
diff --git a/releng/org.eclipse.epp.config/tools/releaseRename.sh b/releng/org.eclipse.epp.config/tools/releaseRename.sh
index 95dc600e..95dc600e 100644..100755
--- a/releng/org.eclipse.epp.config/tools/releaseRename.sh
+++ b/releng/org.eclipse.epp.config/tools/releaseRename.sh