#290, fixing some things Sravan caught that I changed too early. Incl…

…uding changes for #300 and #299
eclipse-platform · Jun 3, 2022 · feb2e95 · feb2e95
1 parent 997fa00
commit feb2e95
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
@@ -50,14 +50,14 @@ FREEZE_PARAMS=" "
 PREVIOUS_RELEASE_VER="4.24"
 PREVIOUS_RELEASE_REPO_ID="4.24"
 #build id for getting repo
-BASEBUILD_ID="R-4.24-202206011800"
+BASEBUILD_ID="S-4.24RC2-202206011800"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.24-202206011800"
+PREVIOUS_RELEASE_ID="S-4.24RC2-202206011800"
 
 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.25-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.24-I-builds/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -50,14 +50,14 @@ FREEZE_PARAMS=" "
 PREVIOUS_RELEASE_VER="4.24"
 PREVIOUS_RELEASE_REPO_ID="4.24"
 #build id for getting repo
-BASEBUILD_ID="R-4.24-202206011800"
+BASEBUILD_ID="S-4.24RC2-202206011800"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.24-202206011800"
+PREVIOUS_RELEASE_ID="S-4.24RC2-202206011800"
 
 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.25-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.24-I-builds/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/cleaners/cleanupNightlyRepo.sh b/cje-production/cleaners/cleanupNightlyRepo.sh
@@ -194,8 +194,8 @@ workspace=$1
 remoteBase="/home/data/httpd/download.eclipse.org"
 
 eclipseIRepo="${remoteBase}/eclipse/updates/4.25-I-builds"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.23-Y-builds"
-eclipsePRepo="${remoteBase}/eclipse/updates/4.23-P-builds"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.25-Y-builds"
+eclipsePRepo="${remoteBase}/eclipse/updates/4.25-P-builds"
 eclipseBuildTools="${remoteBase}/eclipse/updates/buildtools"
 
 doDryrun=

diff --git a/cje-production/scripts/checkComposites/checkComposites.sh b/cje-production/scripts/checkComposites/checkComposites.sh
@@ -29,8 +29,8 @@ repoList="\
 /eclipse/updates/4.24/ \
 /eclipse/updates/4.25/ \
 /eclipse/updates/4.25-I-builds/ \
-/eclipse/updates/4.24-Y-builds/ \
-/eclipse/updates/4.24-P-builds/ \
+/eclipse/updates/4.25-Y-builds/ \
+/eclipse/updates/4.25-P-builds/ \
 "
 
 

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
@@ -77,9 +77,9 @@
       'eclipiserun-repo' repository, such as for computing .api-descriptions and
       generating API Tools reports.
     -->
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.25-I-builds/</eclipserun-repo>
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.24-I-builds/</eclipserun-repo>
 
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.25-I-builds</comparator.repo>
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.24-I-builds</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>