From 176ab1ef63ff6052f3ad2dca0f0ba329059126fe Mon Sep 17 00:00:00 2001
From: Markus Knauer
Date: Mon, 20 Aug 2012 20:43:39 +0200
Subject: Do as many Kepler changes as possible

* Update Kepler repository URLs
* Update platform versions from 4.2 to 4.3
* Change file name of epp website description XML file
* Update EPP versions to 2.0.0
---
 .../eclipse_automotive_juno.xml                    | 37 ---------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 37 +++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_cpp_juno.xml                           | 50 --------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 50 ++++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_java_juno.xml                          | 47 -------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 47 +++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_jee_juno.xml                           | 47 -------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 47 +++++++++++++++++++
 .../feature.xml                                    |  2 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_mobile_juno.xml                        | 47 -------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 47 +++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_modeling_juno.xml                      | 54 ----------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 54 ++++++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_parallel_juno.xml                      | 50 --------------------
 .../epp.product                                    |  2 +-
 .../epp.website.xml                                | 50 ++++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_rcp_juno.xml                           | 49 --------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 49 ++++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_reporting_juno.xml                     | 48 -------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 48 +++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_scout_juno.xml                         | 44 ------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 44 ++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 .../eclipse_testing_juno.xml                       | 47 -------------------
 .../epp.product                                    |  4 +-
 .../epp.website.xml                                | 47 +++++++++++++++++++
 .../feature.xml                                    |  4 +-
 .../META-INF/MANIFEST.MF                           |  2 +-
 57 files changed, 576 insertions(+), 576 deletions(-)
 delete mode 100644 packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.java.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.jee.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.mobile.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.scout.feature/epp.website.xml
 delete mode 100644 packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml
 create mode 100644 packages/org.eclipse.epp.package.testing.feature/epp.website.xml

