Bug 575979 - Use 4.21 GA version for 4.21+ changesP20211026-0140R4_21_maintenance

Change-Id: Ica55088adbc3f45285928dc26caaf76b6c012837
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.releng.aggregator/+/185415
Tested-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Reviewed-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
index daaec4427..97bda9b55 100644
--- a/cje-production/P-build/buildproperties.txt
+++ b/cje-production/P-build/buildproperties.txt
@@ -58,7 +58,7 @@ PREVIOUS_RELEASE_ID="R-4.20-202106111600"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
index d267873d3..db4beb2fb 100644
--- a/cje-production/Y-build/buildproperties.txt
+++ b/cje-production/Y-build/buildproperties.txt
@@ -57,7 +57,7 @@ PREVIOUS_RELEASE_ID="S-4.21RC2-202109011800"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 1461795aa..73449102d 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -57,7 +57,7 @@ PREVIOUS_RELEASE_ID="R-4.20-202106111600"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 7ed4f167d..3439c1809 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -81,9 +81,9 @@
       'eclipiserun-repo' repository, such as for computing .api-descriptions and
       generating API Tools reports.
     -->
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.21-I-builds/</eclipserun-repo>
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/</eclipserun-repo>
     
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.21-I-builds</comparator.repo>
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/</comparator.repo>
 
     <!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
     <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
@@ -140,7 +140,7 @@
     <qualifier.format>'v'yyyyMMdd-HHmm</qualifier.format>
 
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -624,7 +624,7 @@
           For maintenance streams should always be "M-builds".
           Ideally, this value would be provided by the environment, see bug 489789.
         -->
-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.21-I-builds</eclipse-p2-repo.url>
+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/</eclipse-p2-repo.url>
       </properties>
       <repositories>
         <repository>