Prepare repo for 2023-06 RC2

Part of #32
eclipse-packaging · Jun 7, 2023 · ce3a6f1 · ce3a6f1
1 parent 1db1ea4
commit ce3a6f1
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 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://bugs.eclipse.org/bugs/enter_bug.cgi?product=EGit">here</a
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-committers-2023-06-RC1" />
+  <product name="eclipse-committers-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-cpp-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-dsl-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-embedcpp-2023-06-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-2023-06-RC1" />
+	<product name="eclipse-java-2023-06-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
@@ -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-jee-2023-06-RC1" />
+  <product name="eclipse-jee-2023-06-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
@@ -32,6 +32,6 @@
   </MoreInfo>
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-2023-06-RC1" />
+  <product name="eclipse-modeling-2023-06-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
@@ -30,6 +30,6 @@
   </MoreInfo>
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-parallel-2023-06-RC1" />
+	<product name="eclipse-parallel-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-php-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-rcp-2023-06-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-2023-06-RC1" />
+  <product name="eclipse-scout-2023-06-R" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -38,11 +38,11 @@
     <!-- Name of the release (no milestone) -->
     <RELEASE_NAME>2023-06</RELEASE_NAME>
     <!-- Name of the milestone -->
-    <RELEASE_MILESTONE>RC1</RELEASE_MILESTONE>
+    <RELEASE_MILESTONE>R</RELEASE_MILESTONE>
     <!-- Version of the release -->
     <RELEASE_VERSION>4.28.0</RELEASE_VERSION>
     <!-- Name release directory on download.eclipse.org -->
-    <RELEASE_DIR>202306011200</RELEASE_DIR>
+    <RELEASE_DIR>202306081200</RELEASE_DIR>
     <!-- SimRel Repo to build from -->
     <SIMREL_REPO>https://download.eclipse.org/staging/2023-06/</SIMREL_REPO>
     <!-- ID used to generate the filename of the packages -->
@@ -52,9 +52,9 @@
     <!-- 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
@@ -74,8 +74,8 @@ cat > release.xml <<EOM
 <past>2022-06/R</past>
 <past>2022-09/R</past>
 <past>2022-12/R</past>
-<present>2023-03/R</present>
-<future>${RELEASE_NAME}/${RELEASE_MILESTONE}</future>
+<past>2023-03/R</past>
+<present>2023-06/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
@@ -96,23 +96,23 @@ Last +1 received for each package and platform (apologies if I missed one of you
 
 Packages:
 committers - 2022-12 RC1 (tested by Ed in 2023-03 RC2)
-cpp - 2023-06 M3
-dsl - 2023-06 M3
+cpp - 2023-06 RC1
+dsl - 2023-06 RC1
 embedcpp - 2023-03 RC1
 java - 2023-03 RC2
 jee - 2023-03 RC2
-modeling - 2023-03 RC2
+modeling - 2023-06 RC1
 parallel - 2022-03 RC2 (tested by Ed in 2023-03 RC2)
 php - 2020-12 RC2 (tested by Ed in 2023-03 RC2)
 rcp - 2023-03 RC2
 scout - 2023-03 M1
 
 Platforms:
-Linux x86_64 - 2023-06 M3
+Linux x86_64 - 2023-06 RC1
 Linux aarch64 - 2023-03 RC1
 Windows - 2023-03 RC2
 macOS x86_64 - 2023-03 RC1
-macOS aarch64 - 2023-06 M3
+macOS aarch64 - 2023-06 RC1
 
 Thank you for testing!