(limited to 'packages')

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
deleted file mode 100644
index 5bc6f3e7..00000000
--- a/packages/org.eclipse.epp.package.automotive.feature/eclipse_automotive_juno.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse IDE for Automotive Software Developers (includes Incubating components)"
-   maintainer="Eclipse Automotive Industry Working Group"
-   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 -->
-     <description><![CDATA[This package contains frameworks and tools used for the development of embedded automotive software: In addition to Eclipse Platform, Java Development Tools, and Plug-in Development Environment, it includes EMF, GMF, Xtext, Xpand, UML2, selected other modeling components, C/C++ development tools, and XML/XSD editors and tools. It comes with the complete SDKs, i.e., provides runtime binaries, source code, and documentation.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Stephan Eberle</tester>
-      <tester>Amine Lajmi</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />  
-  </MoreInfo>
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-automotive-juno-incubation" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.automotive.feature/epp.product b/packages/org.eclipse.epp.package.automotive.feature/epp.product
index 835d5af2..1d9187d0 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/epp.product
+++ b/packages/org.eclipse.epp.package.automotive.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Automotive Software Developers" uid="epp.package.automotive" id="org.eclipse.epp.package.automotive.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Automotive Software Developers" uid="epp.package.automotive" id="org.eclipse.epp.package.automotive.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -52,7 +52,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.automotive.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.automotive.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml b/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
new file mode 100644
index 00000000..5bc6f3e7
--- /dev/null
+++ b/packages/org.eclipse.epp.package.automotive.feature/epp.website.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse IDE for Automotive Software Developers (includes Incubating components)"
+   maintainer="Eclipse Automotive Industry Working Group"
+   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 -->
+     <description><![CDATA[This package contains frameworks and tools used for the development of embedded automotive software: In addition to Eclipse Platform, Java Development Tools, and Plug-in Development Environment, it includes EMF, GMF, Xtext, Xpand, UML2, selected other modeling components, C/C++ development tools, and XML/XSD editors and tools. It comes with the complete SDKs, i.e., provides runtime binaries, source code, and documentation.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Stephan Eberle</tester>
+      <tester>Amine Lajmi</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />  
+  </MoreInfo>
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-automotive-juno-incubation" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.automotive.feature/feature.xml b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
index f69d9b4e..03e08170 100644
--- a/packages/org.eclipse.epp.package.automotive.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.automotive.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.automotive.feature"
       label="EPP Automotive Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.automotive">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
index bac5365f..0db976a7 100644
--- a/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.automotive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Automotive Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.automotive;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
diff --git a/packages/org.eclipse.epp.package.common.feature/feature.xml b/packages/org.eclipse.epp.package.common.feature/feature.xml
index 1a2ccfe8..635547fb 100644
--- a/packages/org.eclipse.epp.package.common.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.common.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.common.feature"
       label="EPP Common Package Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project">
 
    <description>
@@ -16,7 +16,7 @@ to all EPP packages and general configurations.
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <requires>
diff --git a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
index 8d6dacc3..6eefb7d0 100644
--- a/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Common Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.common;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse.org - EPP
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.epp.mpc.ui
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
deleted file mode 100644
index 85cb4d0e..00000000
--- a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_juno.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse IDE for C/C++ Developers"
-   maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/cdt.png"
-   bugzillaComponentId="cpp-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[An IDE for C/C++ developers with Mylyn integration.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Doug Schaefer</tester>
-      <tester>Markus Knauer</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/CDT/User/NewIn90"
-    project="Eclipse CDT" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/linuxtools/new/"
-    project="Eclipse Linux Tools" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
-    project="Eclipse EGit" />
-  </MoreInfo>
-  
-
-	<!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-	<rcp version="4.2.0" />
-
-	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-cpp-juno" />
-
-</configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.product b/packages/org.eclipse.epp.package.cpp.feature/epp.product
index 3af64405..0036ffd7 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.product
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for C/C++ Developers" uid="epp.package.cpp" id="org.eclipse.epp.package.cpp.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.cpp.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.cpp.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
new file mode 100644
index 00000000..85cb4d0e
--- /dev/null
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse IDE for C/C++ Developers"
+   maintainer="Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/downloads/images/cdt.png"
+   bugzillaComponentId="cpp-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[An IDE for C/C++ developers with Mylyn integration.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Doug Schaefer</tester>
+      <tester>Markus Knauer</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/CDT/User/NewIn90"
+    project="Eclipse CDT" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/linuxtools/new/"
+    project="Eclipse Linux Tools" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
+    project="Eclipse EGit" />
+  </MoreInfo>
+  
+
+	<!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+	<rcp version="4.2.0" />
+
+	<!-- name, the name of the product, used in naming the created files. -->
+	<product name="eclipse-cpp-juno" />
+
+</configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index 89719a21..bded0cd0 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.cpp.feature"
       label="EPP CPP Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.cpp">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <!-- see p2.inf file for optionally imported Linux Tools features -->
diff --git a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
index e09d42a6..c0af7dd8 100644
--- a/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.cpp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP CPP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.cpp;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 8de797b3..00000000
--- a/packages/org.eclipse.epp.package.java.feature/eclipse_java_juno.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse IDE for Java Developers"
-   maintainer="Eclipse Mylyn Project"
-   iconurl="http://www.eclipse.org/downloads/images/java.jpg"
-   bugzillaComponentId="java-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a CVS client, Git client, XML Editor, Mylyn, Maven integration and WindowBuilder]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Mik Kersten</tester>
-      <tester>Steffen Pingel</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
-    project="EGit" />
-  <NewAndNoteworthy
-    url="http://eclipse.org/recommenders/documentation/changes.html"
-    project="Eclipse Code Recommenders" />  
-  </MoreInfo>
-
-
-	<!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.product b/packages/org.eclipse.epp.package.java.feature/epp.product
index f086e4eb..27348eb8 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.product
+++ b/packages/org.eclipse.epp.package.java.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java Developers" uid="epp.package.java" id="org.eclipse.epp.package.java.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.java.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.java.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
new file mode 100644
index 00000000..8de797b3
--- /dev/null
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse IDE for Java Developers"
+   maintainer="Eclipse Mylyn Project"
+   iconurl="http://www.eclipse.org/downloads/images/java.jpg"
+   bugzillaComponentId="java-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[The essential tools for any Java developer, including a Java IDE, a CVS client, Git client, XML Editor, Mylyn, Maven integration and WindowBuilder]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Mik Kersten</tester>
+      <tester>Steffen Pingel</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
+    project="EGit" />
+  <NewAndNoteworthy
+    url="http://eclipse.org/recommenders/documentation/changes.html"
+    project="Eclipse Code Recommenders" />  
+  </MoreInfo>
+
+
+	<!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+	<!-- name, the name of the product, used in naming the created files. -->
+	<product name="eclipse-java-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index c4618692..22f7a0c4 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.java.feature"
       label="EPP Java Package"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.java">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
       <discovery label="Mylyn for Eclipse Juno" url="http://download.eclipse.org/mylyn/releases/juno/"/>
    </url>
 
diff --git a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
index e792cdc3..08ad4511 100644
--- a/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Java Package
 Bundle-SymbolicName: org.eclipse.epp.package.java;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index bdfe94f5..00000000
--- a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_juno.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse IDE for Java EE Developers"
-   maintainer="WTP and the Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/javaee.png"
-   bugzillaComponentId="jee-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[Tools for Java developers creating Java EE and Web applications, including a Java IDE, tools for Java EE, JPA, JSF, Mylyn and others.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>David Williams</tester>
-      <tester>Chuck Bridgham</tester>
-      <tester>Martin Oberhuber</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/webtools/development/news/main.php"
-    project="Eclipse Webtools Project" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/tm/"
-    project="Eclipse Target Management (RSE)" />
-  </MoreInfo>
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.product b/packages/org.eclipse.epp.package.jee.feature/epp.product
index 557ee1ae..c1d14fa2 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.product
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java EE Developers" uid="epp.package.jee" id="org.eclipse.epp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -157,7 +157,7 @@ Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in t
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.jee.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.jee.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
new file mode 100644
index 00000000..bdfe94f5
--- /dev/null
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse IDE for Java EE Developers"
+   maintainer="WTP and the Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/downloads/images/javaee.png"
+   bugzillaComponentId="jee-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[Tools for Java developers creating Java EE and Web applications, including a Java IDE, tools for Java EE, JPA, JSF, Mylyn and others.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>David Williams</tester>
+      <tester>Chuck Bridgham</tester>
+      <tester>Martin Oberhuber</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/webtools/development/news/main.php"
+    project="Eclipse Webtools Project" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/tm/"
+    project="Eclipse Target Management (RSE)" />
+  </MoreInfo>
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-jee-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index 47c3b044..1d644ea2 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.jee.feature"
       label="%featureName"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.epp.package.jee">
 
diff --git a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
index 69a691a3..f8e893e7 100644
--- a/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.epp.package.jee;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.platform,
  org.eclipse.equinox.app
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
deleted file mode 100644
index 0f2d9ed0..00000000
--- a/packages/org.eclipse.epp.package.mobile.feature/eclipse_mobile_juno.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse for Mobile Developers"
-   maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/mobile.jpg"
-   bugzillaComponentId="mobile-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[ The essential starting point for Mobile developers, including a Java IDE, C language support, a Git client, XML Editor and Mylyn.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Eric Cloninger</tester>
-      <tester>Daniel Pastore</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/Mobile/NewInJuno"
-    project="Eclipse for Mobile Developers" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
-    project="EGit" />
-  </MoreInfo>
-
-
-	<!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-mobile-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.mobile.feature/epp.product b/packages/org.eclipse.epp.package.mobile.feature/epp.product
index 489ff85f..fd4b9e0c 100644
--- a/packages/org.eclipse.epp.package.mobile.feature/epp.product
+++ b/packages/org.eclipse.epp.package.mobile.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Mobile Developers" uid="epp.package.mobile" id="org.eclipse.epp.package.mobile.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Mobile Developers" uid="epp.package.mobile" id="org.eclipse.epp.package.mobile.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.mobile.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.mobile.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.mobile.feature/epp.website.xml b/packages/org.eclipse.epp.package.mobile.feature/epp.website.xml
new file mode 100644
index 00000000..0f2d9ed0
--- /dev/null
+++ b/packages/org.eclipse.epp.package.mobile.feature/epp.website.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse for Mobile Developers"
+   maintainer="Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/downloads/images/mobile.jpg"
+   bugzillaComponentId="mobile-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[ The essential starting point for Mobile developers, including a Java IDE, C language support, a Git client, XML Editor and Mylyn.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Eric Cloninger</tester>
+      <tester>Daniel Pastore</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/Mobile/NewInJuno"
+    project="Eclipse for Mobile Developers" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
+    project="EGit" />
+  </MoreInfo>
+
+
+	<!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+	<!-- name, the name of the product, used in naming the created files. -->
+	<product name="eclipse-mobile-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.mobile.feature/feature.xml b/packages/org.eclipse.epp.package.mobile.feature/feature.xml
index 934e5fc6..e3cafd14 100644
--- a/packages/org.eclipse.epp.package.mobile.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.mobile.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.mobile.feature"
       label="EPP Mobile Package"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.mobile">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
       <discovery label="Mylyn for Eclipse Juno" url="http://download.eclipse.org/mylyn/releases/juno/"/>
    </url>
 
diff --git a/packages/org.eclipse.epp.package.mobile/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.mobile/META-INF/MANIFEST.MF
index f1a4083e..199e8918 100644
--- a/packages/org.eclipse.epp.package.mobile/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.mobile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Mobile Package
 Bundle-SymbolicName: org.eclipse.epp.package.mobile;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 7502ef7f..00000000
--- a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_juno.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse Modeling Tools"
-   maintainer="Modeling Amalgamation Project"
-   iconurl="http://www.eclipse.org/modeling/images/modeling_about.png"
-   bugzillaComponentId="modeling-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[This package contains framework and tools to leverage models : an Ecore graphical modeler (class-like diagram), Java code generation utility for RCP applications and the EMF Framework, model comparison support, support for XSD schemas, OCL and graphical modeler runtimes. It includes a complete SDK, developer tools and source code.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Cédric Brun</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/Acceleo/ReleaseReview/Indigo#New_and_noteworthy"
-    project="Acceleo" />
-  <NewAndNoteworthy
-   url="http://wiki.eclipse.org/EEF_New_and_Noteworthy"
-   project="EEF" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EMF#New_.26_Noteworthy"
-    project="Eclipse Modeling Framework" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EMF_Compare_1.2.0_New_And_Noteworthy"
-    project="EMF Compare" />     
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/GMF_New_and_Noteworthy"
-    project="Graphical Modeling Framework" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/ATL_3.2.0_New_and_Noteworthy"
-    project="M2M ATL" />            
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/MDT/OCL/New_and_Noteworthy/Juno"
-    project="MDT OCL" />    
-  </MoreInfo>
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.product b/packages/org.eclipse.epp.package.modeling.feature/epp.product
index 7dfac1bf..aac1618d 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.product
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Modeling Tools" uid="epp.package.modeling" id="org.eclipse.epp.package.modeling.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.modeling.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.modeling.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
new file mode 100644
index 00000000..7502ef7f
--- /dev/null
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse Modeling Tools"
+   maintainer="Modeling Amalgamation Project"
+   iconurl="http://www.eclipse.org/modeling/images/modeling_about.png"
+   bugzillaComponentId="modeling-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[This package contains framework and tools to leverage models : an Ecore graphical modeler (class-like diagram), Java code generation utility for RCP applications and the EMF Framework, model comparison support, support for XSD schemas, OCL and graphical modeler runtimes. It includes a complete SDK, developer tools and source code.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Cédric Brun</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/Acceleo/ReleaseReview/Indigo#New_and_noteworthy"
+    project="Acceleo" />
+  <NewAndNoteworthy
+   url="http://wiki.eclipse.org/EEF_New_and_Noteworthy"
+   project="EEF" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EMF#New_.26_Noteworthy"
+    project="Eclipse Modeling Framework" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EMF_Compare_1.2.0_New_And_Noteworthy"
+    project="EMF Compare" />     
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/GMF_New_and_Noteworthy"
+    project="Graphical Modeling Framework" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/ATL_3.2.0_New_and_Noteworthy"
+    project="M2M ATL" />            
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/MDT/OCL/New_and_Noteworthy/Juno"
+    project="MDT OCL" />    
+  </MoreInfo>
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-modeling-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index b9ffdb0d..de44e67c 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.modeling.feature"
       label="EPP Modeling Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.modeling">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
index 09b83bc6..fd2189d0 100644
--- a/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.modeling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Modeling Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.modeling;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 9145ce14..00000000
--- a/packages/org.eclipse.epp.package.parallel.feature/eclipse_parallel_juno.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse for Parallel Application Developers"
-   maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/parallel.png"
-   bugzillaComponentId="parallel-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[An IDE for Parallel Application Developers. Includes the C/C++ IDE, plus tools for Fortran, UPC, MPI, a parallel debugger, etc.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Beth Tibbitts</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/PTP/new_and_noteworthy/6.0.0"
-    project="Eclipse PTP" />
-    <!--  Update for 4.2 final-->
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/CDT/User/NewIn81"
-    project="Eclipse CDT" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/linuxtools/new/"
-    project="Eclipse Linux Tools" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  </MoreInfo>
-  
-
-	<!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-	<rcp version="4.2.0" />
-
-	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/epp.product b/packages/org.eclipse.epp.package.parallel.feature/epp.product
index 080393b7..6514b9ee 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/epp.product
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.product
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.parallel.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.parallel.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
new file mode 100644
index 00000000..9145ce14
--- /dev/null
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse for Parallel Application Developers"
+   maintainer="Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/downloads/images/parallel.png"
+   bugzillaComponentId="parallel-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[An IDE for Parallel Application Developers. Includes the C/C++ IDE, plus tools for Fortran, UPC, MPI, a parallel debugger, etc.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Beth Tibbitts</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/PTP/new_and_noteworthy/6.0.0"
+    project="Eclipse PTP" />
+    <!--  Update for 4.2 final-->
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/CDT/User/NewIn81"
+    project="Eclipse CDT" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/linuxtools/new/"
+    project="Eclipse Linux Tools" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  </MoreInfo>
+  
+
+	<!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+	<rcp version="4.2.0" />
+
+	<!-- name, the name of the product, used in naming the created files. -->
+	<product name="eclipse-parallel-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/feature.xml b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
index e1750590..422c5cf9 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.parallel.feature"
       label="EPP Parallel Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.parallel">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
       <discovery label="PTP" url="http://download.eclipse.org/tools/ptp/updates/juno/"/>
    </url>
 
diff --git a/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
index e09c6818..3a1f8e11 100644
--- a/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.parallel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Parallel Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.parallel;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 381c4997..00000000
--- a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_juno.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse for RCP and RAP Developers"
-   maintainer="Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/downloads/images/rcp.jpg"
-   bugzillaComponentId="rcp-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[A complete set of tools for developers who want to create Eclipse plug-ins, Rich Client or Rich Ajax Applications (RCP+RAP), plus Mylyn, and an XML editor. In addition to the CVS Eclipse Team provider, it also contains the EGit tooling for accessing Git version control systems.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Markus Knauer</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/rap/noteworthy/1.5/"
-    project="Eclipse RAP" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
-    project="Eclipse EGit" />
-  <NewAndNoteworthy
-    url="http://eclipse.org/recommenders/documentation/changes.html"
-    project="Eclipse Code Recommenders" />
-  </MoreInfo>
-
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.product b/packages/org.eclipse.epp.package.rcp.feature/epp.product
index c28aa4c6..11c0bf1f 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.product
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for RCP and RAP Developers" uid="epp.package.rcp" id="org.eclipse.epp.package.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -53,7 +53,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.rcp.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.rcp.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
new file mode 100644
index 00000000..381c4997
--- /dev/null
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse for RCP and RAP Developers"
+   maintainer="Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/downloads/images/rcp.jpg"
+   bugzillaComponentId="rcp-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[A complete set of tools for developers who want to create Eclipse plug-ins, Rich Client or Rich Ajax Applications (RCP+RAP), plus Mylyn, and an XML editor. In addition to the CVS Eclipse Team provider, it also contains the EGit tooling for accessing Git version control systems.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Markus Knauer</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/rap/noteworthy/1.5/"
+    project="Eclipse RAP" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/EGit/New_and_Noteworthy/2.0"
+    project="Eclipse EGit" />
+  <NewAndNoteworthy
+    url="http://eclipse.org/recommenders/documentation/changes.html"
+    project="Eclipse Code Recommenders" />
+  </MoreInfo>
+
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-rcp-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 546c20f9..57f0c856 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.rcp.feature"
       label="EPP RCP/RAP Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.rcp">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
index 265a6d4c..73594eeb 100644
--- a/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP RCP/RAP Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.rcp;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 20a403d5..00000000
--- a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_juno.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse IDE for Java and Report Developers"
-   maintainer="Eclipse BIRT Project and the Eclipse Packaging Project"
-   iconurl="http://www.eclipse.org/birt/images/jee-birt.jpg"
-   bugzillaComponentId="reporting-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[Java EE tools and BIRT reporting tool for Java developers to create Java EE and Web applications that also have reporting needs.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Xiaoying Gu</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/birt/phoenix/whatsnew.php"
-    project="Eclipse BIRT Project" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/webtools/development/news/main.php"
-    project="Eclipse Webtools Project" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/tm/"
-    project="Eclipse Target Management (RSE)" />
-  </MoreInfo>
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/epp.product b/packages/org.eclipse.epp.package.reporting.feature/epp.product
index 73403e1c..81fa4430 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/epp.product
+++ b/packages/org.eclipse.epp.package.reporting.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse IDE for Java and Report Developers" uid="epp.package.reporting" id="org.eclipse.epp.package.reporting.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -51,7 +51,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.reporting.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.reporting.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml b/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
new file mode 100644
index 00000000..20a403d5
--- /dev/null
+++ b/packages/org.eclipse.epp.package.reporting.feature/epp.website.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse IDE for Java and Report Developers"
+   maintainer="Eclipse BIRT Project and the Eclipse Packaging Project"
+   iconurl="http://www.eclipse.org/birt/images/jee-birt.jpg"
+   bugzillaComponentId="reporting-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[Java EE tools and BIRT reporting tool for Java developers to create Java EE and Web applications that also have reporting needs.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Xiaoying Gu</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/birt/phoenix/whatsnew.php"
+    project="Eclipse BIRT Project" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/webtools/development/news/main.php"
+    project="Eclipse Webtools Project" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/tm/"
+    project="Eclipse Target Management (RSE)" />
+  </MoreInfo>
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-reporting-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index 8c4f2b72..c0366a56 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.reporting.feature"
       label="EPP Reporting Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.reporting">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
index 8f7ee697..44390eca 100644
--- a/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.reporting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Reporting Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.reporting;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index 81f0e49b..00000000
--- a/packages/org.eclipse.epp.package.scout.feature/eclipse_scout_juno.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse for Scout Developers"
-   maintainer="Eclipse Scout Project"
-   iconurl="http://www.eclipse.org/downloads/images/scout.jpg"
-   bugzillaComponentId="scout-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[This package contains framework and tools to develop <a href="http://www.eclipse.org/scout">Eclipse Scout</a> applications. It includes a complete SDK, useful developer tools and source code.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester>Andreas Hoegger</tester>
-      <tester>Matthias Zimmermann</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://wiki.eclipse.org/Scout/Release/Juno#New_and_Noteworthy"
-    project="Eclipse Scout" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  </MoreInfo>
-
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.product b/packages/org.eclipse.epp.package.scout.feature/epp.product
index 28acb29e..7137df4f 100644
--- a/packages/org.eclipse.epp.package.scout.feature/epp.product
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Scout Developers" uid="epp.package.scout" id="org.eclipse.epp.package.scout.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Scout Developers" uid="epp.package.scout" id="org.eclipse.epp.package.scout.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -53,7 +53,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.scout.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.scout.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
new file mode 100644
index 00000000..81f0e49b
--- /dev/null
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse for Scout Developers"
+   maintainer="Eclipse Scout Project"
+   iconurl="http://www.eclipse.org/downloads/images/scout.jpg"
+   bugzillaComponentId="scout-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[This package contains framework and tools to develop <a href="http://www.eclipse.org/scout">Eclipse Scout</a> applications. It includes a complete SDK, useful developer tools and source code.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester>Andreas Hoegger</tester>
+      <tester>Matthias Zimmermann</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://wiki.eclipse.org/Scout/Release/Juno#New_and_Noteworthy"
+    project="Eclipse Scout" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  </MoreInfo>
+
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-scout-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml
index 496ddbd6..0af69988 100644
--- a/packages/org.eclipse.epp.package.scout.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.scout.feature"
       label="EPP Scout Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.scout">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
index dfdb0a04..d524746e 100644
--- a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Scout Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.scout;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
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
deleted file mode 100644
index a887a07c..00000000
--- a/packages/org.eclipse.epp.package.testing.feature/eclipse_testing_juno.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
-  <!-- PackageName is the title of your package 
-       maintainer is the project or persons that are maintaining the package
-       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
-       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
-       testPlan is the fully qualified URL to the test plan for this package
-   -->
-  <packageMetaData
-   packageName="Eclipse for Testers"
-   maintainer="Eclipse Jubula Project"
-   iconurl="http://www.eclipse.org/downloads/images/testing.png"
-   bugzillaComponentId="testing-package"
-   testPlan="http://www.eclipse.org/epp/testplan.php" >
-    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
-     <description><![CDATA[This package contains Eclipse features that support the software development quality assurance process, such as Jubula and Mylyn.]]></description>
-    <!-- packageTesters is a list of the people that are testing the package -->
-     <packageTesters>
-      <tester><![CDATA[Achim L&ouml;rke]]></tester>
-      <tester>Markus Tiede</tester>
-      <tester>Zeb Ford-Reitz</tester>
-      <tester>Alexandra Schladebeck</tester>
-      <tester>Oliver Goetz</tester>
-    </packageTesters>
-  </packageMetaData>
-  <MoreInfo>
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/jubula/new/"
-    project="Eclipse Jubula" />
-  <NewAndNoteworthy
-    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
-    project="Eclipse Platform" />
-  <NewAndNoteworthy
-    url="http://www.eclipse.org/mylyn/new/"
-    project="Eclipse Mylyn" />
-  </MoreInfo>
-
-
-  <!-- version, the RCP version to build. This is used to determine the file 
-    name of the root file archives -->
-  <rcp version="4.2.0" />
-
-  <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-testing-juno" />
-
-</configuration>
diff --git a/packages/org.eclipse.epp.package.testing.feature/epp.product b/packages/org.eclipse.epp.package.testing.feature/epp.product
index 9c65ad54..fefc80b7 100644
--- a/packages/org.eclipse.epp.package.testing.feature/epp.product
+++ b/packages/org.eclipse.epp.package.testing.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse for Testers" uid="epp.package.testing" id="org.eclipse.epp.package.testing.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse for Testers" uid="epp.package.testing" id="org.eclipse.epp.package.testing.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -53,7 +53,7 @@
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.testing.feature" version="1.5.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.testing.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.testing.feature/epp.website.xml b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
new file mode 100644
index 00000000..a887a07c
--- /dev/null
+++ b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <!-- Package Description information to be picked up by www.eclipse.org/packages -->
+  <!-- PackageName is the title of your package 
+       maintainer is the project or persons that are maintaining the package
+       iconurl is the fully qualified URL to the icon you wish to use on the site (48x48)
+       bugzillaComponentID is used to gather bugzilla information about your package.  This should be given to you after provisioning of the package is finished
+       testPlan is the fully qualified URL to the test plan for this package
+   -->
+  <packageMetaData
+   packageName="Eclipse for Testers"
+   maintainer="Eclipse Jubula Project"
+   iconurl="http://www.eclipse.org/downloads/images/testing.png"
+   bugzillaComponentId="testing-package"
+   testPlan="http://www.eclipse.org/epp/testplan.php" >
+    <!-- Description is wrapped in CDATA tags to allow you to insert HTML code if necessary -->
+     <description><![CDATA[This package contains Eclipse features that support the software development quality assurance process, such as Jubula and Mylyn.]]></description>
+    <!-- packageTesters is a list of the people that are testing the package -->
+     <packageTesters>
+      <tester><![CDATA[Achim L&ouml;rke]]></tester>
+      <tester>Markus Tiede</tester>
+      <tester>Zeb Ford-Reitz</tester>
+      <tester>Alexandra Schladebeck</tester>
+      <tester>Oliver Goetz</tester>
+    </packageTesters>
+  </packageMetaData>
+  <MoreInfo>
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/jubula/new/"
+    project="Eclipse Jubula" />
+  <NewAndNoteworthy
+    url="http://download.eclipse.org/eclipse/downloads/drops4/R-4.2-201206081400/news/index.html"
+    project="Eclipse Platform" />
+  <NewAndNoteworthy
+    url="http://www.eclipse.org/mylyn/new/"
+    project="Eclipse Mylyn" />
+  </MoreInfo>
+
+
+  <!-- version, the RCP version to build. This is used to determine the file 
+    name of the root file archives -->
+  <rcp version="4.2.0" />
+
+  <!-- name, the name of the product, used in naming the created files. -->
+  <product name="eclipse-testing-juno" />
+
+</configuration>
diff --git a/packages/org.eclipse.epp.package.testing.feature/feature.xml b/packages/org.eclipse.epp.package.testing.feature/feature.xml
index c3d50df5..7131a08d 100644
--- a/packages/org.eclipse.epp.package.testing.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.epp.package.testing.feature"
       label="EPP Testing Feature"
-      version="1.5.0.qualifier"
+      version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
       plugin="org.eclipse.epp.package.testing">
 
@@ -16,7 +16,7 @@
 
    <url>
       <discovery label="Juno" url="http://download.eclipse.org/releases/juno/"/>
-      <discovery label="Eclipse Platform 4.2" url="http://download.eclipse.org/eclipse/updates/4.2"/>
+      <discovery label="Eclipse Platform 4.3" url="http://download.eclipse.org/eclipse/updates/4.3"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
index b4af1098..e01d4791 100644
--- a/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.testing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: EPP Testing Bundle
 Bundle-SymbolicName: org.eclipse.epp.package.testing;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: Eclipse Packaging Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.platform,
-- 
cgit v1.2.1