Update strings for 2020-09 R (RC2)

Change-Id: I1ebea76b52db288874538c5186308b3e8b9a26f3

15 files changed, 21 insertions, 17 deletions

diff --git a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
index 9484d589..2ac5f3ca 100644
--- a/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.committers.feature/epp.website.xml
@@ -41,6 +41,6 @@ Click <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2020-09-RC1" />
+  <product name="eclipse-committers-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
index 4e5dde84..0527e9c0 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/epp.website.xml
@@ -41,6 +41,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-cpp-2020-09-RC1" />
+  <product name="eclipse-cpp-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
index c5b0d1ed..24179861 100644
--- a/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.dsl.feature/epp.website.xml
@@ -31,6 +31,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-2020-09-RC1" />
+  <product name="eclipse-dsl-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/epp.website.xml b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
index 21cd7bb0..b7da9321 100644
--- a/packages/org.eclipse.epp.package.java.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.java.feature/epp.website.xml
@@ -35,6 +35,6 @@
   <rcp version="4.16.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-2020-09-RC1" />
+	<product name="eclipse-java-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml b/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
index 77ba3f88..d9329f91 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/epp.website.xml
@@ -38,6 +38,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-javascript-2020-09-RC1" />
+  <product name="eclipse-javascript-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
index 432e3f47..98921be1 100644
--- a/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/epp.website.xml
@@ -48,6 +48,6 @@ Click <a href="https://github.com/eclipse/wildwebdeveloper/issues/new">here</a>
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-2020-09-RC1" />
+  <product name="eclipse-jee-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
index 5f463282..84a05a69 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/epp.website.xml
@@ -39,6 +39,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2020-09-RC1" />
+  <product name="eclipse-modeling-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
index 95d598ae..3da80d75 100644
--- a/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.parallel.feature/epp.website.xml
@@ -41,6 +41,6 @@
 	<rcp version="4.16.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-2020-09-RC1" />
+	<product name="eclipse-parallel-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.php.feature/epp.website.xml b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
index b30971ee..643363ab 100644
--- a/packages/org.eclipse.epp.package.php.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.php.feature/epp.website.xml
@@ -46,6 +46,6 @@ Click <a href="https://github.com/eclipse/wildwebdeveloper/issues/new">here</a>
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-2020-09-RC1" />
+  <product name="eclipse-php-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
index 44f83586..ba8cd781 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/epp.website.xml
@@ -41,6 +41,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-2020-09-RC1" />
+  <product name="eclipse-rcp-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rust.feature/epp.website.xml b/packages/org.eclipse.epp.package.rust.feature/epp.website.xml
index 79556bbd..b92e93c1 100644
--- a/packages/org.eclipse.epp.package.rust.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.rust.feature/epp.website.xml
@@ -38,6 +38,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rust-2020-09-RC1" />
+  <product name="eclipse-rust-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
index d7f29d2f..6cddef6c 100644
--- a/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.scout.feature/epp.website.xml
@@ -38,6 +38,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-2020-09-RC1" />
+  <product name="eclipse-scout-2020-09-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.testing.feature/epp.website.xml b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
index db86db80..48465bd1 100644
--- a/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.testing.feature/epp.website.xml
@@ -39,6 +39,6 @@
   <rcp version="4.16.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-testing-2020-09-RC1" />
+  <product name="eclipse-testing-2020-09-R" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index 0835cd19..ed9cac7a 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -36,11 +36,11 @@
     <!-- The location that is used to assemble the single EPP configuration p2 repository -->
     <eclipse.epp.targetRepository>${eclipse.epp.archiveDirectory}/repository/</eclipse.epp.targetRepository>
     <!-- ID used to generate the filename of the packages -->
-    <eclipse.simultaneous.release.id>2020-09-RC1</eclipse.simultaneous.release.id>
+    <eclipse.simultaneous.release.id>2020-09-R</eclipse.simultaneous.release.id>
     <!-- Timestamp used in various places, e.g. the about dialog (see about.mappings) -->
     <eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
     <!-- Human readable name of the release, e.g. used in the about dialog (see about.mappings) -->
-    <eclipse.simultaneous.release.name>2020-09 RC1 (4.17.0 RC1)</eclipse.simultaneous.release.name>
+    <eclipse.simultaneous.release.name>2020-09 (4.17.0)</eclipse.simultaneous.release.name>
     <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
     <eclipse.simultaneous.release.repository>https://download.eclipse.org/staging/2020-09/</eclipse.simultaneous.release.repository>
   </properties>
diff --git a/releng/org.eclipse.epp.config/tools/promote-a-build.sh b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
index 76757253..2300d5e0 100755
--- a/releng/org.eclipse.epp.config/tools/promote-a-build.sh
+++ b/releng/org.eclipse.epp.config/tools/promote-a-build.sh
@@ -132,11 +132,15 @@ cat > release.xml <<EOM
 <past>2019-09/R</past>
 <past>2019-12/R</past>
 <past>2020-03/R</past>
-<present>2020-06/R</present>
-<future>2020-09/RC1</future>
+<past>2020-06/R</past>
+<present>2020-09/R</present>
 </packages>
 EOM
 
+# Add this line above on M1
+# <future>2020-12/M1</future>
+
+
 # ----------------------------------------------------------------------------------------------
 # Copy everything to download.eclipse.org