Prep repo for 2024-03 RC2

Part of eclipse-packaging#127
merks · Mar 7, 2024 · 647fbf6 · 647fbf6
1 parent 92ee8df
commit 647fbf6
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 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
@@ -34,6 +34,6 @@ Click <a href="https://github.com/eclipse-egit/egit/issues">here</a> to open a b
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2024-03-RC1" />
+  <product name="eclipse-committers-2024-03-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
@@ -22,6 +22,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-cpp-2024-03-RC1" />
+  <product name="eclipse-cpp-2024-03-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
@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-dsl-2024-03-RC1" />
+  <product name="eclipse-dsl-2024-03-R" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml b/packages/org.eclipse.epp.package.embedcpp.feature/epp.website.xml
@@ -29,6 +29,6 @@ To avoid compatibility issues with pre 6.x plug-ins, it is recommended to <b>cre
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-embedcpp-2024-03-RC1" />
+  <product name="eclipse-embedcpp-2024-03-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
@@ -28,6 +28,6 @@
 
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-2024-03-RC1" />
+	<product name="eclipse-java-2024-03-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
@@ -34,6 +34,6 @@ Click <a href="https://github.com/eclipse/wildwebdeveloper/issues">here</a> to r
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-2024-03-RC1" />
+  <product name="eclipse-jee-2024-03-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
@@ -24,6 +24,6 @@
   </packageMetaData>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2024-03-RC1" />
+  <product name="eclipse-modeling-2024-03-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
@@ -35,6 +35,6 @@ Click <a href="https://github.com/eclipse/wildwebdeveloper/issues">here</a> to r
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-php-2024-03-RC1" />
+  <product name="eclipse-php-2024-03-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
@@ -27,6 +27,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-2024-03-RC1" />
+  <product name="eclipse-rcp-2024-03-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
@@ -31,6 +31,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-scout-2024-03-RC1" />
+  <product name="eclipse-scout-2024-03-R" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -37,23 +37,23 @@
     <!-- Name of the release (no milestone) -->
     <RELEASE_NAME>2024-03</RELEASE_NAME>
     <!-- Name of the milestone -->
-    <RELEASE_MILESTONE>RC1</RELEASE_MILESTONE>
+    <RELEASE_MILESTONE>R</RELEASE_MILESTONE>
     <!-- Version of the release -->
     <RELEASE_VERSION>4.31.0</RELEASE_VERSION>
     <!-- Name release directory on download.eclipse.org -->
-    <RELEASE_DIR>202402291200</RELEASE_DIR>
+    <RELEASE_DIR>202403071200</RELEASE_DIR>
     <!-- SimRel Repo to build from -->
-    <SIMREL_REPO>https://download.eclipse.org/staging/2024-03/</SIMREL_REPO>
+    <SIMREL_REPO>https://download.eclipse.org/releases/2024-03/202403131000/</SIMREL_REPO>
     <!-- ID used to generate the filename of the packages -->
     <eclipse.simultaneous.release.id>${RELEASE_NAME}-${RELEASE_MILESTONE}</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) -->
     <!-- TODO the two alternative values of eclipse.simultaneous.release.name could be automated, perhaps with a profile dependent on RELEASE_MILESTONE -->
     <!-- eclipse.simultaneous.release.name value for non-R builds -->
-    <eclipse.simultaneous.release.name>${RELEASE_NAME} ${RELEASE_MILESTONE} (${RELEASE_VERSION} ${RELEASE_MILESTONE})</eclipse.simultaneous.release.name>
+    <!-- <eclipse.simultaneous.release.name>${RELEASE_NAME} ${RELEASE_MILESTONE} (${RELEASE_VERSION} ${RELEASE_MILESTONE})</eclipse.simultaneous.release.name> -->
     <!-- eclipse.simultaneous.release.name value for R builds -->
-    <!-- <eclipse.simultaneous.release.name>${RELEASE_NAME} (${RELEASE_VERSION})</eclipse.simultaneous.release.name> -->
+    <eclipse.simultaneous.release.name>${RELEASE_NAME} (${RELEASE_VERSION})</eclipse.simultaneous.release.name>
     <!-- Upstream p2 repository, used as a source for pre-compiled build artifacts -->
     <eclipse.simultaneous.release.repository>${SIMREL_REPO}</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
@@ -77,8 +77,8 @@ cat > release.xml <<EOM
 <past>2023-03/R</past>
 <past>2023-06/R</past>
 <past>2023-09/R</past>
-<present>2023-12/R</present>
-<future>${RELEASE_NAME}/${RELEASE_MILESTONE}</future>
+<past>2023-12/R</past>
+<present>2024-03/R</present>
 </packages>
 EOM
 $ECHO $SCP release.xml "${SSHUSER}:"${EPP_DOWNLOADS}/downloads/release/release.xml

diff --git a/releng/org.eclipse.epp.config/tools/upload-to-staging.sh b/releng/org.eclipse.epp.config/tools/upload-to-staging.sh
@@ -53,22 +53,22 @@ Last +1 received for each package and platform (apologies if I missed one of you
 
 Packages:
 committers - 2023-06 RC2
-cpp - 2024-03 M2
-dsl - 2024-03 M2
+cpp - 2024-03 RC1
+dsl - 2024-03 M2 (+0 for 2024-03 RC1)
 embedcpp - 2023-12 RC2a
-java - 2023-12 RC1
+java - 2024-03 RC1
 jee - 2023-09 RC2
 modeling - 2023-12 RC2a
 php - 2023-06 RC2
 rcp - 2023-12 RC2a
 scout - 2023-12 RC2a
 
 Platforms:
-Linux x86_64 - 2024-03 M2
+Linux x86_64 - 2024-03 RC1
 Linux aarch64 - 2023-09 RC2
-Windows - 2023-12 RC1
+Windows - 2024-03 RC1
 macOS x86_64 - 2023-12 RC2a
-macOS aarch64 - 2024-03 M2
+macOS aarch64 - 2024-03 M2 (+0 for 2024-03 RC1)
 
 Thank you for testing!