Update R4_31 maintenance branch with release version for 4.31+ changes (

#1884) Fixes #1883
eclipse-platform · Mar 8, 2024 · 282e758 · 282e758
1 parent ad8b2db
commit 282e758
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
@@ -58,7 +58,7 @@ PREVIOUS_RELEASE_ID="R-4.30-202312010110"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
@@ -57,7 +57,7 @@ PREVIOUS_RELEASE_ID="R-4.30-202312010110"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -57,7 +57,7 @@ PREVIOUS_RELEASE_ID="R-4.30-202312010110"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

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.31-I-builds/</eclipserun-repo>
+    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/</eclipserun-repo>
 
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.31-I-builds</comparator.repo>
+    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520</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>
@@ -127,7 +127,7 @@
 
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -768,12 +768,12 @@
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
         <versionRangeForPatch>[3.19.400.v20240221-1800,3.19.449.v20240612-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240221-1800/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/</comparator.repo>
       </properties>
       <repositories>
        <repository>
          <id>eclipse-p2-repo-java22patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240221-1800/</url>
+         <url>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520/</url>
          <layout>p2</layout>
        </repository>
      </repositories>
@@ -820,7 +820,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.31-I-builds</eclipse-p2-repo.url>
+        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.31/R-4.31-202402290520</eclipse-p2-repo.url>
       </properties>
       <repositories>
         <repository>